From 7e1c10991822de1c7a2d64647da56d96f430606c Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 29 Nov 2019 10:23:07 -0800 Subject: crypto: skcipher - remove crypto_skcipher::decrypt 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 Signed-off-by: Herbert Xu --- crypto/skcipher.c | 4 +--- include/crypto/skcipher.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/crypto/skcipher.c b/crypto/skcipher.c index 926295ce1b07..e4e4a445dc66 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -665,7 +665,7 @@ int crypto_skcipher_decrypt(struct skcipher_request *req) if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) ret = -ENOKEY; else - ret = tfm->decrypt(req); + ret = crypto_skcipher_alg(tfm)->decrypt(req); crypto_stats_skcipher_decrypt(cryptlen, ret, alg); 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 skcipher_alg *alg = crypto_skcipher_alg(skcipher); - skcipher->decrypt = alg->decrypt; - skcipher_set_needkey(skcipher); if (alg->exit) diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h index 694215a59719..8ebf4167632b 100644 --- a/include/crypto/skcipher.h +++ b/include/crypto/skcipher.h @@ -35,8 +35,6 @@ struct skcipher_request { }; struct crypto_skcipher { - int (*decrypt)(struct skcipher_request *req); - unsigned int reqsize; struct crypto_tfm base; -- cgit v1.2.3