diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-22 22:46:40 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-11 08:16:28 +1100 |
commit | 7de9fbe41669a97856264894ad710e93a09dd469 (patch) | |
tree | 95954b9dde7aa2ac4828cd655bdc4aede4417024 | |
parent | 0138aa7591b7450ed725c81a03a9f7a1879347c9 (diff) | |
download | linux-crypto-7de9fbe41669a97856264894ad710e93a09dd469.tar.gz linux-crypto-7de9fbe41669a97856264894ad710e93a09dd469.zip |
[CRYPTO] authenc: Use or instead of max on alignment masks
Since alignment masks are always one less than a power of two, we can
use binary or to find their maximum.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
-rw-r--r-- | crypto/authenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/authenc.c b/crypto/authenc.c index bc4e608c..66fb2aa5 100644 --- a/crypto/authenc.c +++ b/crypto/authenc.c @@ -333,7 +333,7 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb) inst->alg.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC; inst->alg.cra_priority = enc->cra_priority * 10 + auth->cra_priority; inst->alg.cra_blocksize = enc->cra_blocksize; - inst->alg.cra_alignmask = max(auth->cra_alignmask, enc->cra_alignmask); + inst->alg.cra_alignmask = auth->cra_alignmask | enc->cra_alignmask; inst->alg.cra_type = &crypto_aead_type; inst->alg.cra_aead.ivsize = enc->cra_blkcipher.ivsize; |