Commit 140734d3 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0a940d4e
...@@ -686,7 +686,6 @@ static int crypto_skcipher_init_tfm(struct crypto_tfm *tfm) ...@@ -686,7 +686,6 @@ static int crypto_skcipher_init_tfm(struct crypto_tfm *tfm)
skcipher->setkey = skcipher_setkey; skcipher->setkey = skcipher_setkey;
skcipher->encrypt = alg->encrypt; skcipher->encrypt = alg->encrypt;
skcipher->decrypt = alg->decrypt; skcipher->decrypt = alg->decrypt;
skcipher->ivsize = alg->ivsize;
skcipher->keysize = alg->max_keysize; skcipher->keysize = alg->max_keysize;
skcipher_set_needkey(skcipher); skcipher_set_needkey(skcipher);
......
...@@ -40,7 +40,6 @@ struct crypto_skcipher { ...@@ -40,7 +40,6 @@ struct crypto_skcipher {
int (*encrypt)(struct skcipher_request *req); int (*encrypt)(struct skcipher_request *req);
int (*decrypt)(struct skcipher_request *req); int (*decrypt)(struct skcipher_request *req);
unsigned int ivsize;
unsigned int reqsize; unsigned int reqsize;
unsigned int keysize; unsigned int keysize;
...@@ -255,7 +254,7 @@ static inline unsigned int crypto_skcipher_alg_ivsize(struct skcipher_alg *alg) ...@@ -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) 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( static inline unsigned int crypto_sync_skcipher_ivsize(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment