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

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

crypto/skcipher.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

include/crypto/skcipher.h

+1 −2
Original line number Diff line number Diff line
@@ -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(

CRA Git | Maintained and supported by SUSTech CRA and CCSE