Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UPSTREAM: crypto: chacha_generic - remove unnecessary setkey() functions

Browse source 
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 <ebiggers@google.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 2043323a799a660bc84bbee404cf7a2617ec6157)
Bug: 152722841
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2a585793ef6dbf5529d65f0c985ffa6f4072fda3
This commit is contained in:
Eric Biggers 2019-11-17 23:21:29 -08:00 committed by Greg Kroah-Hartman
parent fe1532c758
commit 77073bba3e
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crypto/chacha_generic.c
View file

@ -41,18 +41,6 @@ static int chacha_stream_xor(struct skcipher_request *req,
return err; 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) static int crypto_chacha_crypt(struct skcipher_request *req)
{ {
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
@ -95,7 +83,7 @@ static struct skcipher_alg algs[] = {
.max_keysize = CHACHA_KEY_SIZE, .max_keysize = CHACHA_KEY_SIZE,
.ivsize = CHACHA_IV_SIZE, .ivsize = CHACHA_IV_SIZE,
.chunksize = CHACHA_BLOCK_SIZE, .chunksize = CHACHA_BLOCK_SIZE,
.setkey = crypto_chacha20_setkey, .setkey = chacha20_setkey,
.encrypt = crypto_chacha_crypt, .encrypt = crypto_chacha_crypt,
.decrypt = crypto_chacha_crypt, .decrypt = crypto_chacha_crypt,
}, { }, {
@ -110,7 +98,7 @@ static struct skcipher_alg algs[] = {
.max_keysize = CHACHA_KEY_SIZE, .max_keysize = CHACHA_KEY_SIZE,
.ivsize = XCHACHA_IV_SIZE, .ivsize = XCHACHA_IV_SIZE,
.chunksize = CHACHA_BLOCK_SIZE, .chunksize = CHACHA_BLOCK_SIZE,
.setkey = crypto_chacha20_setkey, .setkey = chacha20_setkey,
.encrypt = crypto_xchacha_crypt, .encrypt = crypto_xchacha_crypt,
.decrypt = crypto_xchacha_crypt, .decrypt = crypto_xchacha_crypt,
}, { }, {
@ -125,7 +113,7 @@ static struct skcipher_alg algs[] = {
.max_keysize = CHACHA_KEY_SIZE, .max_keysize = CHACHA_KEY_SIZE,
.ivsize = XCHACHA_IV_SIZE, .ivsize = XCHACHA_IV_SIZE,
.chunksize = CHACHA_BLOCK_SIZE, .chunksize = CHACHA_BLOCK_SIZE,
.setkey = crypto_chacha12_setkey, .setkey = chacha12_setkey,
.encrypt = crypto_xchacha_crypt, .encrypt = crypto_xchacha_crypt,
.decrypt = crypto_xchacha_crypt, .decrypt = crypto_xchacha_crypt,
} }