Commit 58e4bb5f authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: authenc - stop using alignmask of ahash 



Now that the alignmask for ahash and shash algorithms is always 0,
simplify the code in authenc accordingly.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c626910f

crypto/authenc.c

+2 −10
Original line number Diff line number Diff line
@@ -141,9 +141,6 @@ static int crypto_authenc_genicv(struct aead_request *req, unsigned int flags) 
	u8 *hash = areq_ctx->tail;

	int err;



	hash = (u8 *)ALIGN((unsigned long)hash + crypto_ahash_alignmask(auth),

			   crypto_ahash_alignmask(auth) + 1);



	ahash_request_set_tfm(ahreq, auth);

	ahash_request_set_crypt(ahreq, req->dst, hash,

				req->assoclen + req->cryptlen);
@@ -286,9 +283,6 @@ static int crypto_authenc_decrypt(struct aead_request *req) 
	u8 *hash = areq_ctx->tail;

	int err;



	hash = (u8 *)ALIGN((unsigned long)hash + crypto_ahash_alignmask(auth),

			   crypto_ahash_alignmask(auth) + 1);



	ahash_request_set_tfm(ahreq, auth);

	ahash_request_set_crypt(ahreq, req->src, hash,

				req->assoclen + req->cryptlen - authsize);
@@ -400,8 +394,7 @@ static int crypto_authenc_create(struct crypto_template *tmpl, 
		goto err_free_inst;

	enc = crypto_spawn_skcipher_alg_common(&ctx->enc);



	ctx->reqoff = ALIGN(2 * auth->digestsize + auth_base->cra_alignmask,

			    auth_base->cra_alignmask + 1);

	ctx->reqoff = 2 * auth->digestsize;



	err = -ENAMETOOLONG;

	if (snprintf(inst->alg.base.cra_name, CRYPTO_MAX_ALG_NAME,
@@ -418,8 +411,7 @@ static int crypto_authenc_create(struct crypto_template *tmpl, 
	inst->alg.base.cra_priority = enc->base.cra_priority * 10 +

				      auth_base->cra_priority;

	inst->alg.base.cra_blocksize = enc->base.cra_blocksize;

	inst->alg.base.cra_alignmask = auth_base->cra_alignmask |

				       enc->base.cra_alignmask;

	inst->alg.base.cra_alignmask = enc->base.cra_alignmask;

	inst->alg.base.cra_ctxsize = sizeof(struct crypto_authenc_ctx);



	inst->alg.ivsize = enc->ivsize;