2019-11-18 07:22:23

by Eric Biggers

Subject: [PATCH] crypto: chacha_generic - remove unnecessary setkey() functions

From: Eric Biggers <[email protected]>

Use chacha20_setkey() and chacha12_setkey() from
<crypto/internal/chacha.h> instead of defining them again in
chacha_generic.c.

Signed-off-by: Eric Biggers <[email protected]>
---
crypto/chacha_generic.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c
index c1b147318393..8beea79ab117 100644
--- a/crypto/chacha_generic.c
+++ b/crypto/chacha_generic.c
@@ -37,18 +37,6 @@ static int chacha_stream_xor(struct skcipher_request *req,
return err;
}

-static int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
- unsigned int keysize)
-{
- return chacha_setkey(tfm, key, keysize, 20);
-}
-
-static int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
- unsigned int keysize)
-{
- return chacha_setkey(tfm, key, keysize, 12);
-}
-
static int crypto_chacha_crypt(struct skcipher_request *req)
{
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
@@ -91,7 +79,7 @@ static struct skcipher_alg algs[] = {
.max_keysize = CHACHA_KEY_SIZE,
.ivsize = CHACHA_IV_SIZE,
.chunksize = CHACHA_BLOCK_SIZE,
- .setkey = crypto_chacha20_setkey,
+ .setkey = chacha20_setkey,
.encrypt = crypto_chacha_crypt,
.decrypt = crypto_chacha_crypt,
}, {
@@ -106,7 +94,7 @@ static struct skcipher_alg algs[] = {
.max_keysize = CHACHA_KEY_SIZE,
.ivsize = XCHACHA_IV_SIZE,
.chunksize = CHACHA_BLOCK_SIZE,
- .setkey = crypto_chacha20_setkey,
+ .setkey = chacha20_setkey,
.encrypt = crypto_xchacha_crypt,
.decrypt = crypto_xchacha_crypt,
}, {
@@ -121,7 +109,7 @@ static struct skcipher_alg algs[] = {
.max_keysize = CHACHA_KEY_SIZE,
.ivsize = XCHACHA_IV_SIZE,
.chunksize = CHACHA_BLOCK_SIZE,
- .setkey = crypto_chacha12_setkey,
+ .setkey = chacha12_setkey,
.encrypt = crypto_xchacha_crypt,
.decrypt = crypto_xchacha_crypt,
}
--
2.24.0

2019-11-18 07:27:32

by Ard Biesheuvel

Subject: Re: [PATCH] crypto: chacha_generic - remove unnecessary setkey() functions

On Mon, 18 Nov 2019 at 08:21, Eric Biggers <[email protected]> wrote:
>
> From: Eric Biggers <[email protected]>
>
> Use chacha20_setkey() and chacha12_setkey() from
> <crypto/internal/chacha.h> instead of defining them again in
> chacha_generic.c.
>
> Signed-off-by: Eric Biggers <[email protected]>

Acked-by: Ard Biesheuvel <[email protected]>

> ---
> crypto/chacha_generic.c | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c
> index c1b147318393..8beea79ab117 100644
> --- a/crypto/chacha_generic.c
> +++ b/crypto/chacha_generic.c
> @@ -37,18 +37,6 @@ static int chacha_stream_xor(struct skcipher_request *req,
> return err;
> }
>
> -static int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
> - unsigned int keysize)
> -{
> - return chacha_setkey(tfm, key, keysize, 20);
> -}
> -
> -static int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
> - unsigned int keysize)
> -{
> - return chacha_setkey(tfm, key, keysize, 12);
> -}
> -
> static int crypto_chacha_crypt(struct skcipher_request *req)
> {
> struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
> @@ -91,7 +79,7 @@ static struct skcipher_alg algs[] = {
> .max_keysize = CHACHA_KEY_SIZE,
> .ivsize = CHACHA_IV_SIZE,
> .chunksize = CHACHA_BLOCK_SIZE,
> - .setkey = crypto_chacha20_setkey,
> + .setkey = chacha20_setkey,
> .encrypt = crypto_chacha_crypt,
> .decrypt = crypto_chacha_crypt,
> }, {
> @@ -106,7 +94,7 @@ static struct skcipher_alg algs[] = {
> .max_keysize = CHACHA_KEY_SIZE,
> .ivsize = XCHACHA_IV_SIZE,
> .chunksize = CHACHA_BLOCK_SIZE,
> - .setkey = crypto_chacha20_setkey,
> + .setkey = chacha20_setkey,
> .encrypt = crypto_xchacha_crypt,
> .decrypt = crypto_xchacha_crypt,
> }, {
> @@ -121,7 +109,7 @@ static struct skcipher_alg algs[] = {
> .max_keysize = CHACHA_KEY_SIZE,
> .ivsize = XCHACHA_IV_SIZE,
> .chunksize = CHACHA_BLOCK_SIZE,
> - .setkey = crypto_chacha12_setkey,
> + .setkey = chacha12_setkey,
> .encrypt = crypto_xchacha_crypt,
> .decrypt = crypto_xchacha_crypt,
> }
> --
> 2.24.0
>

2019-11-22 11:12:24

by Herbert Xu

Subject: Re: [PATCH] crypto: chacha_generic - remove unnecessary setkey() functions

On Sun, Nov 17, 2019 at 11:21:29PM -0800, Eric Biggers wrote:
> From: Eric Biggers <[email protected]>
>
> Use chacha20_setkey() and chacha12_setkey() from
> <crypto/internal/chacha.h> instead of defining them again in
> chacha_generic.c.
>
> Signed-off-by: Eric Biggers <[email protected]>
> ---
> crypto/chacha_generic.c | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt