Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ba8e2a0 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

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: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5338ad70

crypto/ccm.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -525,8 +525,7 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl, 
				       ctr->base.cra_priority) / 2;

				       ctr->base.cra_priority) / 2;

	inst->alg.base.cra_blocksize = 1;

	inst->alg.base.cra_blocksize = 1;

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

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

				       ctr->base.cra_alignmask |

				       ctr->base.cra_alignmask;

				       (__alignof__(u32) - 1);

	inst->alg.ivsize = 16;

	inst->alg.ivsize = 16;

	inst->alg.chunksize = crypto_skcipher_alg_chunksize(ctr);

	inst->alg.chunksize = crypto_skcipher_alg_chunksize(ctr);

	inst->alg.maxauthsize = 16;

	inst->alg.maxauthsize = 16;