Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e41256f1 authored by Kim Phillips's avatar Kim Phillips Committed by Herbert Xu
Browse files

crypto: talitos - simplify hmac data size calculation 



don't do request->src vs. assoc pointer math - it's the same as adding
assoclen and ivsize (just with more effort).

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 85a7f0ac

drivers/crypto/talitos.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -970,7 +970,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq, 
	struct talitos_desc *desc = &edesc->desc;

	struct talitos_desc *desc = &edesc->desc;

	unsigned int cryptlen = areq->cryptlen;

	unsigned int cryptlen = areq->cryptlen;

	unsigned int authsize = ctx->authsize;

	unsigned int authsize = ctx->authsize;

	unsigned int ivsize;

	unsigned int ivsize = crypto_aead_ivsize(aead);

	int sg_count, ret;

	int sg_count, ret;

	int sg_link_tbl_len;

	int sg_link_tbl_len;
@@ -978,11 +978,9 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq, 
	map_single_talitos_ptr(dev, &desc->ptr[0], ctx->authkeylen, &ctx->key,

	map_single_talitos_ptr(dev, &desc->ptr[0], ctx->authkeylen, &ctx->key,

			       0, DMA_TO_DEVICE);

			       0, DMA_TO_DEVICE);

	/* hmac data */

	/* hmac data */

	map_single_talitos_ptr(dev, &desc->ptr[1], sg_virt(areq->src) -

	map_single_talitos_ptr(dev, &desc->ptr[1], areq->assoclen + ivsize,

			       sg_virt(areq->assoc), sg_virt(areq->assoc), 0,

			       sg_virt(areq->assoc), 0, DMA_TO_DEVICE);

			       DMA_TO_DEVICE);

	/* cipher iv */

	/* cipher iv */

	ivsize = crypto_aead_ivsize(aead);

	map_single_talitos_ptr(dev, &desc->ptr[2], ivsize, giv ?: areq->iv, 0,

	map_single_talitos_ptr(dev, &desc->ptr[2], ivsize, giv ?: areq->iv, 0,

			       DMA_TO_DEVICE);

			       DMA_TO_DEVICE);