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>

diff --git a/arch/arm64/crypto/aes-ce-ccm-glue.c b/arch/arm64/crypto/aes-ce-ccm-glue.c
index f3690fa76a5bac207f9e46b71b7f03e690f3e1ca..f4bf2f2a014cdccf0838f01f4ba1f452d65b43f6 100644 (file)
--- a/arch/arm64/crypto/aes-ce-ccm-glue.c
+++ b/arch/arm64/crypto/aes-ce-ccm-glue.c
@@ -280,7 +280,6 @@ static struct aead_alg ccm_aes_alg = {
        .base = {
                .cra_name               = "ccm(aes)",
                .cra_driver_name        = "ccm-aes-ce",
-               .cra_flags              = CRYPTO_ALG_AEAD_NEW,
                .cra_priority           = 300,
                .cra_blocksize          = 1,
                .cra_ctxsize            = sizeof(struct crypto_aes_ctx),

diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 2347ef0a1a6de144a4b0367d751d7583ccba5098..3633ad6145c5229a57f40ccf30421916872d4f2a 100644 (file)
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -1437,8 +1437,7 @@ static struct aead_alg aesni_aead_algs[] = { {
                .cra_name               = "rfc4106(gcm(aes))",
                .cra_driver_name        = "rfc4106-gcm-aesni",
                .cra_priority           = 400,
-               .cra_flags              = CRYPTO_ALG_ASYNC |
-                                         CRYPTO_ALG_AEAD_NEW,
+               .cra_flags              = CRYPTO_ALG_ASYNC,
                .cra_blocksize          = 1,
                .cra_ctxsize            = sizeof(struct cryptd_aead *),
                .cra_module             = THIS_MODULE,

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;

diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index e0408a480d2f4eb8f818c9590ec9a3d7d166e25d..38a6cab7aecacd308066ba40dcdae95ae6d5c6e0 100644 (file)
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -514,8 +514,7 @@ static struct proto_ops algif_aead_ops = {
 
 static void *aead_bind(const char *name, u32 type, u32 mask)
 {
-       return crypto_alloc_aead(name, type | CRYPTO_ALG_AEAD_NEW,
-                                mask | CRYPTO_ALG_AEAD_NEW);
+       return crypto_alloc_aead(name, type, mask);
 }
 
 static void aead_release(void *private)

diff --git a/crypto/authenc.c b/crypto/authenc.c
index bca3835b6b423a76663a3352f6d26a4e03c84099..55a354d572513b642566b50db7252d3aecdceb38 100644 (file)
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -393,8 +393,7 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
        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;
 
        auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,
@@ -445,7 +444,6 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
                goto err_drop_enc;
 
        inst->alg.base.cra_flags = enc->cra_flags & CRYPTO_ALG_ASYNC;
-       inst->alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
        inst->alg.base.cra_priority = enc->cra_priority * 10 +
                                      auth_base->cra_priority;
        inst->alg.base.cra_blocksize = enc->cra_blocksize;

diff --git a/crypto/authencesn.c b/crypto/authencesn.c
index c30393e2ad225062a936df3545cf5effe41b8413..0c0468869e25b51035cf363fd3f3e2f7903330fb 100644 (file)
--- a/crypto/authencesn.c
+++ b/crypto/authencesn.c
@@ -409,8 +409,7 @@ static int crypto_authenc_esn_create(struct crypto_template *tmpl,
        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;
 
        auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,
@@ -458,7 +457,6 @@ static int crypto_authenc_esn_create(struct crypto_template *tmpl,
                goto err_drop_enc;
 
        inst->alg.base.cra_flags = enc->cra_flags & CRYPTO_ALG_ASYNC;
-       inst->alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
        inst->alg.base.cra_priority = enc->cra_priority * 10 +
                                      auth_base->cra_priority;
        inst->alg.base.cra_blocksize = enc->cra_blocksize;

diff --git a/crypto/ccm.c b/crypto/ccm.c
index b63f96a0b39ca96acc79c4601ee2959e54fefecd..cc31ea4335bf3640b25499cb3b5aea21e65ae778 100644 (file)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -518,8 +518,7 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
        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;
 
        cipher = crypto_alg_mod_lookup(cipher_name,  CRYPTO_ALG_TYPE_CIPHER,
@@ -571,7 +570,6 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
        memcpy(inst->alg.base.cra_name, full_name, CRYPTO_MAX_ALG_NAME);
 
        inst->alg.base.cra_flags = ctr->cra_flags & CRYPTO_ALG_ASYNC;
-       inst->alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
        inst->alg.base.cra_priority = (cipher->cra_priority +
                                       ctr->cra_priority) / 2;
        inst->alg.base.cra_blocksize = 1;
@@ -820,8 +818,7 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl,
        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;
 
        ccm_name = crypto_attr_alg_name(tb[1]);
@@ -861,7 +858,6 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl,
                goto out_drop_alg;
 
        inst->alg.base.cra_flags = alg->base.cra_flags & CRYPTO_ALG_ASYNC;
-       inst->alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
        inst->alg.base.cra_priority = alg->base.cra_priority;
        inst->alg.base.cra_blocksize = 1;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask;

diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c
index b71445f282ad2ac62d23a0dee095d67572e12de3..99c3cce0129035b5c41e2e8b4ebdab5ecd9fde2e 100644 (file)
--- 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;

diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index e5076f85b9e48cab9d03bb96dcb16858844ac898..c81861b1350b60a1c2def7695dd16d7b0db39ade 100644 (file)
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -177,8 +177,8 @@ static inline void cryptd_check_internal(struct rtattr **tb, u32 *type,
        if (IS_ERR(algt))
                return;
 
-       *type |= algt->type & (CRYPTO_ALG_INTERNAL | CRYPTO_ALG_AEAD_NEW);
-       *mask |= algt->mask & (CRYPTO_ALG_INTERNAL | CRYPTO_ALG_AEAD_NEW);
+       *type |= algt->type & CRYPTO_ALG_INTERNAL;
+       *mask |= algt->mask & CRYPTO_ALG_INTERNAL;
 }
 
 static int cryptd_blkcipher_setkey(struct crypto_ablkcipher *parent,
@@ -805,9 +805,7 @@ static int cryptd_create_aead(struct crypto_template *tmpl,
                goto out_drop_aead;
 
        inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC |
-                                  (alg->base.cra_flags &
-                                   (CRYPTO_ALG_INTERNAL |
-                                    CRYPTO_ALG_AEAD_NEW));
+                                  (alg->base.cra_flags & CRYPTO_ALG_INTERNAL);
        inst->alg.base.cra_ctxsize = sizeof(struct cryptd_aead_ctx);
 
        inst->alg.ivsize = crypto_aead_alg_ivsize(alg);

diff --git a/crypto/gcm.c b/crypto/gcm.c
index 0c9e33bdce1a76ea62b40956cd48619cedcd5e8e..ddb4f29b2fe6b0fc917ac9f3b4c2134a5b3c52e4 100644 (file)
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -634,8 +634,7 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,
        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;
 
        ghash_alg = crypto_find_alg(ghash_name, &crypto_ahash_type,
@@ -690,7 +689,6 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,
 
        inst->alg.base.cra_flags = (ghash->base.cra_flags | ctr->cra_flags) &
                                   CRYPTO_ALG_ASYNC;
-       inst->alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
        inst->alg.base.cra_priority = (ghash->base.cra_priority +
                                       ctr->cra_priority) / 2;
        inst->alg.base.cra_blocksize = 1;
@@ -935,8 +933,7 @@ static int crypto_rfc4106_create(struct crypto_template *tmpl,
        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;
 
        ccm_name = crypto_attr_alg_name(tb[1]);
@@ -976,7 +973,6 @@ static int crypto_rfc4106_create(struct crypto_template *tmpl,
                goto out_drop_alg;
 
        inst->alg.base.cra_flags = alg->base.cra_flags & CRYPTO_ALG_ASYNC;
-       inst->alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
        inst->alg.base.cra_priority = alg->base.cra_priority;
        inst->alg.base.cra_blocksize = 1;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask;
@@ -1175,8 +1171,7 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl,
        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;
 
        ccm_name = crypto_attr_alg_name(tb[1]);
@@ -1217,7 +1212,6 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl,
                goto out_drop_alg;
 
        inst->alg.base.cra_flags = alg->base.cra_flags & CRYPTO_ALG_ASYNC;
-       inst->alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
        inst->alg.base.cra_priority = alg->base.cra_priority;
        inst->alg.base.cra_blocksize = 1;
        inst->alg.base.cra_alignmask = alg->base.cra_alignmask;

diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index 001a3a3e75dfd152c4687bc5b70eb0e60ce2faf8..ee9cfb99fe256af06ae7ad5d946c3b76d90de1e9 100644 (file)
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -295,9 +295,7 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
        ctx = aead_instance_ctx(inst);
        crypto_set_aead_spawn(&ctx->spawn, aead_crypto_instance(inst));
 
-       err = crypto_grab_aead(&ctx->spawn, name,
-                              algt->type & CRYPTO_ALG_AEAD_NEW,
-                              algt->mask & CRYPTO_ALG_AEAD_NEW);
+       err = crypto_grab_aead(&ctx->spawn, name, 0, 0);
        if (err)
                goto out_free_inst;
 
@@ -307,7 +305,6 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
                goto out_drop_aead;
 
        inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC;
-       inst->alg.base.cra_flags |= alg->base.cra_flags & CRYPTO_ALG_AEAD_NEW;
 
        inst->alg.ivsize = crypto_aead_alg_ivsize(alg);
        inst->alg.maxauthsize = crypto_aead_alg_maxauthsize(alg);

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index e9a05ba2bfb4468d9fc6550bdf27fdb0a0adad9c..2b00b617daab537dba7657b6fbc569d440db931f 100644 (file)
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -344,12 +344,7 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
                goto out_nosg;
        sgout = &sg[9];
 
-       tfm = crypto_alloc_aead(algo, CRYPTO_ALG_AEAD_NEW,
-                               CRYPTO_ALG_AEAD_NEW);
-       if (PTR_ERR(tfm) == -ENOENT) {
-               aad_size -= 8;
-               tfm = crypto_alloc_aead(algo, 0, CRYPTO_ALG_AEAD_NEW);
-       }
+       tfm = crypto_alloc_aead(algo, 0, 0);
 
        if (IS_ERR(tfm)) {
                pr_err("alg: aead: Failed to load transform for %s: %ld\n", algo,

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 3361259273772e47a90c4528bedcd4f9cd4a55e8..83d2306ce7ab18ae0c6c1a5aeafbd80d020e161e 100644 (file)
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -4359,8 +4359,7 @@ static void caam_aead_alg_init(struct caam_aead_alg *t_alg)
        alg->base.cra_module = THIS_MODULE;
        alg->base.cra_priority = CAAM_CRA_PRIORITY;
        alg->base.cra_ctxsize = sizeof(struct caam_ctx);
-       alg->base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |
-                             CRYPTO_ALG_AEAD_NEW;
+       alg->base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY;
 
        alg->init = caam_aead_init;
        alg->exit = caam_aead_exit;

diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index 411de261e40c0ebaa3f65879a5f79bc15f4684c1..8f279035328125de8f8c1216392e5674def45753 100644 (file)
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -1451,7 +1451,6 @@ static int __init ixp_module_init(void)
 
                /* authenc */
                cra->base.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
-                                     CRYPTO_ALG_AEAD_NEW |
                                      CRYPTO_ALG_ASYNC;
                cra->setkey = aead_setkey;
                cra->setauthsize = aead_setauthsize;

diff --git a/drivers/crypto/nx/nx-aes-ccm.c b/drivers/crypto/nx/nx-aes-ccm.c
index 195c9207a98d885e21b9f0f8fc7bab517aa9ed22..73ef499227881e6fd5c71c65d00f486a1f173dd4 100644 (file)
--- a/drivers/crypto/nx/nx-aes-ccm.c
+++ b/drivers/crypto/nx/nx-aes-ccm.c
@@ -559,8 +559,7 @@ struct aead_alg nx_ccm_aes_alg = {
                .cra_name        = "ccm(aes)",
                .cra_driver_name = "ccm-aes-nx",
                .cra_priority    = 300,
-               .cra_flags       = CRYPTO_ALG_NEED_FALLBACK |
-                                  CRYPTO_ALG_AEAD_NEW,
+               .cra_flags       = CRYPTO_ALG_NEED_FALLBACK,
                .cra_blocksize   = 1,
                .cra_ctxsize     = sizeof(struct nx_crypto_ctx),
                .cra_module      = THIS_MODULE,
@@ -580,8 +579,7 @@ struct aead_alg nx_ccm4309_aes_alg = {
                .cra_name        = "rfc4309(ccm(aes))",
                .cra_driver_name = "rfc4309-ccm-aes-nx",
                .cra_priority    = 300,
-               .cra_flags       = CRYPTO_ALG_NEED_FALLBACK |
-                                  CRYPTO_ALG_AEAD_NEW,
+               .cra_flags       = CRYPTO_ALG_NEED_FALLBACK,
                .cra_blocksize   = 1,
                .cra_ctxsize     = sizeof(struct nx_crypto_ctx),
                .cra_module      = THIS_MODULE,

diff --git a/drivers/crypto/nx/nx-aes-gcm.c b/drivers/crypto/nx/nx-aes-gcm.c
index 5719638b8642dfabcf4499491c47b9ce1b06ff62..eee624f589b6545a310d081e772d5924094ed70d 100644 (file)
--- a/drivers/crypto/nx/nx-aes-gcm.c
+++ b/drivers/crypto/nx/nx-aes-gcm.c
@@ -490,7 +490,6 @@ struct aead_alg nx_gcm_aes_alg = {
        .base = {
                .cra_name        = "gcm(aes)",
                .cra_driver_name = "gcm-aes-nx",
-               .cra_flags       = CRYPTO_ALG_AEAD_NEW,
                .cra_priority    = 300,
                .cra_blocksize   = 1,
                .cra_ctxsize     = sizeof(struct nx_crypto_ctx),
@@ -509,7 +508,6 @@ struct aead_alg nx_gcm4106_aes_alg = {
        .base = {
                .cra_name        = "rfc4106(gcm(aes))",
                .cra_driver_name = "rfc4106-gcm-aes-nx",
-               .cra_flags       = CRYPTO_ALG_AEAD_NEW,
                .cra_priority    = 300,
                .cra_blocksize   = 1,
                .cra_ctxsize     = sizeof(struct nx_crypto_ctx),

diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c
index e0f0c3497b120bae5a8a567b688ee5d913f18b04..da36de26a4dc1074859fc5e5082630adc57897f3 100644 (file)
--- a/drivers/crypto/picoxcell_crypto.c
+++ b/drivers/crypto/picoxcell_crypto.c
@@ -1738,7 +1738,6 @@ static int spacc_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&engine->registered_aeads);
        for (i = 0; i < engine->num_aeads; ++i) {
                engine->aeads[i].engine = engine;
-               engine->aeads[i].alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
                err = crypto_register_aead(&engine->aeads[i].alg);
                if (!err) {
                        list_add_tail(&engine->aeads[i].entry,

diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c
index b7099f2fea286010989f2ace72dce854bc50470c..2bd913aceaeb5c0370bc428d6c52278d1a4ecd78 100644 (file)
--- a/drivers/crypto/qat/qat_common/qat_algs.c
+++ b/drivers/crypto/qat/qat_common/qat_algs.c
@@ -1109,7 +1109,7 @@ static struct aead_alg qat_aeads[] = { {
                .cra_name = "authenc(hmac(sha1),cbc(aes))",
                .cra_driver_name = "qat_aes_cbc_hmac_sha1",
                .cra_priority = 4001,
-               .cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_AEAD_NEW,
+               .cra_flags = CRYPTO_ALG_ASYNC,
                .cra_blocksize = AES_BLOCK_SIZE,
                .cra_ctxsize = sizeof(struct qat_alg_aead_ctx),
                .cra_module = THIS_MODULE,
@@ -1126,7 +1126,7 @@ static struct aead_alg qat_aeads[] = { {
                .cra_name = "authenc(hmac(sha256),cbc(aes))",
                .cra_driver_name = "qat_aes_cbc_hmac_sha256",
                .cra_priority = 4001,
-               .cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_AEAD_NEW,
+               .cra_flags = CRYPTO_ALG_ASYNC,
                .cra_blocksize = AES_BLOCK_SIZE,
                .cra_ctxsize = sizeof(struct qat_alg_aead_ctx),
                .cra_module = THIS_MODULE,
@@ -1143,7 +1143,7 @@ static struct aead_alg qat_aeads[] = { {
                .cra_name = "authenc(hmac(sha512),cbc(aes))",
                .cra_driver_name = "qat_aes_cbc_hmac_sha512",
                .cra_priority = 4001,
-               .cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_AEAD_NEW,
+               .cra_flags = CRYPTO_ALG_ASYNC,
                .cra_blocksize = AES_BLOCK_SIZE,
                .cra_ctxsize = sizeof(struct qat_alg_aead_ctx),
                .cra_module = THIS_MODULE,
@@ -1197,7 +1197,7 @@ int qat_algs_register(void)
                goto unlock;
 
        for (i = 0; i < ARRAY_SIZE(qat_aeads); i++)
-               qat_aeads[i].base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_AEAD_NEW;
+               qat_aeads[i].base.cra_flags = CRYPTO_ALG_ASYNC;
 
        ret = crypto_register_aeads(qat_aeads, ARRAY_SIZE(qat_aeads));
        if (ret)

diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 1bc8dd91e217592c78afd3a0b35c5c1c264e7a8b..cd774534d987756f57fd79f9d6441a51d74af609 100644 (file)
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -2730,7 +2730,6 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,
                break;
        case CRYPTO_ALG_TYPE_AEAD:
                alg = &t_alg->algt.alg.aead.base;
-               alg->cra_flags |= CRYPTO_ALG_AEAD_NEW;
                t_alg->algt.alg.aead.init = talitos_cra_init_aead;
                t_alg->algt.alg.aead.setkey = aead_setkey;
                t_alg->algt.alg.aead.encrypt = aead_encrypt;

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 7f4aee9e1f9118397b46ecce06636698b5ddc63e..e71cb70a1ac2f6eb1faf9023671f469574786c60 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -101,12 +101,6 @@
  */
 #define CRYPTO_ALG_INTERNAL            0x00002000
 
-/*
- * Temporary flag used to prevent legacy AEAD implementations from
- * being used by user-space.
- */
-#define CRYPTO_ALG_AEAD_NEW            0x00004000
-
 /*
  * Transform masks and values (for crt_flags).
  */