]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
crypto: ccm - stop using alignmask of ahash
authorEric Biggers <ebiggers@google.com>
Sun, 22 Oct 2023 08:10:50 +0000 (01:10 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 27 Oct 2023 10:04:29 +0000 (18:04 +0800)
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>
crypto/ccm.c

index dd7aed63efc93b5d9dfd87e40fb9f4de83fd1c0b..36f0acec32e196e0d086631851b36c192963924b 100644 (file)
@@ -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;