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

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
...@@ -324,7 +324,7 @@ static int crypto_authenc_init_tfm(struct crypto_aead *tfm) ...@@ -324,7 +324,7 @@ static int crypto_authenc_init_tfm(struct crypto_aead *tfm)
if (IS_ERR(auth)) if (IS_ERR(auth))
return PTR_ERR(auth); return PTR_ERR(auth);
enc = crypto_spawn_skcipher2(&ictx->enc); enc = crypto_spawn_skcipher(&ictx->enc);
err = PTR_ERR(enc); err = PTR_ERR(enc);
if (IS_ERR(enc)) if (IS_ERR(enc))
goto err_free_ahash; goto err_free_ahash;
......
...@@ -342,7 +342,7 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm) ...@@ -342,7 +342,7 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm)
if (IS_ERR(auth)) if (IS_ERR(auth))
return PTR_ERR(auth); return PTR_ERR(auth);
enc = crypto_spawn_skcipher2(&ictx->enc); enc = crypto_spawn_skcipher(&ictx->enc);
err = PTR_ERR(enc); err = PTR_ERR(enc);
if (IS_ERR(enc)) if (IS_ERR(enc))
goto err_free_ahash; goto err_free_ahash;
......
...@@ -462,7 +462,7 @@ static int crypto_ccm_init_tfm(struct crypto_aead *tfm) ...@@ -462,7 +462,7 @@ static int crypto_ccm_init_tfm(struct crypto_aead *tfm)
if (IS_ERR(cipher)) if (IS_ERR(cipher))
return PTR_ERR(cipher); return PTR_ERR(cipher);
ctr = crypto_spawn_skcipher2(&ictx->ctr); ctr = crypto_spawn_skcipher(&ictx->ctr);
err = PTR_ERR(ctr); err = PTR_ERR(ctr);
if (IS_ERR(ctr)) if (IS_ERR(ctr))
goto err_free_cipher; goto err_free_cipher;
......
...@@ -532,7 +532,7 @@ static int chachapoly_init(struct crypto_aead *tfm) ...@@ -532,7 +532,7 @@ static int chachapoly_init(struct crypto_aead *tfm)
if (IS_ERR(poly)) if (IS_ERR(poly))
return PTR_ERR(poly); return PTR_ERR(poly);
chacha = crypto_spawn_skcipher2(&ictx->chacha); chacha = crypto_spawn_skcipher(&ictx->chacha);
if (IS_ERR(chacha)) { if (IS_ERR(chacha)) {
crypto_free_ahash(poly); crypto_free_ahash(poly);
return PTR_ERR(chacha); return PTR_ERR(chacha);
......
...@@ -312,7 +312,7 @@ static int crypto_rfc3686_init_tfm(struct crypto_skcipher *tfm) ...@@ -312,7 +312,7 @@ static int crypto_rfc3686_init_tfm(struct crypto_skcipher *tfm)
unsigned long align; unsigned long align;
unsigned int reqsize; unsigned int reqsize;
cipher = crypto_spawn_skcipher2(spawn); cipher = crypto_spawn_skcipher(spawn);
if (IS_ERR(cipher)) if (IS_ERR(cipher))
return PTR_ERR(cipher); return PTR_ERR(cipher);
......
...@@ -290,7 +290,7 @@ static int crypto_cts_init_tfm(struct crypto_skcipher *tfm) ...@@ -290,7 +290,7 @@ static int crypto_cts_init_tfm(struct crypto_skcipher *tfm)
unsigned bsize; unsigned bsize;
unsigned align; unsigned align;
cipher = crypto_spawn_skcipher2(spawn); cipher = crypto_spawn_skcipher(spawn);
if (IS_ERR(cipher)) if (IS_ERR(cipher))
return PTR_ERR(cipher); return PTR_ERR(cipher);
......
...@@ -575,7 +575,7 @@ static int crypto_gcm_init_tfm(struct crypto_aead *tfm) ...@@ -575,7 +575,7 @@ static int crypto_gcm_init_tfm(struct crypto_aead *tfm)
if (IS_ERR(ghash)) if (IS_ERR(ghash))
return PTR_ERR(ghash); return PTR_ERR(ghash);
ctr = crypto_spawn_skcipher2(&ictx->ctr); ctr = crypto_spawn_skcipher(&ictx->ctr);
err = PTR_ERR(ctr); err = PTR_ERR(ctr);
if (IS_ERR(ctr)) if (IS_ERR(ctr))
goto err_free_hash; goto err_free_hash;
......
...@@ -91,12 +91,6 @@ static inline struct crypto_skcipher *crypto_spawn_skcipher( ...@@ -91,12 +91,6 @@ static inline struct crypto_skcipher *crypto_spawn_skcipher(
return crypto_spawn_tfm2(&spawn->base); return crypto_spawn_tfm2(&spawn->base);
} }
static inline struct crypto_skcipher *crypto_spawn_skcipher2(
struct crypto_skcipher_spawn *spawn)
{
return crypto_spawn_skcipher(spawn);
}
static inline void crypto_skcipher_set_reqsize( static inline void crypto_skcipher_set_reqsize(
struct crypto_skcipher *skcipher, unsigned int reqsize) struct crypto_skcipher *skcipher, unsigned int reqsize)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment