summaryrefslogtreecommitdiff
path: root/crypto/authenc.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-11-22 22:46:40 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2008-01-11 08:16:28 +1100
commite29bc6ad0e84e3157e0f49130a15b278cb232c72 (patch)
tree90fb10371a7b86264a11287f450d6fd7198311e5 /crypto/authenc.c
parent9aa6ad3e87af58b4fc87bd4beef1d4c6d9a4c5b7 (diff)
downloadlinux-3.10-e29bc6ad0e84e3157e0f49130a15b278cb232c72.tar.gz
linux-3.10-e29bc6ad0e84e3157e0f49130a15b278cb232c72.tar.bz2
linux-3.10-e29bc6ad0e84e3157e0f49130a15b278cb232c72.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 'crypto/authenc.c')
-rw-r--r--crypto/authenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/authenc.c b/crypto/authenc.c
index bc4e608ca84..66fb2aa5c32 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;