diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-08-13 17:29:06 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-08-17 16:53:53 +0800 |
| commit | 5e4b8c1fcc70016f43926203ae1820c3b380d5cd (patch) | |
| tree | 8439eec2c8edbe8bf98a37fb6db3d652468832b1 /crypto/chacha20poly1305.c | |
| parent | b0d955ba4688fcba8112884931aea1f1e6f50f03 (diff) | |
| download | linux-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/chacha20poly1305.c')
| -rw-r--r-- | crypto/chacha20poly1305.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c index b71445f282ad..99c3cce01290 100644 --- a/crypto/chacha20poly1305.c +++ b/crypto/chacha20poly1305.c @@ -585,8 +585,7 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, if (IS_ERR(algt)) return PTR_ERR(algt); - if ((algt->type ^ (CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_AEAD_NEW)) & - algt->mask) + if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask) return -EINVAL; chacha_name = crypto_attr_alg_name(tb[1]); @@ -644,7 +643,6 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, inst->alg.base.cra_flags = (chacha->cra_flags | poly->cra_flags) & CRYPTO_ALG_ASYNC; - inst->alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW; inst->alg.base.cra_priority = (chacha->cra_priority + poly->cra_priority) / 2; inst->alg.base.cra_blocksize = 1; |