From: Eric Biggers Date: Fri, 29 Nov 2019 18:23:03 +0000 (-0800) Subject: crypto: skcipher - remove crypto_skcipher::ivsize X-Git-Tag: v5.6-rc1~152^2~216 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=140734d3711335836cc1b9706d73953750fa4c8d;p=thirdparty%2Flinux.git crypto: skcipher - remove crypto_skcipher::ivsize Due to the removal of the blkcipher and ablkcipher algorithm types, crypto_skcipher::ivsize is now redundant since it always equals crypto_skcipher_alg(tfm)->ivsize. Remove it and update crypto_skcipher_ivsize() accordingly. Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu --- diff --git a/crypto/skcipher.c b/crypto/skcipher.c index 13da43c84b648..7d2e722e82af5 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -686,7 +686,6 @@ static int crypto_skcipher_init_tfm(struct crypto_tfm *tfm) skcipher->setkey = skcipher_setkey; skcipher->encrypt = alg->encrypt; skcipher->decrypt = alg->decrypt; - skcipher->ivsize = alg->ivsize; skcipher->keysize = alg->max_keysize; skcipher_set_needkey(skcipher); diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h index b4655d91661fb..bf656a97cb657 100644 --- a/include/crypto/skcipher.h +++ b/include/crypto/skcipher.h @@ -40,7 +40,6 @@ struct crypto_skcipher { int (*encrypt)(struct skcipher_request *req); int (*decrypt)(struct skcipher_request *req); - unsigned int ivsize; unsigned int reqsize; unsigned int keysize; @@ -255,7 +254,7 @@ static inline unsigned int crypto_skcipher_alg_ivsize(struct skcipher_alg *alg) */ static inline unsigned int crypto_skcipher_ivsize(struct crypto_skcipher *tfm) { - return tfm->ivsize; + return crypto_skcipher_alg(tfm)->ivsize; } static inline unsigned int crypto_sync_skcipher_ivsize(