Commit a35528ec authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: skcipher - Get rid of crypto_grab_skcipher2() 



Since commit 3a01d0ee ("crypto: skcipher - Remove top-level
givcipher interface"), crypto_grab_skcipher2() and
crypto_grab_skcipher() are equivalent.  So switch callers of
crypto_grab_skcipher2() to crypto_grab_skcipher() and remove it.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a1fa98d8

crypto/authenc.c

+3 −3
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int crypto_authenc_create(struct crypto_template *tmpl, 
		goto err_free_inst;



	crypto_set_skcipher_spawn(&ctx->enc, aead_crypto_instance(inst));

	err = crypto_grab_skcipher2(&ctx->enc, enc_name, 0,

	err = crypto_grab_skcipher(&ctx->enc, enc_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));

	if (err)

crypto/authencesn.c

+3 −3
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static int crypto_authenc_esn_create(struct crypto_template *tmpl, 
		goto err_free_inst;



	crypto_set_skcipher_spawn(&ctx->enc, aead_crypto_instance(inst));

	err = crypto_grab_skcipher2(&ctx->enc, enc_name, 0,

	err = crypto_grab_skcipher(&ctx->enc, enc_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));

	if (err)

crypto/ccm.c

+3 −3
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl, 
		goto err_free_inst;



	crypto_set_skcipher_spawn(&ictx->ctr, aead_crypto_instance(inst));

	err = crypto_grab_skcipher2(&ictx->ctr, ctr_name, 0,

	err = crypto_grab_skcipher(&ictx->ctr, ctr_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));

	if (err)

crypto/chacha20poly1305.c

+3 −3
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, 
		goto err_free_inst;



	crypto_set_skcipher_spawn(&ctx->chacha, aead_crypto_instance(inst));

	err = crypto_grab_skcipher2(&ctx->chacha, chacha_name, 0,

	err = crypto_grab_skcipher(&ctx->chacha, chacha_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));

	if (err)

crypto/ctr.c

+3 −3
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int crypto_rfc3686_create(struct crypto_template *tmpl, 
	spawn = skcipher_instance_ctx(inst);



	crypto_set_skcipher_spawn(spawn, skcipher_crypto_instance(inst));

	err = crypto_grab_skcipher2(spawn, cipher_name, 0,

	err = crypto_grab_skcipher(spawn, cipher_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));

	if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE