From: Eric Biggers <ebiggers@google.com>
Date: Sun, 22 Oct 2023 08:10:50 +0000 (-0700)
Subject: crypto: ccm - stop using alignmask of ahash
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=36cfc05715a7ca0c989a355f173cbe6ec469c1f9;p=linux.git

crypto: ccm - stop using alignmask of ahash

Now that the alignmask for ahash and shash algorithms is always 0,
simplify crypto_ccm_create_common() accordingly.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/crypto/ccm.c b/crypto/ccm.c
index dd7aed63efc93..36f0acec32e19 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -504,8 +504,7 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
 	inst->alg.base.cra_priority = (mac->base.cra_priority +
 				       ctr->base.cra_priority) / 2;
 	inst->alg.base.cra_blocksize = 1;
-	inst->alg.base.cra_alignmask = mac->base.cra_alignmask |
-				       ctr->base.cra_alignmask;
+	inst->alg.base.cra_alignmask = ctr->base.cra_alignmask;
 	inst->alg.ivsize = 16;
 	inst->alg.chunksize = ctr->chunksize;
 	inst->alg.maxauthsize = 16;