Merge tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-beck.git] / crypto / aead.c

diff --git a/crypto/aead.c b/crypto/aead.c
index c40df2c4d420dce3bd03be337b607d7ae97fb25a..9b18a1e40d6af896be358c72113cbddb78c7acaa 100644 (file)
--- 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;