diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-02-11 19:25:22 +0000 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-02-15 13:23:46 +0800 |
commit | 4487e720bdf9acc34387efbf2c1a20dbd35f547e (patch) | |
tree | d2b8c783121c6f62890b28b4e24f8ce6a89d367d /crypto | |
parent | 9f8dc385c1313f50323a79e3ecc44cd09b8d449a (diff) | |
download | linux-crypto-4487e720bdf9acc34387efbf2c1a20dbd35f547e.tar.gz linux-crypto-4487e720bdf9acc34387efbf2c1a20dbd35f547e.zip |
crypto: ccm - drop unnecessary minimum 32-bit alignment
The CCM driver forces 32-bit alignment even if the underlying ciphers
don't care about alignment. This is because crypto_xor() used to require
this, but since this is no longer the case, drop the hardcoded minimum
of 32 bits.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
-rw-r--r-- | crypto/ccm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/ccm.c b/crypto/ccm.c index 24c26ab0..44284880 100644 --- a/crypto/ccm.c +++ b/crypto/ccm.c @@ -525,8 +525,7 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl, ctr->base.cra_priority) / 2; inst->alg.base.cra_blocksize = 1; inst->alg.base.cra_alignmask = mac->base.cra_alignmask | - ctr->base.cra_alignmask | - (__alignof__(u32) - 1); + ctr->base.cra_alignmask; inst->alg.ivsize = 16; inst->alg.chunksize = crypto_skcipher_alg_chunksize(ctr); inst->alg.maxauthsize = 16; |