summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2023-10-22 10:10:50 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2023-10-27 12:04:29 +0200
commit36cfc05715a7ca0c989a355f173cbe6ec469c1f9 (patch)
tree251ca2b2cac8a86af5db81db8ba41584064d2f30 /crypto
parentnet: ipv6: stop checking crypto_ahash_alignmask (diff)
downloadlinux-36cfc05715a7ca0c989a355f173cbe6ec469c1f9.tar.xz
linux-36cfc05715a7ca0c989a355f173cbe6ec469c1f9.zip
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>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/ccm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/ccm.c b/crypto/ccm.c
index dd7aed63efc9..36f0acec32e1 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;