diff options
| author |   Eric Biggers <ebiggers@google.com> | 2019-11-29 10:23:06 -0800 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2019-12-11 16:36:56 +0800 |
| commit | 848755e315b61b0f939f6021e119373ff4a407ab (patch) | |
| tree | 6fea564558a3a51b307ad74f83bb678e3c8b3204 | |
| parent | crypto: skcipher - remove crypto_skcipher::setkey (diff) | |
| download | wireguard-linux-848755e315b61b0f939f6021e119373ff4a407ab.tar.xz wireguard-linux-848755e315b61b0f939f6021e119373ff4a407ab.zip | |
crypto: skcipher - remove crypto_skcipher::encrypt
Due to the removal of the blkcipher and ablkcipher algorithm types,
crypto_skcipher::encrypt is now redundant since it always equals
crypto_skcipher_alg(tfm)->encrypt.
Remove it and update crypto_skcipher_encrypt() 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 | 3 | ||||
| -rw-r--r-- | include/crypto/skcipher.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/crypto/skcipher.c b/crypto/skcipher.c index 4197b5ed57c4..926295ce1b07 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -648,7 +648,7 @@ int crypto_skcipher_encrypt(struct skcipher_request *req) if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) ret = -ENOKEY; else - ret = tfm->encrypt(req); + ret = crypto_skcipher_alg(tfm)->encrypt(req); crypto_stats_skcipher_encrypt(cryptlen, ret, alg); return ret; } @@ -684,7 +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->encrypt = alg->encrypt; skcipher->decrypt = alg->decrypt; skcipher_set_needkey(skcipher); diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h index ea94cc422b94..694215a59719 100644 --- a/include/crypto/skcipher.h +++ b/include/crypto/skcipher.h @@ -35,7 +35,6 @@ struct skcipher_request { }; struct crypto_skcipher { - int (*encrypt)(struct skcipher_request *req); int (*decrypt)(struct skcipher_request *req); unsigned int reqsize; |