crypto: skcipher - remove crypto_skcipher::decrypt (7e1c1099) · Commits · 戴 / test

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>

crypto/skcipher.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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)

include/crypto/skcipher.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@ struct skcipher_request {
		};

		struct crypto_skcipher {
		int (decrypt)(struct skcipher_request req);

		unsigned int reqsize;

		struct crypto_tfm base;

Admin message