Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

crypto: skcipher - remove crypto_skcipher::decrypt

Browse Source 
Due to the removal of the blkcipher and ablkcipher algorithm types,
crypto_skcipher::decrypt is now redundant since it always equals
crypto_skcipher_alg(tfm)->decrypt.

Remove it and update crypto_skcipher_decrypt() accordingly.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2019-11-29 10:23:07 -08:00 committed by Herbert Xu
parent 848755e315
commit 7e1c109918
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/skcipher.c
View File

@ -665,7 +665,7 @@ int crypto_skcipher_decrypt(struct skcipher_request *req)
if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
ret = -ENOKEY; ret = -ENOKEY;
else else
ret = tfm->decrypt(req); ret = crypto_skcipher_alg(tfm)->decrypt(req);
crypto_stats_skcipher_decrypt(cryptlen, ret, alg); crypto_stats_skcipher_decrypt(cryptlen, ret, alg);
return ret; return ret;
} }
@ -684,8 +684,6 @@ static int crypto_skcipher_init_tfm(struct crypto_tfm *tfm)
struct crypto_skcipher *skcipher = __crypto_skcipher_cast(tfm); struct crypto_skcipher *skcipher = __crypto_skcipher_cast(tfm);
struct skcipher_alg *alg = crypto_skcipher_alg(skcipher); struct skcipher_alg *alg = crypto_skcipher_alg(skcipher);
skcipher->decrypt = alg->decrypt;
skcipher_set_needkey(skcipher); skcipher_set_needkey(skcipher);
if (alg->exit) if (alg->exit)

2
include/crypto/skcipher.h
View File

@ -35,8 +35,6 @@ struct skcipher_request {
}; };
struct crypto_skcipher { struct crypto_skcipher {
int (*decrypt)(struct skcipher_request *req);
unsigned int reqsize; unsigned int reqsize;
struct crypto_tfm base; struct crypto_tfm base;