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>

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 4197b5ed57c456bcc83a2b16648c6817edfaf6f3..926295ce1b07b4088f213a7657898b66bf98080a 100644 (file)
--- 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 ea94cc422b94651f228fd1b0c3fa3386209c46e2..694215a5971998e049d8da402b0182e38c8be906 100644 (file)
--- 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;