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

crypto: skcipher - Get rid of crypto_spawn_skcipher2() 



Since commit 3a01d0ee ("crypto: skcipher - Remove top-level
givcipher interface"), crypto_spawn_skcipher2() and
crypto_spawn_skcipher() are equivalent.  So switch callers of
crypto_spawn_skcipher2() to crypto_spawn_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 a35528ec

crypto/authenc.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static int crypto_authenc_init_tfm(struct crypto_aead *tfm) 
	if (IS_ERR(auth))

		return PTR_ERR(auth);



	enc = crypto_spawn_skcipher2(&ictx->enc);

	enc = crypto_spawn_skcipher(&ictx->enc);

	err = PTR_ERR(enc);

	if (IS_ERR(enc))

		goto err_free_ahash;

crypto/authencesn.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm) 
	if (IS_ERR(auth))

		return PTR_ERR(auth);



	enc = crypto_spawn_skcipher2(&ictx->enc);

	enc = crypto_spawn_skcipher(&ictx->enc);

	err = PTR_ERR(enc);

	if (IS_ERR(enc))

		goto err_free_ahash;

crypto/ccm.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static int crypto_ccm_init_tfm(struct crypto_aead *tfm) 
	if (IS_ERR(cipher))

		return PTR_ERR(cipher);



	ctr = crypto_spawn_skcipher2(&ictx->ctr);

	ctr = crypto_spawn_skcipher(&ictx->ctr);

	err = PTR_ERR(ctr);

	if (IS_ERR(ctr))

		goto err_free_cipher;

crypto/chacha20poly1305.c

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ static int chachapoly_init(struct crypto_aead *tfm) 
	if (IS_ERR(poly))

		return PTR_ERR(poly);



	chacha = crypto_spawn_skcipher2(&ictx->chacha);

	chacha = crypto_spawn_skcipher(&ictx->chacha);

	if (IS_ERR(chacha)) {

		crypto_free_ahash(poly);

		return PTR_ERR(chacha);

crypto/ctr.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static int crypto_rfc3686_init_tfm(struct crypto_skcipher *tfm) 
	unsigned long align;

	unsigned int reqsize;



	cipher = crypto_spawn_skcipher2(spawn);

	cipher = crypto_spawn_skcipher(spawn);

	if (IS_ERR(cipher))

		return PTR_ERR(cipher);

CRA Git | Maintained and supported by SUSTech CRA and CCSE