Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e4b8c1f authored by Herbert Xu's avatar Herbert Xu
Browse files

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b0d955ba

arch/arm64/crypto/aes-ce-ccm-glue.c

+0 −1
Original line number Diff line number Diff line
@@ -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),

arch/x86/crypto/aesni-intel_glue.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

crypto/aead.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

crypto/algif_aead.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

crypto/authenc.c

+1 −3
Original line number Diff line number Diff line
@@ -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;