diff options
| author |   Eric Biggers <ebiggers@google.com> | 2019-11-29 10:23:07 -0800 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2019-12-11 16:36:56 +0800 |
| commit | 7e1c10991822de1c7a2d64647da56d96f430606c (patch) | |
| tree | e183116bba5496e6671ea31b6d32c3ecf09aa949 | |
| parent | crypto: skcipher - remove crypto_skcipher::encrypt (diff) | |
| download | wireguard-linux-7e1c10991822de1c7a2d64647da56d96f430606c.tar.xz wireguard-linux-7e1c10991822de1c7a2d64647da56d96f430606c.zip | |
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 <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/skcipher.c | 4 | ||||
| -rw-r--r-- | include/crypto/skcipher.h | 2 |
2 files changed, 1 insertions, 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; |