Re: [PATCH] crypto: skcipher - Get rid of crypto_grab_skcipher2()

[Herbert Xu]

On Fri, Oct 28, 2016 at 09:51:13AM -0700, Eric Biggers wrote:
> Since commit 3a01d0ee2b99 ("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: Eric Biggers 

Patch applied.  Thanks.
-- 
Email: Herbert Xu 
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] crypto: skcipher - Get rid of crypto_grab_skcipher2()

[Eric Biggers]

Since commit 3a01d0ee2b99 ("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: Eric Biggers 
---
 crypto/authenc.c   | 6 +++---
 crypto/authencesn.c| 6 +++---
 crypto/ccm.c   | 6 +++---
 crypto/chacha20poly1305.c  | 6 +++---
 crypto/ctr.c   | 6 +++---
 crypto/cts.c   | 6 +++---
 crypto/gcm.c   | 6 +++---
 include/crypto/internal/skcipher.h | 6 --
 8 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/crypto/authenc.c b/crypto/authenc.c
index a7e1ac7..03d5edc 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -420,9 +420,9 @@ static int crypto_authenc_create(struct crypto_template 
*tmpl,
goto err_free_inst;
 
crypto_set_skcipher_spawn(>enc, aead_crypto_instance(inst));
-   err = crypto_grab_skcipher2(>enc, enc_name, 0,
-   crypto_requires_sync(algt->type,
-algt->mask));
+   err = crypto_grab_skcipher(>enc, enc_name, 0,
+  crypto_requires_sync(algt->type,
+   algt->mask));
if (err)
goto err_drop_auth;
 
diff --git a/crypto/authencesn.c b/crypto/authencesn.c
index 121010a..bad6ef4 100644
--- a/crypto/authencesn.c
+++ b/crypto/authencesn.c
@@ -441,9 +441,9 @@ static int crypto_authenc_esn_create(struct crypto_template 
*tmpl,
goto err_free_inst;
 
crypto_set_skcipher_spawn(>enc, aead_crypto_instance(inst));
-   err = crypto_grab_skcipher2(>enc, enc_name, 0,
-   crypto_requires_sync(algt->type,
-algt->mask));
+   err = crypto_grab_skcipher(>enc, enc_name, 0,
+  crypto_requires_sync(algt->type,
+   algt->mask));
if (err)
goto err_drop_auth;
 
diff --git a/crypto/ccm.c b/crypto/ccm.c
index 006d857..67e3636 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -544,9 +544,9 @@ static int crypto_ccm_create_common(struct crypto_template 
*tmpl,
goto err_free_inst;
 
crypto_set_skcipher_spawn(>ctr, aead_crypto_instance(inst));
-   err = crypto_grab_skcipher2(>ctr, ctr_name, 0,
-   crypto_requires_sync(algt->type,
-algt->mask));
+   err = crypto_grab_skcipher(>ctr, ctr_name, 0,
+  crypto_requires_sync(algt->type,
+   algt->mask));
if (err)
goto err_drop_cipher;
 
diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c
index e899ef5..66291d4 100644
--- a/crypto/chacha20poly1305.c
+++ b/crypto/chacha20poly1305.c
@@ -625,9 +625,9 @@ static int chachapoly_create(struct crypto_template *tmpl, 
struct rtattr **tb,
goto err_free_inst;
 
crypto_set_skcipher_spawn(>chacha, aead_crypto_instance(inst));
-   err = crypto_grab_skcipher2(>chacha, chacha_name, 0,
-   crypto_requires_sync(algt->type,
-algt->mask));
+   err = crypto_grab_skcipher(>chacha, chacha_name, 0,
+  crypto_requires_sync(algt->type,
+   algt->mask));
if (err)
goto err_drop_poly;
 
diff --git a/crypto/ctr.c b/crypto/ctr.c
index ff4d21e..57114b1 100644
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -370,9 +370,9 @@ 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,
-   crypto_requires_sync(algt->type,
-algt->mask));
+   err = crypto_grab_skcipher(spawn, cipher_name, 0,
+  crypto_requires_sync(algt->type,
+   algt->mask));
if (err)
goto err_free_inst;
 
diff --git a/crypto/cts.c b/crypto/cts.c
index 5197618..8883b62 100644
--- a/crypto/cts.c
+++ b/crypto/cts.c
@@ -348,9 +348,9 @@ static int crypto_cts_create(struct crypto_template *tmpl, 
struct rtattr **tb)
spawn = skcipher_instance_ctx(inst);
 
crypto_set_skcipher_spawn(spawn, skcipher_crypto_instance(inst));
-   err = crypto_grab_skcipher2(spawn, cipher_name, 0,
-