All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers@kernel.org>
To: linux-crypto@vger.kernel.org
Subject: [PATCH 5/6] crypto: skcipher - remove crypto_skcipher::decrypt
Date: Fri, 29 Nov 2019 10:23:07 -0800	[thread overview]
Message-ID: <20191129182308.53961-6-ebiggers@kernel.org> (raw)
In-Reply-To: <20191129182308.53961-1-ebiggers@kernel.org>

From: Eric Biggers <ebiggers@google.com>

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>
---
 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;
-- 
2.24.0


  parent reply	other threads:[~2019-11-29 18:24 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-29 18:23 [PATCH 0/6] crypto: skcipher - simplifications due to {,a}blkcipher removal Eric Biggers
2019-11-29 18:23 ` [PATCH 1/6] crypto: skcipher - remove crypto_skcipher::ivsize Eric Biggers
2019-11-29 18:23 ` [PATCH 2/6] crypto: skcipher - remove crypto_skcipher::keysize Eric Biggers
2019-11-29 18:23 ` [PATCH 3/6] crypto: skcipher - remove crypto_skcipher::setkey Eric Biggers
2019-11-29 18:23 ` [PATCH 4/6] crypto: skcipher - remove crypto_skcipher::encrypt Eric Biggers
2019-11-29 18:23 ` Eric Biggers [this message]
2019-11-29 18:23 ` [PATCH 6/6] crypto: skcipher - remove crypto_skcipher_extsize() Eric Biggers
2019-12-03 16:35 ` [PATCH 0/6] crypto: skcipher - simplifications due to {,a}blkcipher removal Ard Biesheuvel
2019-12-11  9:41 ` Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191129182308.53961-6-ebiggers@kernel.org \
    --to=ebiggers@kernel.org \
    --cc=linux-crypto@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.