summaryrefslogtreecommitdiffstats
path: root/crypto/aead.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-08-13 17:29:06 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-17 16:53:53 +0800
commit5e4b8c1fcc70016f43926203ae1820c3b380d5cd (patch)
tree8439eec2c8edbe8bf98a37fb6db3d652468832b1 /crypto/aead.c
parentb0d955ba4688fcba8112884931aea1f1e6f50f03 (diff)
downloadlinux-stable-5e4b8c1fcc70016f43926203ae1820c3b380d5cd.tar.gz
linux-stable-5e4b8c1fcc70016f43926203ae1820c3b380d5cd.tar.bz2
linux-stable-5e4b8c1fcc70016f43926203ae1820c3b380d5cd.zip
crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag
This patch removes the CRYPTO_ALG_AEAD_NEW flag now that everyone has been converted. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/aead.c')
-rw-r--r--crypto/aead.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/aead.c b/crypto/aead.c
index c40df2c4d420..9b18a1e40d6a 100644
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -204,8 +204,7 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
if (IS_ERR(algt))
return ERR_CAST(algt);
- if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) &
- algt->mask & ~CRYPTO_ALG_AEAD_NEW)
+ if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
return ERR_PTR(-EINVAL);
name = crypto_attr_alg_name(tb[1]);
@@ -245,8 +244,7 @@ struct aead_instance *aead_geniv_alloc(struct crypto_template *tmpl,
CRYPTO_MAX_ALG_NAME)
goto err_drop_alg;
- inst->alg.base.cra_flags = alg->base.cra_flags &
- (CRYPTO_ALG_ASYNC | CRYPTO_ALG_AEAD_NEW);
+ inst->alg.base.cra_flags = alg->base.cra_flags & CRYPTO_ALG_ASYNC;
inst->alg.base.cra_priority = alg->base.cra_priority;
inst->alg.base.cra_blocksize = alg->base.cra_blocksize;
inst->alg.base.cra_alignmask = alg->base.cra_alignmask;