diff options
| author |   Eric Biggers <ebiggers@google.com> | 2019-11-29 10:23:04 -0800 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2019-12-11 16:36:56 +0800 |
| commit | 9ac0d136938ad8b8dd309f833abe5304dd2f0b08 (patch) | |
| tree | 61c7ad1c02d24f91a2f82169d090e0dd31c60d5b /include/crypto | |
| parent | crypto: skcipher - remove crypto_skcipher::ivsize (diff) | |
| download | wireguard-linux-9ac0d136938ad8b8dd309f833abe5304dd2f0b08.tar.xz wireguard-linux-9ac0d136938ad8b8dd309f833abe5304dd2f0b08.zip | |
crypto: skcipher - remove crypto_skcipher::keysize
Due to the removal of the blkcipher and ablkcipher algorithm types,
crypto_skcipher::keysize is now redundant since it always equals
crypto_skcipher_alg(tfm)->max_keysize.
Remove it and update crypto_skcipher_default_keysize() accordingly.
Also rename crypto_skcipher_default_keysize() to
crypto_skcipher_max_keysize() to clarify that it specifically returns
the maximum key size, not some unspecified "default".
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/skcipher.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h index bf656a97cb65..d8c28c8186a4 100644 --- a/include/crypto/skcipher.h +++ b/include/crypto/skcipher.h @@ -41,7 +41,6 @@ struct crypto_skcipher { int (*decrypt)(struct skcipher_request *req); unsigned int reqsize; - unsigned int keysize; struct crypto_tfm base; }; @@ -377,10 +376,10 @@ static inline int crypto_sync_skcipher_setkey(struct crypto_sync_skcipher *tfm, return crypto_skcipher_setkey(&tfm->base, key, keylen); } -static inline unsigned int crypto_skcipher_default_keysize( +static inline unsigned int crypto_skcipher_max_keysize( struct crypto_skcipher *tfm) { - return tfm->keysize; + return crypto_skcipher_alg(tfm)->max_keysize; } /** |