openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2019-11-29 10:23:03 -08:00 committed by Herbert Xu
parent 0a940d4e27
commit 140734d371
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/skcipher.c
View File

@ -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);

3
include/crypto/skcipher.h
View File

@ -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)
*/ */
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(