crypto: remove the CRYPTO_TFM_RES_* flags
Subsystems (30)
cover crypto: remove the CRYPTO_TFM_RES_* flags
The CRYPTO_TFM_RES_* flags are pointless since they are never checked anywhere. And it's not really possible for anyone to start using them without a lot of work, since many drivers aren't setting them or are setting them when they shouldn't.
Also, if we ever actually need to start distinguishing ->setkey() errors better (which is somewhat unlikely, as it's been a long time with no one caring), we'd probably be much better off just using different return values, like -EINVAL if the key is invalid for the algorithm vs. -EKEYREJECTED if the key was rejected by a policy like "no weak keys". That would be much simpler, less error-prone, and easier to test.
So let's just remove these flags for now. This gets rid of a lot of pointless boilerplate code.
Patches 6 and 8 are a bit large since they touch so many drivers, though the changes are straightforward and it would seem overkill to do this as a series of 70 separate patches. But let me know if it's needed.
Eric Biggers (8):
crypto: chelsio - fix writing tfm flags to wrong place
crypto: artpec6 - return correct error code for failed setkey()
crypto: atmel-sha - fix error handling when setting hmac key
crypto: remove unused tfm result flags
crypto: remove CRYPTO_TFM_RES_BAD_BLOCK_LEN
crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN
crypto: remove CRYPTO_TFM_RES_WEAK_KEY
crypto: remove propagation of CRYPTO_TFM_RES_* flags
arch/arm/crypto/aes-ce-glue.c | 14 +----- arch/arm/crypto/crc32-ce-glue.c | 4 +- arch/arm/crypto/ghash-ce-glue.c | 11 +--- arch/arm64/crypto/aes-ce-ccm-glue.c | 8 +-- arch/arm64/crypto/aes-ce-glue.c | 8 +-- arch/arm64/crypto/aes-glue.c | 31 ++---------- arch/arm64/crypto/ghash-ce-glue.c | 8 +-- arch/mips/crypto/crc32-mips.c | 4 +- arch/powerpc/crypto/aes-spe-glue.c | 18 ++----- arch/powerpc/crypto/crc32c-vpmsum_glue.c | 4 +- arch/s390/crypto/aes_s390.c | 27 ++-------- arch/s390/crypto/crc32-vx.c | 8 +-- arch/s390/crypto/ghash_s390.c | 4 +- arch/s390/crypto/paes_s390.c | 25 +++------- arch/sparc/crypto/aes_glue.c | 2 - arch/sparc/crypto/camellia_glue.c | 5 +- arch/sparc/crypto/crc32c_glue.c | 4 +- arch/x86/crypto/aegis128-aesni-glue.c | 4 +- arch/x86/crypto/aesni-intel_glue.c | 10 ++-- arch/x86/crypto/blake2s-glue.c | 4 +- arch/x86/crypto/camellia_aesni_avx2_glue.c | 3 +- arch/x86/crypto/camellia_aesni_avx_glue.c | 9 ++-- arch/x86/crypto/camellia_glue.c | 9 ++-- arch/x86/crypto/cast6_avx_glue.c | 6 +-- arch/x86/crypto/crc32-pclmul_glue.c | 4 +- arch/x86/crypto/crc32c-intel_glue.c | 4 +- arch/x86/crypto/ghash-clmulni-intel_glue.c | 11 +--- arch/x86/crypto/twofish_avx_glue.c | 6 +-- arch/x86/include/asm/crypto/camellia.h | 2 +- crypto/adiantum.c | 8 --- crypto/aegis128-core.c | 4 +- crypto/aes_generic.c | 18 +++---- crypto/anubis.c | 2 - crypto/authenc.c | 12 +---- crypto/authencesn.c | 12 +---- crypto/blake2b_generic.c | 4 +- crypto/blake2s_generic.c | 4 +- crypto/camellia_generic.c | 5 +- crypto/cast6_generic.c | 10 ++-- crypto/ccm.c | 20 ++------ crypto/chacha20poly1305.c | 7 +-- crypto/cipher.c | 5 +- crypto/crc32_generic.c | 4 +- crypto/crc32c_generic.c | 4 +- crypto/cryptd.c | 13 +---- crypto/ctr.c | 7 +-- crypto/cts.c | 6 +-- crypto/des_generic.c | 10 +--- crypto/essiv.c | 26 ++-------- crypto/gcm.c | 19 +------ crypto/ghash-generic.c | 4 +- crypto/lrw.c | 2 - crypto/michael_mic.c | 4 +- crypto/simd.c | 12 +---- crypto/skcipher.c | 10 +--- crypto/sm4_generic.c | 16 ++---- crypto/twofish_common.c | 8 +-- crypto/vmac.c | 4 +- crypto/xts.c | 8 +-- crypto/xxhash_generic.c | 4 +- .../allwinner/sun4i-ss/sun4i-ss-cipher.c | 1 - .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 1 - .../allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 - drivers/crypto/amcc/crypto4xx_alg.c | 31 ++---------- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 1 - drivers/crypto/atmel-aes.c | 14 ++---- drivers/crypto/atmel-authenc.h | 3 +- drivers/crypto/atmel-sha.c | 18 ++----- drivers/crypto/axis/artpec6_crypto.c | 10 +--- drivers/crypto/bcm/cipher.c | 17 +------ drivers/crypto/caam/caamalg.c | 33 +++--------- drivers/crypto/caam/caamalg_qi.c | 44 ++++------------ drivers/crypto/caam/caamalg_qi2.c | 47 ++++------------- drivers/crypto/caam/caamhash.c | 9 +--- drivers/crypto/cavium/cpt/cptvf_algs.c | 2 - drivers/crypto/cavium/nitrox/nitrox_aead.c | 4 +- .../crypto/cavium/nitrox/nitrox_skcipher.c | 12 ++--- drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 1 - drivers/crypto/ccp/ccp-crypto-aes-galois.c | 1 - drivers/crypto/ccp/ccp-crypto-aes.c | 1 - drivers/crypto/ccp/ccp-crypto-sha.c | 4 +- drivers/crypto/ccree/cc_aead.c | 21 +++----- drivers/crypto/ccree/cc_cipher.c | 4 -- drivers/crypto/ccree/cc_hash.c | 6 --- drivers/crypto/chelsio/chcr_algo.c | 50 ++----------------- drivers/crypto/geode-aes.c | 24 ++------- .../crypto/inside-secure/safexcel_cipher.c | 43 ++++------------ drivers/crypto/inside-secure/safexcel_hash.c | 22 ++------ drivers/crypto/ixp4xx_crypto.c | 31 ++---------- drivers/crypto/marvell/cipher.c | 4 +- drivers/crypto/mediatek/mtk-aes.c | 4 -- drivers/crypto/mxs-dcp.c | 12 +---- drivers/crypto/n2_core.c | 1 - drivers/crypto/padlock-aes.c | 9 +--- drivers/crypto/picoxcell_crypto.c | 15 +----- drivers/crypto/qat/qat_common/qat_algs.c | 6 +-- drivers/crypto/qce/sha.c | 2 - .../crypto/rockchip/rk3288_crypto_skcipher.c | 4 +- drivers/crypto/sahara.c | 9 +--- drivers/crypto/stm32/stm32-crc32.c | 4 +- drivers/crypto/talitos.c | 15 ++---- drivers/crypto/ux500/cryp/cryp_core.c | 2 - drivers/crypto/virtio/virtio_crypto_algs.c | 8 +-- include/crypto/cast6.h | 3 +- include/crypto/internal/des.h | 23 ++------- include/crypto/twofish.h | 2 +- include/crypto/xts.h | 19 ++----- include/linux/crypto.h | 7 --- 108 files changed, 218 insertions(+), 917 deletions(-)
Signature · 1 line
2.24.1
PATCH 1/8 crypto: chelsio - fix writing tfm flags to wrong place
From: Eric Biggers <[email protected]>
The chelsio crypto driver is casting 'struct crypto_aead' directly to 'struct crypto_tfm', which is incorrect because the crypto_tfm isn't the first field of 'struct crypto_aead'. Consequently, the calls to crypto_tfm_set_flags() are modifying some other field in the struct.
Also, the driver is setting CRYPTO_TFM_RES_BAD_KEY_LEN in ->setauthsize(), not just in ->setkey(). This is incorrect since this flag is for bad key lengths, not for bad authentication tag lengths.
Fix these bugs by removing the broken crypto_tfm_set_flags() calls from ->setauthsize() and by fixing them in ->setkey().
--- drivers/crypto/chelsio/chcr_algo.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/crypto/chelsio/chcr_algo.c +3 -13
@@ -3196,9 +3196,6 @@ static int chcr_gcm_setauthsize(struct crypto_aead *tfm, unsigned int authsize) aeadctx->mayverify =VERIFY_SW ;break ;default : - -crypto_tfm_set_flags ((struct crypto_tfm *) tfm, -CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }return crypto_aead_setauthsize (aeadctx->sw_cipher, authsize);
@@ -3223,8 +3220,6 @@ static int chcr_4106_4309_setauthsize(struct crypto_aead *tfm, aeadctx->mayverify =VERIFY_HW ;break ;default : -crypto_tfm_set_flags ((struct crypto_tfm *)tfm, -CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }return crypto_aead_setauthsize (aeadctx->sw_cipher, authsize);
@@ -3265,8 +3260,6 @@ static int chcr_ccm_setauthsize(struct crypto_aead *tfm, aeadctx->mayverify =VERIFY_HW ;break ;default : -crypto_tfm_set_flags ((struct crypto_tfm *)tfm, -CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }return crypto_aead_setauthsize (aeadctx->sw_cipher, authsize);
@@ -3291,8 +3284,7 @@ static int chcr_ccm_common_setkey(struct crypto_aead *aead, ck_size =CHCR_KEYCTX_CIPHER_KEY_SIZE_256 ; mk_size =CHCR_KEYCTX_MAC_KEY_SIZE_256 ; }else { -crypto_tfm_set_flags ((struct crypto_tfm *)aead, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); aeadctx->enckey_len =0 ;return -EINVAL ; }
@@ -3330,8 +3322,7 @@ static int chcr_aead_rfc4309_setkey(struct crypto_aead *aead, const u8 *key,int error;if (keylen <3 ) { -crypto_tfm_set_flags ((struct crypto_tfm *)aead, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); aeadctx->enckey_len =0 ;return -EINVAL ; }
@@ -3381,8 +3372,7 @@ static int chcr_gcm_setkey(struct crypto_aead *aead, const u8 *key, }else if (keylen ==AES_KEYSIZE_256 ) { ck_size =CHCR_KEYCTX_CIPHER_KEY_SIZE_256 ; }else { -crypto_tfm_set_flags ((struct crypto_tfm *)aead, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN );pr_err ("GCM: Invalid key length %d\n" , keylen); ret = -EINVAL ; goto out;
Signature · 1 line
2.24.1
Re: [PATCH 1/8] crypto: chelsio - fix writing tfm flags to wrong place
[+Cc the person with a Cc tag in the patch, who I accidentally didn't Cc...
Original message was
https://lkml.kernel.org/linux-crypto/[email protected]/]
Quoted 87 lines · Eric Biggers
From: Eric Biggers <[email protected]>
The chelsio crypto driver is casting 'struct
crypto_aead' directly to 'structcrypto_tfm', which is incorrect because thecrypto_tfmisn't the first field of 'structcrypto_aead'. Consequently, the calls tocrypto_tfm_set_flags()are modifying some other field in the struct.Also, the driver is setting
CRYPTO_TFM_RES_BAD_KEY_LENin ->setauthsize(), not just in ->setkey(). This is incorrect since this flag is for bad key lengths, not for bad authentication tag lengths.Fix these bugs by removing the broken
crypto_tfm_set_flags()calls from ->setauthsize() and by fixing them in ->setkey().Fixes 324429d74127 ("chcr: Support for Chelsio's Crypto Hardware")Cc <[email protected]> # v4.9+Cc Atul Gupta <[email protected]>Signed-off-by Eric Biggers <[email protected]>--- drivers/crypto/chelsio/chcr_algo.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)drivers/crypto/chelsio/chcr_algo.c +3
-13@@ -3196,9 +3196,6 @@ static int chcr_gcm_setauthsize(struct crypto_aead *tfm, unsigned int authsize) aeadctx->mayverify =VERIFY_SW ;break ;default : - -crypto_tfm_set_flags ((struct crypto_tfm *) tfm, -CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }return crypto_aead_setauthsize (aeadctx->sw_cipher, authsize);@@ -3223,8 +3220,6 @@ static int chcr_4106_4309_setauthsize(struct crypto_aead *tfm, aeadctx->mayverify =VERIFY_HW ;break ;default : -crypto_tfm_set_flags ((struct crypto_tfm *)tfm, -CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }return crypto_aead_setauthsize (aeadctx->sw_cipher, authsize);@@ -3265,8 +3260,6 @@ static int chcr_ccm_setauthsize(struct crypto_aead *tfm, aeadctx->mayverify =VERIFY_HW ;break ;default : -crypto_tfm_set_flags ((struct crypto_tfm *)tfm, -CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }return crypto_aead_setauthsize (aeadctx->sw_cipher, authsize);@@ -3291,8 +3284,7 @@ static int chcr_ccm_common_setkey(struct crypto_aead *aead, ck_size =CHCR_KEYCTX_CIPHER_KEY_SIZE_256 ; mk_size =CHCR_KEYCTX_MAC_KEY_SIZE_256 ; }else { -crypto_tfm_set_flags ((struct crypto_tfm *)aead, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); aeadctx->enckey_len =0 ;return -EINVAL ; }@@ -3330,8 +3322,7 @@ static int chcr_aead_rfc4309_setkey(struct crypto_aead *aead, const u8 *key,int error;if (keylen <3 ) { -crypto_tfm_set_flags ((struct crypto_tfm *)aead, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); aeadctx->enckey_len =0 ;return -EINVAL ; }@@ -3381,8 +3372,7 @@ static int chcr_gcm_setkey(struct crypto_aead *aead, const u8 *key, }else if (keylen ==AES_KEYSIZE_256 ) { ck_size =CHCR_KEYCTX_CIPHER_KEY_SIZE_256 ; }else { -crypto_tfm_set_flags ((struct crypto_tfm *)aead, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN );pr_err ("GCM: Invalid key length %d\n" , keylen); ret = -EINVAL ; goto out;Signature · 1 line
2.24.1
PATCH 2/8 crypto: artpec6 - return correct error code for failed setkey()
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
->setkey() is supposed to retun -EINVAL for invalid key lengths, not -1.
--- drivers/crypto/axis/artpec6_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/axis/artpec6_crypto.c +1 -1
@@ -1251,7 +1251,7 @@ static int artpec6_crypto_aead_set_key(struct crypto_aead *tfm, const u8 *key,if (len !=16 && len !=24 && len !=32 ) {crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -1 ; +return -EINVAL ; } ctx->key_length = len;
Signature · 1 line
2.24.1
Re: [PATCH 2/8] crypto: artpec6 - return correct error code for failed setkey()
[+Cc the people with Cc tags in the patch, who I accidentally didn't Cc...
Original message was
https://lkml.kernel.org/linux-crypto/[email protected]/]
Quoted 28 lines · Eric Biggers
From: Eric Biggers <[email protected]>
->setkey() is supposed to retun
-EINVALfor invalid key lengths, not -1.Fixes a21eb94fc4d3 ("crypto: axis - add ARTPEC-6/7 crypto accelerator driver")Cc Jesper Nilsson <[email protected]>Cc Lars Persson <[email protected]>Signed-off-by Eric Biggers <[email protected]>--- drivers/crypto/axis/artpec6_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/crypto/axis/artpec6_crypto.c +1
-1@@ -1251,7 +1251,7 @@ static int artpec6_crypto_aead_set_key(struct crypto_aead *tfm, const u8 *key,if (len !=16 && len !=24 && len !=32 ) {crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -1 ; +return -EINVAL ; } ctx->key_length = len;Signature · 1 line
2.24.1
Re: [PATCH 2/8] crypto: artpec6 - return correct error code for failed setkey()
Quoted 29 lines · Eric Biggers
[+Cc the people with Cc tags in the patch, who I accidentally didn't Cc...
Original message was
https://lkml.kernel.org/linux-crypto/[email protected]/]Quoted 24 lines · Eric Biggers
From: Eric Biggers <[email protected]>
->setkey() is supposed to retun
-EINVALfor invalid key lengths, not -1.Fixes a21eb94fc4d3 ("crypto: axis - add ARTPEC-6/7 crypto accelerator driver")Cc Jesper Nilsson <[email protected]>Cc Lars Persson <[email protected]>Signed-off-by Eric Biggers <[email protected]>---
drivers/crypto/axis/artpec6_crypto.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/crypto/axis/artpec6_crypto.c +1
-1@@ -1251,7 +1251,7 @@ static int artpec6_crypto_aead_set_key(struct crypto_aead *tfm, const u8 *key, if (len != 16 && len != 24 && len != 32) { crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); - return -1; + return -EINVAL; }
Quoted 4 lines
Quoted 4 lines
drivers/crypto/axis/artpec6_crypto.c +0
-0ctx->key_length = len;Signature · 1 line
2.24.1
Thanks,
Lars
PATCH 3/8 crypto: atmel-sha - fix error handling when setting hmac key
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
HMAC keys can be of any length, and atmel_sha_hmac_key_set() can only fail due to -ENOMEM. But atmel_sha_hmac_setkey() incorrectly treated any error as a "bad key length" error. Fix it to correctly propagate the -ENOMEM error code and not set any tfm result flags.
--- drivers/crypto/atmel-sha.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/crypto/atmel-sha.c +1 -6
@@ -1853,12 +1853,7 @@ static int atmel_sha_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, {struct atmel_sha_hmac_ctx *hmac =crypto_ahash_ctx (tfm); -if (atmel_sha_hmac_key_set (&hmac->hkey, key, keylen)) { -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; - } - -return 0 ; +return atmel_sha_hmac_key_set (&hmac->hkey, key, keylen); }static int atmel_sha_hmac_init (struct ahash_request *req)
Signature · 1 line
2.24.1
Re: [PATCH 3/8] crypto: atmel-sha - fix error handling when setting hmac key
[+Cc the people with Cc tags in the patch, who I accidentally didn't Cc...
Original message was
https://lkml.kernel.org/linux-crypto/[email protected]/]
Quoted 37 lines · Eric Biggers
From: Eric Biggers <[email protected]>
HMAC keys can be of any length, and
atmel_sha_hmac_key_set()can only fail due to-ENOMEM. Butatmel_sha_hmac_setkey()incorrectly treated any error as a "bad key length" error. Fix it to correctly propagate the-ENOMEMerror code and not set any tfm result flags.Fixes 81d8750b2b59 ("crypto: atmel-sha - add support to hmac(shaX)")Cc Nicolas Ferre <[email protected]>Cc Alexandre Belloni <[email protected]>Cc Ludovic Desroches <[email protected]>Signed-off-by Eric Biggers <[email protected]>--- drivers/crypto/atmel-sha.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/crypto/atmel-sha.c +1
-6@@ -1853,12 +1853,7 @@ static int atmel_sha_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, {struct atmel_sha_hmac_ctx *hmac =crypto_ahash_ctx (tfm); -if (atmel_sha_hmac_key_set (&hmac->hkey, key, keylen)) { -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; - } - -return 0 ; +return atmel_sha_hmac_key_set (&hmac->hkey, key, keylen); }static int atmel_sha_hmac_init (struct ahash_request *req)Signature · 1 line
2.24.1
Re: [PATCH 3/8] crypto: atmel-sha - fix error handling when setting hmac key
In reply to Eric BiggersQuoted 21 lines · EET Eric Biggers
From: Eric Biggers <[email protected]>
HMAC keys can be of any length, and
atmel_sha_hmac_key_set()can only fail due to-ENOMEM. Butatmel_sha_hmac_setkey()incorrectly treated any error as a "bad key length" error. Fix it to correctly propagate the-ENOMEMerror code and not set any tfm result flags.Fixes 81d8750b2b59 ("crypto: atmel-sha - add support to hmac(shaX)")Cc Nicolas Ferre <[email protected]>Cc Alexandre Belloni <[email protected]>Cc Ludovic Desroches <[email protected]>Signed-off-by Eric Biggers <[email protected]>--- drivers/crypto/atmel-sha.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/crypto/atmel-sha.c +0
-0
drivers/crypto/atmel-sha.c static int atmel_sha_hmac_setkey(struct crypto_ahash · line 1857
Quoted 5 lines
drivers/crypto/atmel-sha.c +0
-2@@ -1853,12 +1853,7 @@ static int atmel_sha_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, {struct atmel_sha_hmac_ctx *hmac =crypto_ahash_ctx (tfm); -if (atmel_sha_hmac_key_set (&hmac->hkey, key, keylen)) { - crypto_ahash_set_flags(tfm,
CRYPTO_TFM_RES_BAD_KEY_LEN);
drivers/crypto/atmel-sha.c static int atmel_sha_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, · line 1856
Quoted 5 lines
drivers/crypto/atmel-sha.c +1
-4-return -EINVAL ; - } - -return 0 ; +return atmel_sha_hmac_key_set (&hmac->hkey, key, keylen);
The atmel_sha_hmac_key_set() is used just here, maybe it is worth getting rid of the function and copy its body here. As this is just a cosmetic suggestion, with or without this, one can add:
Quoted 3 lines
drivers/crypto/atmel-sha.c +0
-0}static int atmel_sha_hmac_init (struct ahash_request *req)
PATCH 4/8 crypto: remove unused tfm result flags
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The tfm result flags CRYPTO_TFM_RES_BAD_KEY_SCHED and CRYPTO_TFM_RES_BAD_FLAGS are never used, so remove them.
--- include/linux/crypto.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/crypto.h +0 -2
@@ -114,9 +114,7 @@#define CRYPTO_TFM_REQ_MAY_BACKLOG 0x00000400#define CRYPTO_TFM_RES_WEAK_KEY 0x00100000#define CRYPTO_TFM_RES_BAD_KEY_LEN 0x00200000 -#define CRYPTO_TFM_RES_BAD_KEY_SCHED 0x00400000#define CRYPTO_TFM_RES_BAD_BLOCK_LEN 0x00800000 -#define CRYPTO_TFM_RES_BAD_FLAGS 0x01000000/* * Miscellaneous stuff.
Signature · 1 line
2.24.1
PATCH 5/8 crypto: remove CRYPTO_TFM_RES_BAD_BLOCK_LEN
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The flag CRYPTO_TFM_RES_BAD_BLOCK_LEN is never checked for, and it's only set by one driver. And even that single driver's use is wrong because the driver is setting the flag from ->encrypt() and ->decrypt() with no locking, which is unsafe because ->encrypt() and ->decrypt() can be executed by many threads in parallel on the same tfm.
Just remove this flag.
--- drivers/crypto/ccree/cc_aead.c | 1 - drivers/crypto/ccree/cc_cipher.c | 1 - include/linux/crypto.h | 1 - 3 files changed, 3 deletions(-)
drivers/crypto/ccree/cc_aead.c +0 -1
@@ -1925,7 +1925,6 @@ static int cc_proc_aead(struct aead_request *req,if (validate_data_size (ctx, direct, req)) {dev_err (dev,"Unsupported crypt/assoc len %d/%d.\n" , req->cryptlen, areq_ctx->assoclen); -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_BLOCK_LEN );return -EINVAL ; }
drivers/crypto/ccree/cc_cipher.c +0 -1
@@ -837,7 +837,6 @@ static int cc_cipher_process(struct skcipher_request *req,/* TODO: check data length according to mode */ if (validate_data_size (ctx_p, nbytes)) {dev_err (dev,"Unsupported data size %d.\n" , nbytes); -crypto_tfm_set_flags (tfm,CRYPTO_TFM_RES_BAD_BLOCK_LEN ); rc = -EINVAL ; goto exit_process; }
include/linux/crypto.h +0 -1
@@ -114,7 +114,6 @@#define CRYPTO_TFM_REQ_MAY_BACKLOG 0x00000400#define CRYPTO_TFM_RES_WEAK_KEY 0x00100000#define CRYPTO_TFM_RES_BAD_KEY_LEN 0x00200000 -#define CRYPTO_TFM_RES_BAD_BLOCK_LEN 0x00800000/* * Miscellaneous stuff.
Signature · 1 line
2.24.1
PATCH 6/8 crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The CRYPTO_TFM_RES_BAD_KEY_LEN flag was apparently meant as a way to make the ->setkey() functions provide more information about errors.
However, no one actually checks for this flag, which makes it pointless.
Also, many algorithms fail to set this flag when given a bad length key. Reviewing just the generic implementations, this is the case for aes-fixed-time, cbcmac, echainiv, nhpoly1305, pcrypt, rfc3686, rfc4309, rfc7539, rfc7539esp, salsa20, seqiv, and xcbc. But there are probably many more in arch/*/crypto/ and drivers/crypto/.
Some algorithms can even set this flag when the key is the correct length. For example, authenc and authencesn set it when the key payload is malformed in any way (not just a bad length), the atmel-sha and ccree drivers can set it if a memory allocation fails, and the chelsio driver sets it for bad auth tag lengths, not just bad key lengths.
So even if someone actually wanted to start checking this flag (which seems unlikely, since it's been unused for a long time), there would be a lot of work needed to get it working correctly. But it would probably be much better to go back to the drawing board and just define different return values, like -EINVAL if the key is invalid for the algorithm vs. -EKEYREJECTED if the key was rejected by a policy like "no weak keys". That would be much simpler, less error-prone, and easier to test.
So just remove this flag.
--- arch/arm/crypto/aes-ce-glue.c | 14 +----- arch/arm/crypto/crc32-ce-glue.c | 4 +- arch/arm/crypto/ghash-ce-glue.c | 4 +- arch/arm64/crypto/aes-ce-ccm-glue.c | 8 +--- arch/arm64/crypto/aes-ce-glue.c | 8 +--- arch/arm64/crypto/aes-glue.c | 31 ++---------- arch/arm64/crypto/ghash-ce-glue.c | 8 +--- arch/mips/crypto/crc32-mips.c | 4 +- arch/powerpc/crypto/aes-spe-glue.c | 18 ++----- arch/powerpc/crypto/crc32c-vpmsum_glue.c | 4 +- arch/s390/crypto/aes_s390.c | 4 +- arch/s390/crypto/crc32-vx.c | 8 +--- arch/s390/crypto/ghash_s390.c | 4 +- arch/s390/crypto/paes_s390.c | 25 +++------- arch/sparc/crypto/aes_glue.c | 2 - arch/sparc/crypto/camellia_glue.c | 5 +- arch/sparc/crypto/crc32c_glue.c | 4 +- arch/x86/crypto/aegis128-aesni-glue.c | 4 +- arch/x86/crypto/aesni-intel_glue.c | 10 ++-- arch/x86/crypto/blake2s-glue.c | 4 +- arch/x86/crypto/camellia_aesni_avx2_glue.c | 3 +- arch/x86/crypto/camellia_aesni_avx_glue.c | 9 ++-- arch/x86/crypto/camellia_glue.c | 9 ++-- arch/x86/crypto/cast6_avx_glue.c | 6 +-- arch/x86/crypto/crc32-pclmul_glue.c | 4 +- arch/x86/crypto/crc32c-intel_glue.c | 4 +- arch/x86/crypto/ghash-clmulni-intel_glue.c | 4 +- arch/x86/crypto/twofish_avx_glue.c | 6 +-- arch/x86/include/asm/crypto/camellia.h | 2 +- crypto/aegis128-core.c | 4 +- crypto/aes_generic.c | 18 +++---- crypto/anubis.c | 2 - crypto/authenc.c | 6 +-- crypto/authencesn.c | 6 +-- crypto/blake2b_generic.c | 4 +- crypto/blake2s_generic.c | 4 +- crypto/camellia_generic.c | 5 +- crypto/cast6_generic.c | 10 ++-- crypto/cipher.c | 4 +- crypto/crc32_generic.c | 4 +- crypto/crc32c_generic.c | 4 +- crypto/essiv.c | 4 +- crypto/ghash-generic.c | 4 +- crypto/michael_mic.c | 4 +- crypto/skcipher.c | 4 +- crypto/sm4_generic.c | 16 ++----- crypto/twofish_common.c | 8 +--- crypto/vmac.c | 4 +- crypto/xxhash_generic.c | 4 +- .../allwinner/sun4i-ss/sun4i-ss-cipher.c | 1 - .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 1 - .../allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 - drivers/crypto/amcc/crypto4xx_alg.c | 11 ++--- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 1 - drivers/crypto/atmel-aes.c | 9 +--- drivers/crypto/axis/artpec6_crypto.c | 8 +--- drivers/crypto/bcm/cipher.c | 3 -- drivers/crypto/caam/caamalg.c | 33 +++---------- drivers/crypto/caam/caamalg_qi.c | 44 +++++------------ drivers/crypto/caam/caamalg_qi2.c | 47 ++++--------------- drivers/crypto/caam/caamhash.c | 9 +--- drivers/crypto/cavium/cpt/cptvf_algs.c | 2 - drivers/crypto/cavium/nitrox/nitrox_aead.c | 4 +- .../crypto/cavium/nitrox/nitrox_skcipher.c | 12 ++--- drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 1 - drivers/crypto/ccp/ccp-crypto-aes-galois.c | 1 - drivers/crypto/ccp/ccp-crypto-aes.c | 1 - drivers/crypto/ccp/ccp-crypto-sha.c | 4 +- drivers/crypto/ccree/cc_aead.c | 20 +++----- drivers/crypto/ccree/cc_cipher.c | 3 -- drivers/crypto/ccree/cc_hash.c | 6 --- drivers/crypto/chelsio/chcr_algo.c | 16 ++----- drivers/crypto/geode-aes.c | 8 +--- .../crypto/inside-secure/safexcel_cipher.c | 38 +++++---------- drivers/crypto/inside-secure/safexcel_hash.c | 16 ++----- drivers/crypto/ixp4xx_crypto.c | 3 -- drivers/crypto/marvell/cipher.c | 4 +- drivers/crypto/mediatek/mtk-aes.c | 2 - drivers/crypto/n2_core.c | 1 - drivers/crypto/padlock-aes.c | 9 +--- drivers/crypto/picoxcell_crypto.c | 6 +-- drivers/crypto/qat/qat_common/qat_algs.c | 6 +-- drivers/crypto/qce/sha.c | 2 - .../crypto/rockchip/rk3288_crypto_skcipher.c | 4 +- drivers/crypto/stm32/stm32-crc32.c | 4 +- drivers/crypto/talitos.c | 15 ++---- drivers/crypto/ux500/cryp/cryp_core.c | 2 - drivers/crypto/virtio/virtio_crypto_algs.c | 8 +--- include/crypto/cast6.h | 3 +- include/crypto/internal/des.h | 8 +--- include/crypto/twofish.h | 2 +- include/crypto/xts.h | 8 +--- include/linux/crypto.h | 1 - 93 files changed, 167 insertions(+), 561 deletions(-)
arch/arm/crypto/aes-ce-glue.c +2 -12
@@ -138,14 +138,8 @@ static int ce_aes_setkey(struct crypto_skcipher *tfm, const u8 *in_key, unsigned int key_len) {struct crypto_aes_ctx *ctx =crypto_skcipher_ctx (tfm); -int ret; - - ret =ce_aes_expandkey (ctx, in_key, key_len); -if (!ret) -return 0 ; -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; +return ce_aes_expandkey (ctx, in_key, key_len); }struct crypto_aes_xts_ctx {
@@ -167,11 +161,7 @@ static int xts_set_key(struct crypto_skcipher *tfm, const u8 *in_key,if (!ret) ret =ce_aes_expandkey (&ctx->key2, &in_key[key_len /2 ], key_len /2 ); -if (!ret) -return 0 ; - -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; +return ret; }static int ecb_encrypt (struct skcipher_request *req)
arch/arm/crypto/crc32-ce-glue.c +1 -3
@@ -54,10 +54,8 @@ static int crc32_setkey(struct crypto_shash *hash, const u8 *key, {u32 *mctx =crypto_shash_ctx (hash); -if (keylen !=sizeof (u32)) { -crypto_shash_set_flags (hash,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (u32))return -EINVAL ; - } *mctx =le32_to_cpup ((__le32 *)key);return 0 ; }
arch/arm/crypto/ghash-ce-glue.c +1 -3
@@ -163,10 +163,8 @@ static int ghash_setkey(struct crypto_shash *tfm,struct ghash_key *key =crypto_shash_ctx (tfm);be128 h; -if (keylen !=GHASH_BLOCK_SIZE ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=GHASH_BLOCK_SIZE )return -EINVAL ; - }/* needed for the fallback */ memcpy (&key->k, inkey,GHASH_BLOCK_SIZE );
arch/arm64/crypto/aes-ce-ccm-glue.c +1 -7
@@ -47,14 +47,8 @@ static int ccm_setkey(struct crypto_aead *tfm, const u8 *in_key, unsigned int key_len) {struct crypto_aes_ctx *ctx =crypto_aead_ctx (tfm); -int ret; - ret =ce_aes_expandkey (ctx, in_key, key_len); -if (!ret) -return 0 ; - - tfm->base.crt_flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; -return -EINVAL ; +return ce_aes_expandkey (ctx, in_key, key_len); }static int ccm_setauthsize (struct crypto_aead *tfm,unsigned int authsize)
arch/arm64/crypto/aes-ce-glue.c +1 -7
@@ -143,14 +143,8 @@ int ce_aes_setkey(struct crypto_tfm *tfm, const u8 *in_key, unsigned int key_len) {struct crypto_aes_ctx *ctx =crypto_tfm_ctx (tfm); -int ret; - ret =ce_aes_expandkey (ctx, in_key, key_len); -if (!ret) -return 0 ; - - tfm->crt_flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; -return -EINVAL ; +return ce_aes_expandkey (ctx, in_key, key_len); }EXPORT_SYMBOL (ce_aes_setkey);
arch/arm64/crypto/aes-glue.c +5 -26
@@ -132,13 +132,8 @@ static int skcipher_aes_setkey(struct crypto_skcipher *tfm, const u8 *in_key, unsigned int key_len) {struct crypto_aes_ctx *ctx =crypto_skcipher_ctx (tfm); -int ret; - - ret =aes_expandkey (ctx, in_key, key_len); -if (ret) -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return ret; +return aes_expandkey (ctx, in_key, key_len); } static int __maybe_unused xts_set_key(struct crypto_skcipher *tfm,
@@ -155,11 +150,7 @@ static int __maybe_unused xts_set_key(struct crypto_skcipher *tfm,if (!ret) ret =aes_expandkey (&ctx->key2, &in_key[key_len /2 ], key_len /2 ); -if (!ret) -return 0 ; - -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; +return ret; } static int __maybe_unused essiv_cbc_set_key(struct crypto_skcipher *tfm,
@@ -173,19 +164,12 @@ static int __maybe_unused essiv_cbc_set_key(struct crypto_skcipher *tfm, ret =aes_expandkey (&ctx->key1, in_key, key_len);if (ret) - goto out; +return ret; desc->tfm = ctx->hash;crypto_shash_digest (desc, in_key, key_len, digest); - ret =aes_expandkey (&ctx->key2, digest,sizeof (digest)); -if (ret) - goto out; - -return 0 ; -out: -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; +return aes_expandkey (&ctx->key2, digest,sizeof (digest)); }static int __maybe_unused ecb_encrypt (struct skcipher_request *req)
@@ -791,13 +775,8 @@ static int cbcmac_setkey(struct crypto_shash *tfm, const u8 *in_key, unsigned int key_len) {struct mac_tfm_ctx *ctx =crypto_shash_ctx (tfm); -int err; - err =aes_expandkey (&ctx->key, in_key, key_len); -if (err) -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); - -return err; +return aes_expandkey (&ctx->key, in_key, key_len); }static void cmac_gf128_mul_by_x (be128 *y,const be128 *x)
arch/arm64/crypto/ghash-ce-glue.c +2 -6
@@ -248,10 +248,8 @@ static int ghash_setkey(struct crypto_shash *tfm, {struct ghash_key *key =crypto_shash_ctx (tfm); -if (keylen !=GHASH_BLOCK_SIZE ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=GHASH_BLOCK_SIZE )return -EINVAL ; - }return __ghash_setkey (key, inkey, keylen); }
@@ -306,10 +304,8 @@ static int gcm_setkey(struct crypto_aead *tfm, const u8 *inkey,int ret; ret =aes_expandkey (&ctx->aes_key, inkey, keylen); -if (ret) { - tfm->base.crt_flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +if (ret)return -EINVAL ; - }aes_encrypt (&ctx->aes_key, key, (u8 [AES_BLOCK_SIZE ]){});
arch/mips/crypto/crc32-mips.c +1 -3
@@ -177,10 +177,8 @@ static int chksum_setkey(struct crypto_shash *tfm, const u8 *key, {struct chksum_ctx *mctx =crypto_shash_ctx (tfm); -if (keylen !=sizeof (mctx->key)) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (mctx->key))return -EINVAL ; - } mctx->key =get_unaligned_le32 (key);return 0 ; }
arch/powerpc/crypto/aes-spe-glue.c +4 -14
@@ -94,13 +94,6 @@ static int ppc_aes_setkey(struct crypto_tfm *tfm, const u8 *in_key, {struct ppc_aes_ctx *ctx =crypto_tfm_ctx (tfm); -if (key_len !=AES_KEYSIZE_128 && - key_len !=AES_KEYSIZE_192 && - key_len !=AES_KEYSIZE_256 ) { - tfm->crt_flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; -return -EINVAL ; - } -switch (key_len) {case AES_KEYSIZE_128 : ctx->rounds =4 ;
@@ -114,6 +107,8 @@ static int ppc_aes_setkey(struct crypto_tfm *tfm, const u8 *in_key, ctx->rounds =6 ;ppc_expand_key_256 (ctx->key_enc, in_key);break ; +default : +return -EINVAL ; }ppc_generate_decrypt_key (ctx->key_dec, ctx->key_enc, key_len);
@@ -139,13 +134,6 @@ static int ppc_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key, key_len >>=1 ; -if (key_len !=AES_KEYSIZE_128 && - key_len !=AES_KEYSIZE_192 && - key_len !=AES_KEYSIZE_256 ) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; - } -switch (key_len) {case AES_KEYSIZE_128 : ctx->rounds =4 ;
@@ -162,6 +150,8 @@ static int ppc_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,ppc_expand_key_256 (ctx->key_enc, in_key);ppc_expand_key_256 (ctx->key_twk, in_key +AES_KEYSIZE_256 );break ; +default : +return -EINVAL ; }ppc_generate_decrypt_key (ctx->key_dec, ctx->key_enc, key_len);
arch/powerpc/crypto/crc32c-vpmsum_glue.c +1 -3
@@ -73,10 +73,8 @@ static int crc32c_vpmsum_setkey(struct crypto_shash *hash, const u8 *key, {u32 *mctx =crypto_shash_ctx (hash); -if (keylen !=sizeof (u32)) { -crypto_shash_set_flags (hash,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (u32))return -EINVAL ; - } *mctx =le32_to_cpup ((__le32 *)key);return 0 ; }
arch/s390/crypto/aes_s390.c +1 -3
@@ -414,10 +414,8 @@ static int xts_aes_set_key(struct crypto_skcipher *tfm, const u8 *in_key,return err;/* In fips mode only 128 bit or 256 bit keys are valid */ -if (fips_enabled && key_len !=32 && key_len !=64 ) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (fips_enabled && key_len !=32 && key_len !=64 )return -EINVAL ; - }/* Pick the correct function code based on the key length */ fc = (key_len == 32) ? CPACF_KM_XTS_128 :
arch/s390/crypto/crc32-vx.c +2 -6
@@ -111,10 +111,8 @@ static int crc32_vx_setkey(struct crypto_shash *tfm, const u8 *newkey, {struct crc_ctx *mctx =crypto_shash_ctx (tfm); -if (newkeylen !=sizeof (mctx->key)) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (newkeylen !=sizeof (mctx->key))return -EINVAL ; - } mctx->key =le32_to_cpu (*(__le32 *)newkey);return 0 ; }
@@ -124,10 +122,8 @@ static int crc32be_vx_setkey(struct crypto_shash *tfm, const u8 *newkey, {struct crc_ctx *mctx =crypto_shash_ctx (tfm); -if (newkeylen !=sizeof (mctx->key)) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (newkeylen !=sizeof (mctx->key))return -EINVAL ; - } mctx->key =be32_to_cpu (*(__be32 *)newkey);return 0 ; }
arch/s390/crypto/ghash_s390.c +1 -3
@@ -43,10 +43,8 @@ static int ghash_setkey(struct crypto_shash *tfm, {struct ghash_ctx *ctx =crypto_shash_ctx (tfm); -if (keylen !=GHASH_BLOCK_SIZE ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=GHASH_BLOCK_SIZE )return -EINVAL ; - }memcpy (ctx->key, key,GHASH_BLOCK_SIZE );
arch/s390/crypto/paes_s390.c +6 -19
@@ -151,11 +151,7 @@ static int ecb_paes_set_key(struct crypto_skcipher *tfm, const u8 *in_key,if (rc)return rc; -if (__paes_set_key (ctx)) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; - } -return 0 ; +return __paes_set_key (ctx); }static int ecb_paes_crypt (struct skcipher_request *req,unsigned long modifier)
@@ -254,11 +250,7 @@ static int cbc_paes_set_key(struct crypto_skcipher *tfm, const u8 *in_key,if (rc)return rc; -if (__cbc_paes_set_key (ctx)) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; - } -return 0 ; +return __cbc_paes_set_key (ctx); }static int cbc_paes_crypt (struct skcipher_request *req,unsigned long modifier)
@@ -386,10 +378,9 @@ static int xts_paes_set_key(struct crypto_skcipher *tfm, const u8 *in_key,if (rc)return rc; -if (__xts_paes_set_key (ctx)) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; - } + rc =__xts_paes_set_key (ctx); +if (rc) +return rc;/* * xts_check_key verifies the key length is not odd and makes
@@ -526,11 +517,7 @@ static int ctr_paes_set_key(struct crypto_skcipher *tfm, const u8 *in_key,if (rc)return rc; -if (__ctr_paes_set_key (ctx)) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; - } -return 0 ; +return __ctr_paes_set_key (ctx); }static unsigned int __ctrblk_init (u8 *ctrptr,u8 *iv,unsigned int nbytes)
arch/sparc/crypto/aes_glue.c +0 -2
@@ -169,7 +169,6 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, unsigned int key_len) {struct crypto_sparc64_aes_ctx *ctx =crypto_tfm_ctx (tfm); -u32 *flags = &tfm->crt_flags;switch (key_len) {case AES_KEYSIZE_128 :
@@ -188,7 +187,6 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,break ;default : - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ;return -EINVAL ; }
arch/sparc/crypto/camellia_glue.c +1 -4
@@ -39,12 +39,9 @@ static int camellia_set_key(struct crypto_tfm *tfm, const u8 *_in_key, {struct camellia_sparc64_ctx *ctx =crypto_tfm_ctx (tfm);const u32 *in_key = (const u32 *) _in_key; -u32 *flags = &tfm->crt_flags; -if (key_len !=16 && key_len !=24 && key_len !=32 ) { - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +if (key_len !=16 && key_len !=24 && key_len !=32 )return -EINVAL ; - } ctx->key_len = key_len;
arch/sparc/crypto/crc32c_glue.c +1 -3
@@ -33,10 +33,8 @@ static int crc32c_sparc64_setkey(struct crypto_shash *hash, const u8 *key, {u32 *mctx =crypto_shash_ctx (hash); -if (keylen !=sizeof (u32)) { -crypto_shash_set_flags (hash,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (u32))return -EINVAL ; - } *(__le32 *)mctx =le32_to_cpup ((__le32 *)key);return 0 ; }
arch/x86/crypto/aegis128-aesni-glue.c +1 -3
@@ -144,10 +144,8 @@ static int crypto_aegis128_aesni_setkey(struct crypto_aead *aead, const u8 *key, {struct aegis_ctx *ctx =crypto_aegis128_aesni_ctx (aead); -if (keylen !=AEGIS128_KEY_SIZE ) { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=AEGIS128_KEY_SIZE )return -EINVAL ; - }memcpy (ctx->key.bytes, key,AEGIS128_KEY_SIZE );
arch/x86/crypto/aesni-intel_glue.c +3 -7
@@ -316,14 +316,11 @@ static int aes_set_key_common(struct crypto_tfm *tfm, void *raw_ctx, const u8 *in_key, unsigned int key_len) {struct crypto_aes_ctx *ctx =aes_ctx (raw_ctx); -u32 *flags = &tfm->crt_flags;int err;if (key_len !=AES_KEYSIZE_128 && key_len !=AES_KEYSIZE_192 && - key_len !=AES_KEYSIZE_256 ) { - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; + key_len !=AES_KEYSIZE_256 )return -EINVAL ; - }if (!crypto_simd_usable ()) err =aes_expandkey (ctx, in_key, key_len);
@@ -641,10 +638,9 @@ static int common_rfc4106_set_key(struct crypto_aead *aead, const u8 *key, {struct aesni_rfc4106_gcm_ctx *ctx =aesni_rfc4106_gcm_ctx_get (aead); -if (key_len <4 ) { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (key_len <4 )return -EINVAL ; - } +/*Account for 4 byte nonce at the end.*/ key_len -=4 ;
arch/x86/crypto/blake2s-glue.c +1 -3
@@ -64,10 +64,8 @@ static int crypto_blake2s_setkey(struct crypto_shash *tfm, const u8 *key, {struct blake2s_tfm_ctx *tctx =crypto_shash_ctx (tfm); -if (keylen ==0 || keylen >BLAKE2S_KEY_SIZE ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen ==0 || keylen >BLAKE2S_KEY_SIZE )return -EINVAL ; - }memcpy (tctx->key, key, keylen); tctx->keylen = keylen;
arch/x86/crypto/camellia_aesni_avx2_glue.c +1 -2
@@ -142,8 +142,7 @@ static const struct common_glue_ctx camellia_dec_xts = {static int camellia_setkey (struct crypto_skcipher *tfm,const u8 *key,unsigned int keylen) { -return __camellia_setkey (crypto_skcipher_ctx (tfm), key, keylen, - &tfm->base.crt_flags); +return __camellia_setkey (crypto_skcipher_ctx (tfm), key, keylen); }static int ecb_encrypt (struct skcipher_request *req)
arch/x86/crypto/camellia_aesni_avx_glue.c +3 -6
@@ -144,8 +144,7 @@ static const struct common_glue_ctx camellia_dec_xts = {static int camellia_setkey (struct crypto_skcipher *tfm,const u8 *key,unsigned int keylen) { -return __camellia_setkey (crypto_skcipher_ctx (tfm), key, keylen, - &tfm->base.crt_flags); +return __camellia_setkey (crypto_skcipher_ctx (tfm), key, keylen); }static int ecb_encrypt (struct skcipher_request *req)
@@ -177,7 +176,6 @@ int xts_camellia_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) {struct camellia_xts_ctx *ctx =crypto_skcipher_ctx (tfm); -u32 *flags = &tfm->base.crt_flags;int err; err =xts_verify_key (tfm, key, keylen);
@@ -185,13 +183,12 @@ int xts_camellia_setkey(struct crypto_skcipher *tfm, const u8 *key,return err;/* first half of xts-key is for crypt */ - err =__camellia_setkey (&ctx->crypt_ctx, key, keylen /2 , flags); + err =__camellia_setkey (&ctx->crypt_ctx, key, keylen /2 );if (err)return err;/* second half of xts-key is for tweak */ -return __camellia_setkey (&ctx->tweak_ctx, key + keylen /2 , keylen /2 , - flags); +return __camellia_setkey (&ctx->tweak_ctx, key + keylen /2 , keylen /2 ); }EXPORT_SYMBOL_GPL (xts_camellia_setkey);
arch/x86/crypto/camellia_glue.c +3 -6
@@ -1227,12 +1227,10 @@ static void camellia_setup192(const unsigned char *key, u64 *subkey) }int __camellia_setkey (struct camellia_ctx *cctx,const unsigned char *key, -unsigned int key_len,u32 *flags) +unsigned int key_len) { -if (key_len !=16 && key_len !=24 && key_len !=32 ) { - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +if (key_len !=16 && key_len !=24 && key_len !=32 )return -EINVAL ; - } cctx->key_length = key_len;
@@ -1255,8 +1253,7 @@ EXPORT_SYMBOL_GPL(__camellia_setkey);static int camellia_setkey (struct crypto_tfm *tfm,const u8 *key,unsigned int key_len) { -return __camellia_setkey (crypto_tfm_ctx (tfm), key, key_len, - &tfm->crt_flags); +return __camellia_setkey (crypto_tfm_ctx (tfm), key, key_len); } static int camellia_setkey_skcipher(struct crypto_skcipher *tfm, const u8 *key,
arch/x86/crypto/cast6_avx_glue.c +2 -4
@@ -173,7 +173,6 @@ static int xts_cast6_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) {struct cast6_xts_ctx *ctx =crypto_skcipher_ctx (tfm); -u32 *flags = &tfm->base.crt_flags;int err; err =xts_verify_key (tfm, key, keylen);
@@ -181,13 +180,12 @@ static int xts_cast6_setkey(struct crypto_skcipher *tfm, const u8 *key,return err;/* first half of xts-key is for crypt */ - err =__cast6_setkey (&ctx->crypt_ctx, key, keylen /2 , flags); + err =__cast6_setkey (&ctx->crypt_ctx, key, keylen /2 );if (err)return err;/* second half of xts-key is for tweak */ -return __cast6_setkey (&ctx->tweak_ctx, key + keylen /2 , keylen /2 , - flags); +return __cast6_setkey (&ctx->tweak_ctx, key + keylen /2 , keylen /2 ); }static int xts_encrypt (struct skcipher_request *req)
arch/x86/crypto/crc32-pclmul_glue.c +1 -3
@@ -94,10 +94,8 @@ static int crc32_pclmul_setkey(struct crypto_shash *hash, const u8 *key, {u32 *mctx =crypto_shash_ctx (hash); -if (keylen !=sizeof (u32)) { -crypto_shash_set_flags (hash,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (u32))return -EINVAL ; - } *mctx =le32_to_cpup ((__le32 *)key);return 0 ; }
arch/x86/crypto/crc32c-intel_glue.c +1 -3
@@ -91,10 +91,8 @@ static int crc32c_intel_setkey(struct crypto_shash *hash, const u8 *key, {u32 *mctx =crypto_shash_ctx (hash); -if (keylen !=sizeof (u32)) { -crypto_shash_set_flags (hash,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (u32))return -EINVAL ; - } *mctx =le32_to_cpup ((__le32 *)key);return 0 ; }
arch/x86/crypto/ghash-clmulni-intel_glue.c +1 -3
@@ -57,10 +57,8 @@ static int ghash_setkey(struct crypto_shash *tfm,be128 *x = (be128 *)key;u64 a, b; -if (keylen !=GHASH_BLOCK_SIZE ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=GHASH_BLOCK_SIZE )return -EINVAL ; - }/* perform multiplication by 'x' in GF(2^128) */ a =be64_to_cpu (x->a);
arch/x86/crypto/twofish_avx_glue.c +2 -4
@@ -64,7 +64,6 @@ static int xts_twofish_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) {struct twofish_xts_ctx *ctx =crypto_skcipher_ctx (tfm); -u32 *flags = &tfm->base.crt_flags;int err; err =xts_verify_key (tfm, key, keylen);
@@ -72,13 +71,12 @@ static int xts_twofish_setkey(struct crypto_skcipher *tfm, const u8 *key,return err;/* first half of xts-key is for crypt */ - err =__twofish_setkey (&ctx->crypt_ctx, key, keylen /2 , flags); + err =__twofish_setkey (&ctx->crypt_ctx, key, keylen /2 );if (err)return err;/* second half of xts-key is for tweak */ -return __twofish_setkey (&ctx->tweak_ctx, key + keylen /2 , keylen /2 , - flags); +return __twofish_setkey (&ctx->tweak_ctx, key + keylen /2 , keylen /2 ); }static const struct common_glue_ctx twofish_enc = {
arch/x86/include/asm/crypto/camellia.h +1 -1
@@ -26,7 +26,7 @@ struct camellia_xts_ctx {extern int __camellia_setkey (struct camellia_ctx *cctx,const unsigned char *key, -unsigned int key_len,u32 *flags); +unsigned int key_len);extern int xts_camellia_setkey (struct crypto_skcipher *tfm,const u8 *key,unsigned int keylen);
crypto/aegis128-core.c +1 -3
@@ -372,10 +372,8 @@ static int crypto_aegis128_setkey(struct crypto_aead *aead, const u8 *key, {struct aegis_ctx *ctx =crypto_aead_ctx (aead); -if (keylen !=AEGIS128_KEY_SIZE ) { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=AEGIS128_KEY_SIZE )return -EINVAL ; - }memcpy (ctx->key.bytes, key,AEGIS128_KEY_SIZE );return 0 ;
crypto/aes_generic.c +6 -12
@@ -1127,24 +1127,18 @@ EXPORT_SYMBOL_GPL(crypto_it_tab);* @in_key: The input key. * @key_len: The size of the key. * -* Returns 0 on success, on failure the %CRYPTO_TFM_RES_BAD_KEY_LEN flag in tfm -* is set. The function uses aes_expand_key() to expand the key. -* &crypto_aes_ctx _must_ be the private data embedded in @tfm which is -* retrieved with crypto_tfm_ctx(). +* This function uses aes_expand_key() to expand the key. &crypto_aes_ctx +* _must_ be the private data embedded in @tfm which is retrieved with +* crypto_tfm_ctx(). +* +* Return: 0 on success; -EINVAL on failure (only happens for bad key lengths) */ int crypto_aes_set_key (struct crypto_tfm *tfm,const u8 *in_key,unsigned int key_len) {struct crypto_aes_ctx *ctx =crypto_tfm_ctx (tfm); -u32 *flags = &tfm->crt_flags; -int ret; - - ret =aes_expandkey (ctx, in_key, key_len); -if (!ret) -return 0 ; - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; -return -EINVAL ; +return aes_expandkey (ctx, in_key, key_len); }EXPORT_SYMBOL_GPL (crypto_aes_set_key);
crypto/anubis.c +0 -2
@@ -464,7 +464,6 @@ static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key, {struct anubis_ctx *ctx =crypto_tfm_ctx (tfm);const __be32 *key = (const __be32 *)in_key; -u32 *flags = &tfm->crt_flags;int N ,R , i, r;u32 kappa[ANUBIS_MAX_N ];u32 inter[ANUBIS_MAX_N ];
@@ -474,7 +473,6 @@ static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key,case 32 :case 36 :case 40 :break ;default : - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ;return -EINVAL ; }
crypto/authenc.c +1 -5
@@ -91,7 +91,7 @@ static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,int err = -EINVAL ;if (crypto_authenc_extractkeys (&keys, key, keylen) !=0 ) - goto badkey; + goto out;crypto_ahash_clear_flags (auth,CRYPTO_TFM_REQ_MASK ); crypto_ahash_set_flags(auth, crypto_aead_get_flags(authenc) &
@@ -113,10 +113,6 @@ static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key, out:memzero_explicit (&keys,sizeof (keys));return err; - -badkey: -crypto_aead_set_flags (authenc,CRYPTO_TFM_RES_BAD_KEY_LEN ); - goto out; }static void authenc_geniv_ahash_done (struct crypto_async_request *areq,int err)
crypto/authencesn.c +1 -5
@@ -65,7 +65,7 @@ static int crypto_authenc_esn_setkey(struct crypto_aead *authenc_esn, const u8 *int err = -EINVAL ;if (crypto_authenc_extractkeys (&keys, key, keylen) !=0 ) - goto badkey; + goto out;crypto_ahash_clear_flags (auth,CRYPTO_TFM_REQ_MASK ); crypto_ahash_set_flags(auth, crypto_aead_get_flags(authenc_esn) &
@@ -87,10 +87,6 @@ static int crypto_authenc_esn_setkey(struct crypto_aead *authenc_esn, const u8 * out:memzero_explicit (&keys,sizeof (keys));return err; - -badkey: -crypto_aead_set_flags (authenc_esn,CRYPTO_TFM_RES_BAD_KEY_LEN ); - goto out; } static int crypto_authenc_esn_genicv_tail(struct aead_request *req,
crypto/blake2b_generic.c +1 -3
@@ -147,10 +147,8 @@ static int blake2b_setkey(struct crypto_shash *tfm, const u8 *key, {struct blake2b_tfm_ctx *tctx =crypto_shash_ctx (tfm); -if (keylen ==0 || keylen >BLAKE2B_KEYBYTES ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen ==0 || keylen >BLAKE2B_KEYBYTES )return -EINVAL ; - }memcpy (tctx->key, key, keylen); tctx->keylen = keylen;
crypto/blake2s_generic.c +1 -3
@@ -17,10 +17,8 @@ static int crypto_blake2s_setkey(struct crypto_shash *tfm, const u8 *key, {struct blake2s_tfm_ctx *tctx =crypto_shash_ctx (tfm); -if (keylen ==0 || keylen >BLAKE2S_KEY_SIZE ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen ==0 || keylen >BLAKE2S_KEY_SIZE )return -EINVAL ; - }memcpy (tctx->key, key, keylen); tctx->keylen = keylen;
crypto/camellia_generic.c +1 -4
@@ -970,12 +970,9 @@ camellia_set_key(struct crypto_tfm *tfm, const u8 *in_key, {struct camellia_ctx *cctx =crypto_tfm_ctx (tfm);const unsigned char *key = (const unsigned char *)in_key; -u32 *flags = &tfm->crt_flags; -if (key_len !=16 && key_len !=24 && key_len !=32 ) { - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +if (key_len !=16 && key_len !=24 && key_len !=32 )return -EINVAL ; - } cctx->key_length = key_len;
crypto/cast6_generic.c +3 -7
@@ -103,17 +103,14 @@ static inline void W(u32 *key, unsigned int i) key[7 ] ^=F2 (key[0 ], Tr[i %4 ][7 ], Tm[i][7 ]); } -int __cast6_setkey (struct cast6_ctx *c,const u8 *in_key, -unsigned key_len,u32 *flags) +int __cast6_setkey (struct cast6_ctx *c,const u8 *in_key,unsigned int key_len) {int i;u32 key[8 ];__be32 p_key[8 ];/* padded key */ -if (key_len %4 !=0 ) { - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +if (key_len %4 !=0 )return -EINVAL ; - }memset (p_key,0 ,32 );memcpy (p_key, in_key, key_len);
@@ -148,8 +145,7 @@ EXPORT_SYMBOL_GPL(__cast6_setkey);int cast6_setkey (struct crypto_tfm *tfm,const u8 *key,unsigned int keylen) { -return __cast6_setkey (crypto_tfm_ctx (tfm), key, keylen, - &tfm->crt_flags); +return __cast6_setkey (crypto_tfm_ctx (tfm), key, keylen); }EXPORT_SYMBOL_GPL (cast6_setkey);
crypto/cipher.c +1 -3
@@ -46,10 +46,8 @@ int crypto_cipher_setkey(struct crypto_cipher *tfm,unsigned long alignmask =crypto_cipher_alignmask (tfm);crypto_cipher_clear_flags (tfm,CRYPTO_TFM_RES_MASK ); -if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize) { -crypto_cipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize)return -EINVAL ; - }if ((unsigned long )key & alignmask)return setkey_unaligned (tfm, key, keylen);
crypto/crc32_generic.c +1 -3
@@ -60,10 +60,8 @@ static int crc32_setkey(struct crypto_shash *hash, const u8 *key, {u32 *mctx =crypto_shash_ctx (hash); -if (keylen !=sizeof (u32)) { -crypto_shash_set_flags (hash,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (u32))return -EINVAL ; - } *mctx =get_unaligned_le32 (key);return 0 ; }
crypto/crc32c_generic.c +1 -3
@@ -74,10 +74,8 @@ static int chksum_setkey(struct crypto_shash *tfm, const u8 *key, {struct chksum_ctx *mctx =crypto_shash_ctx (tfm); -if (keylen !=sizeof (mctx->key)) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (mctx->key))return -EINVAL ; - } mctx->key =get_unaligned_le32 (key);return 0 ; }
crypto/essiv.c +1 -3
@@ -117,10 +117,8 @@ static int essiv_aead_setkey(struct crypto_aead *tfm, const u8 *key,if (err)return err; -if (crypto_authenc_extractkeys (&keys, key, keylen) !=0 ) { -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (crypto_authenc_extractkeys (&keys, key, keylen) !=0 )return -EINVAL ; - } desc->tfm = tctx->hash; err = crypto_shash_init(desc) ?:
crypto/ghash-generic.c +1 -3
@@ -58,10 +58,8 @@ static int ghash_setkey(struct crypto_shash *tfm,struct ghash_ctx *ctx =crypto_shash_ctx (tfm);be128 k; -if (keylen !=GHASH_BLOCK_SIZE ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=GHASH_BLOCK_SIZE )return -EINVAL ; - }if (ctx->gf128)gf128mul_free_4k (ctx->gf128);
crypto/michael_mic.c +1 -3
@@ -137,10 +137,8 @@ static int michael_setkey(struct crypto_shash *tfm, const u8 *key,const __le32 *data = (const __le32 *)key; -if (keylen !=8 ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=8 )return -EINVAL ; - } mctx->l =le32_to_cpu (data[0 ]); mctx->r =le32_to_cpu (data[1 ]);
crypto/skcipher.c +1 -3
@@ -603,10 +603,8 @@ int crypto_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,unsigned long alignmask =crypto_skcipher_alignmask (tfm);int err; -if (keylen < cipher->min_keysize || keylen > cipher->max_keysize) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen < cipher->min_keysize || keylen > cipher->max_keysize)return -EINVAL ; - }if ((unsigned long )key & alignmask) err =skcipher_setkey_unaligned (tfm, key, keylen);
crypto/sm4_generic.c +5 -11
@@ -143,29 +143,23 @@ int crypto_sm4_expand_key(struct crypto_sm4_ctx *ctx, const u8 *in_key,EXPORT_SYMBOL_GPL (crypto_sm4_expand_key);/** -* crypto_sm4_set_key - Set the AES key. +* crypto_sm4_set_key - Set the SM4 key. * @tfm: The %crypto_tfm that is used in the context. * @in_key: The input key. * @key_len: The size of the key. * -* Returns 0 on success, on failure the %CRYPTO_TFM_RES_BAD_KEY_LEN flag in tfm -* is set. The function uses crypto_sm4_expand_key() to expand the key. +* This function uses crypto_sm4_expand_key() to expand the key. * &crypto_sm4_ctx _must_ be the private data embedded in @tfm which is * retrieved with crypto_tfm_ctx(). +* +* Return: 0 on success; -EINVAL on failure (only happens for bad key lengths) */ int crypto_sm4_set_key (struct crypto_tfm *tfm,const u8 *in_key,unsigned int key_len) {struct crypto_sm4_ctx *ctx =crypto_tfm_ctx (tfm); -u32 *flags = &tfm->crt_flags; -int ret; - - ret =crypto_sm4_expand_key (ctx, in_key, key_len); -if (!ret) -return 0 ; - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; -return -EINVAL ; +return crypto_sm4_expand_key (ctx, in_key, key_len); }EXPORT_SYMBOL_GPL (crypto_sm4_set_key);
crypto/twofish_common.c +2 -6
@@ -567,7 +567,7 @@ static const u8 calc_sb_tbl[512] = {/* Perform the key setup. */ int __twofish_setkey (struct twofish_ctx *ctx,const u8 *key, -unsigned int key_len,u32 *flags) +unsigned int key_len) {int i, j, k;
@@ -584,10 +584,7 @@ int __twofish_setkey(struct twofish_ctx *ctx, const u8 *key,/* Check key length. */ if (key_len %8 ) - { - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ;return -EINVAL ;/* unsupported key length */ - }/* Compute the first two words of the S vector. The magic numbers are * the entries of the RS matrix, preprocessed through poly_to_exp. The
@@ -688,8 +685,7 @@ EXPORT_SYMBOL_GPL(__twofish_setkey);int twofish_setkey (struct crypto_tfm *tfm,const u8 *key,unsigned int key_len) { -return __twofish_setkey (crypto_tfm_ctx (tfm), key, key_len, - &tfm->crt_flags); +return __twofish_setkey (crypto_tfm_ctx (tfm), key, key_len); }EXPORT_SYMBOL_GPL (twofish_setkey);
crypto/vmac.c +1 -3
@@ -435,10 +435,8 @@ static int vmac_setkey(struct crypto_shash *tfm,unsigned int i;int err; -if (keylen !=VMAC_KEY_LEN ) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=VMAC_KEY_LEN )return -EINVAL ; - } err =crypto_cipher_setkey (tctx->cipher, key, keylen);if (err)
crypto/xxhash_generic.c +1 -3
@@ -22,10 +22,8 @@ static int xxhash64_setkey(struct crypto_shash *tfm, const u8 *key, {struct xxhash64_tfm_ctx *tctx =crypto_shash_ctx (tfm); -if (keylen !=sizeof (tctx->seed)) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (tctx->seed))return -EINVAL ; - } tctx->seed =get_unaligned_le64 (key);return 0 ; }
drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c +0 -1
@@ -541,7 +541,6 @@ int sun4i_ss_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,break ;default :dev_dbg (ss->dev,"ERROR: Invalid keylen %u\n" , keylen); -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; } op->keylen = keylen;
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c +0 -1
@@ -394,7 +394,6 @@ int sun8i_ce_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,break ;default :dev_dbg (ce->dev,"ERROR: Invalid keylen %u\n" , keylen); -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }if (op->key) {
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c +0 -2
@@ -390,7 +390,6 @@ int sun8i_ss_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,break ;default :dev_dbg (ss->dev,"ERROR: Invalid keylen %u\n" , keylen); -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }if (op->key) {
@@ -416,7 +415,6 @@ int sun8i_ss_des3_setkey(struct crypto_skcipher *tfm, const u8 *key,if (unlikely (keylen !=3 *DES_KEY_SIZE )) {dev_dbg (ss->dev,"Invalid keylen %u\n" , keylen); -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
drivers/crypto/amcc/crypto4xx_alg.c +3 -8
@@ -128,12 +128,9 @@ static int crypto4xx_setkey_aes(struct crypto_skcipher *cipher,struct dynamic_sa_ctl *sa;int rc; -if (keylen !=AES_KEYSIZE_256 && - keylen !=AES_KEYSIZE_192 && keylen !=AES_KEYSIZE_128 ) { -crypto_skcipher_set_flags (cipher, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=AES_KEYSIZE_256 && keylen !=AES_KEYSIZE_192 && + keylen !=AES_KEYSIZE_128 )return -EINVAL ; - }/* Create SA */ if (ctx->sa_in || ctx->sa_out)
@@ -551,10 +548,8 @@ int crypto4xx_setkey_aes_gcm(struct crypto_aead *cipher,struct dynamic_sa_ctl *sa;int rc =0 ; -if (crypto4xx_aes_gcm_validate_keylen (keylen) !=0 ) { -crypto_aead_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (crypto4xx_aes_gcm_validate_keylen (keylen) !=0 )return -EINVAL ; - } rc =crypto4xx_aead_setup_fallback (ctx, cipher, key, keylen);if (rc)
drivers/crypto/amlogic/amlogic-gxl-cipher.c +0 -1
@@ -366,7 +366,6 @@ int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,break ;default :dev_dbg (mc->dev,"ERROR: Invalid keylen %u\n" , keylen); -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }if (op->key) {
drivers/crypto/atmel-aes.c +2 -7
@@ -1140,10 +1140,8 @@ static int atmel_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,if (keylen !=AES_KEYSIZE_128 && keylen !=AES_KEYSIZE_192 && - keylen !=AES_KEYSIZE_256 ) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); + keylen !=AES_KEYSIZE_256 )return -EINVAL ; - }memcpy (ctx->key, key, keylen); ctx->keylen = keylen;
@@ -1716,10 +1714,8 @@ static int atmel_aes_gcm_setkey(struct crypto_aead *tfm, const u8 *key,if (keylen !=AES_KEYSIZE_256 && keylen !=AES_KEYSIZE_192 && - keylen !=AES_KEYSIZE_128 ) { -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); + keylen !=AES_KEYSIZE_128 )return -EINVAL ; - }memcpy (ctx->key, key, keylen); ctx->keylen = keylen;
@@ -2073,7 +2069,6 @@ static int atmel_aes_authenc_setkey(struct crypto_aead *tfm, const u8 *key,return 0 ; badkey: -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );memzero_explicit (&keys,sizeof (keys));return -EINVAL ; }
drivers/crypto/axis/artpec6_crypto.c +1 -7
@@ -1249,10 +1249,8 @@ static int artpec6_crypto_aead_set_key(struct crypto_aead *tfm, const u8 *key, {struct artpec6_cryptotfm_context *ctx =crypto_tfm_ctx (&tfm->base); -if (len !=16 && len !=24 && len !=32 ) { -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (len !=16 && len !=24 && len !=32 )return -EINVAL ; - } ctx->key_length = len;
@@ -1606,8 +1604,6 @@ artpec6_crypto_cipher_set_key(struct crypto_skcipher *cipher, const u8 *key,case 32 :break ;default : -crypto_skcipher_set_flags (cipher, -CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
@@ -1634,8 +1630,6 @@ artpec6_crypto_xts_set_key(struct crypto_skcipher *cipher, const u8 *key,case 64 :break ;default : -crypto_skcipher_set_flags (cipher, -CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
drivers/crypto/bcm/cipher.c +0 -3
@@ -1846,7 +1846,6 @@ static int aes_setkey(struct crypto_skcipher *cipher, const u8 *key, ctx->cipher_type =CIPHER_TYPE_AES256 ;break ;default : -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; } WARN_ON((ctx->max_payload != SPU_MAX_PAYLOAD_INF) &&
@@ -2916,7 +2915,6 @@ static int aead_authenc_setkey(struct crypto_aead *cipher, ctx->authkeylen =0 ; ctx->digestsize =0 ; -crypto_aead_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
@@ -2992,7 +2990,6 @@ static int aead_gcm_ccm_setkey(struct crypto_aead *cipher, ctx->authkeylen =0 ; ctx->digestsize =0 ; -crypto_aead_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
drivers/crypto/caam/caamalg.c +7 -26
@@ -548,10 +548,8 @@ static int chachapoly_setkey(struct crypto_aead *aead, const u8 *key,unsigned int ivsize =crypto_aead_ivsize (aead);unsigned int saltlen =CHACHAPOLY_IV_SIZE - ivsize; -if (keylen !=CHACHA_KEY_SIZE + saltlen) { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=CHACHA_KEY_SIZE + saltlen)return -EINVAL ; - } ctx->cdata.key_virt = key; ctx->cdata.keylen = keylen - saltlen;
@@ -619,7 +617,6 @@ static int aead_setkey(struct crypto_aead *aead,memzero_explicit (&keys,sizeof (keys));return aead_set_sh_desc (aead); badkey: -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN );memzero_explicit (&keys,sizeof (keys));return -EINVAL ; }
@@ -649,10 +646,8 @@ static int gcm_setkey(struct crypto_aead *aead,int err; err =aes_check_keylen (keylen); -if (err) { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (err)return err; - } print_hex_dump_debug("key in @"__stringify(__LINE__)": ",DUMP_PREFIX_ADDRESS ,16 ,4 , key, keylen,1 );
@@ -672,10 +667,8 @@ static int rfc4106_setkey(struct crypto_aead *aead,int err; err =aes_check_keylen (keylen -4 ); -if (err) { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (err)return err; - } print_hex_dump_debug("key in @"__stringify(__LINE__)": ",DUMP_PREFIX_ADDRESS ,16 ,4 , key, keylen,1 );
@@ -700,10 +693,8 @@ static int rfc4543_setkey(struct crypto_aead *aead,int err; err =aes_check_keylen (keylen -4 ); -if (err) { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (err)return err; - } print_hex_dump_debug("key in @"__stringify(__LINE__)": ",DUMP_PREFIX_ADDRESS ,16 ,4 , key, keylen,1 );
@@ -762,11 +753,8 @@ static int aes_skcipher_setkey(struct crypto_skcipher *skcipher,int err; err =aes_check_keylen (keylen); -if (err) { -crypto_skcipher_set_flags (skcipher, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (err)return err; - }return skcipher_setkey (skcipher, key, keylen,0 ); }
@@ -786,11 +774,8 @@ static int rfc3686_skcipher_setkey(struct crypto_skcipher *skcipher, keylen -=CTR_RFC3686_NONCE_SIZE ; err =aes_check_keylen (keylen); -if (err) { -crypto_skcipher_set_flags (skcipher, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (err)return err; - }return skcipher_setkey (skcipher, key, keylen, ctx1_iv_off); }
@@ -809,11 +794,8 @@ static int ctr_skcipher_setkey(struct crypto_skcipher *skcipher, ctx1_iv_off =16 ; err =aes_check_keylen (keylen); -if (err) { -crypto_skcipher_set_flags (skcipher, -CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (err)return err; - }return skcipher_setkey (skcipher, key, keylen, ctx1_iv_off); }
@@ -846,7 +828,6 @@ static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,u32 *desc;if (keylen !=2 *AES_MIN_KEY_SIZE && keylen !=2 *AES_MAX_KEY_SIZE ) { -crypto_skcipher_set_flags (skcipher,CRYPTO_TFM_RES_BAD_KEY_LEN );dev_err (jrdev,"key size mismatch\n" );return -EINVAL ; }
drivers/crypto/caam/caamalg_qi.c +11 -33
130 lines not on this page · raw message
drivers/crypto/caam/caamalg_qi2.c +10 -37
136 lines not on this page · raw message
drivers/crypto/caam/caamhash.c +2 -7
@@ -473,7 +473,6 @@ static int ahash_setkey(struct crypto_ahash *ahash,return ahash_set_sh_desc (ahash); bad_free_key:kfree (hashed_key); -crypto_ahash_set_flags (ahash,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
@@ -483,10 +482,8 @@ static int axcbc_setkey(struct crypto_ahash *ahash, const u8 *key,struct caam_hash_ctx *ctx =crypto_ahash_ctx (ahash);struct device *jrdev = ctx->jrdev; -if (keylen !=AES_KEYSIZE_128 ) { -crypto_ahash_set_flags (ahash,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=AES_KEYSIZE_128 )return -EINVAL ; - }memcpy (ctx->key, key, keylen); dma_sync_single_for_device(jrdev, ctx->adata.key_dma, keylen,
@@ -506,10 +503,8 @@ static int acmac_setkey(struct crypto_ahash *ahash, const u8 *key,int err; err =aes_check_keylen (keylen); -if (err) { -crypto_ahash_set_flags (ahash,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (err)return err; - }/* key is immediate data for all cmac shared descriptors */ ctx->adata.key_virt = key;
drivers/crypto/cavium/cpt/cptvf_algs.c +0 -2
@@ -295,8 +295,6 @@ static int cvm_setkey(struct crypto_skcipher *cipher, const u8 *key,memcpy (ctx->enc_key, key, keylen);return 0 ; }else { -crypto_skcipher_set_flags (cipher, -CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; } }
drivers/crypto/cavium/nitrox/nitrox_aead.c +1 -3
@@ -40,10 +40,8 @@ static int nitrox_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,union fc_ctx_flags flags; aes_keylen =flexi_aes_keylen (keylen); -if (aes_keylen <0 ) { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (aes_keylen <0 )return -EINVAL ; - }/* fill crypto context */ fctx = nctx->u.fctx;
drivers/crypto/cavium/nitrox/nitrox_skcipher.c +3 -9
@@ -200,10 +200,8 @@ static int nitrox_aes_setkey(struct crypto_skcipher *cipher, const u8 *key,int aes_keylen; aes_keylen =flexi_aes_keylen (keylen); -if (aes_keylen <0 ) { -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (aes_keylen <0 )return -EINVAL ; - }return nitrox_skcipher_setkey (cipher, aes_keylen, key, keylen); }
@@ -351,10 +349,8 @@ static int nitrox_aes_xts_setkey(struct crypto_skcipher *cipher, keylen /=2 ; aes_keylen =flexi_aes_keylen (keylen); -if (aes_keylen <0 ) { -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (aes_keylen <0 )return -EINVAL ; - } fctx = nctx->u.fctx;/* copy KEY2 */
@@ -382,10 +378,8 @@ static int nitrox_aes_ctr_rfc3686_setkey(struct crypto_skcipher *cipher, keylen -=CTR_RFC3686_NONCE_SIZE ; aes_keylen =flexi_aes_keylen (keylen); -if (aes_keylen <0 ) { -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (aes_keylen <0 )return -EINVAL ; - }return nitrox_skcipher_setkey (cipher, aes_keylen, key, keylen); }
drivers/crypto/ccp/ccp-crypto-aes-cmac.c +0 -1
@@ -276,7 +276,6 @@ static int ccp_aes_cmac_setkey(struct crypto_ahash *tfm, const u8 *key, ctx->u.aes.type =CCP_AES_TYPE_256 ;break ;default : -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; } ctx->u.aes.mode = alg->mode;
drivers/crypto/ccp/ccp-crypto-aes-galois.c +0 -1
@@ -42,7 +42,6 @@ static int ccp_aes_gcm_setkey(struct crypto_aead *tfm, const u8 *key, ctx->u.aes.type =CCP_AES_TYPE_256 ;break ;default : -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
drivers/crypto/ccp/ccp-crypto-aes.c +0 -1
@@ -51,7 +51,6 @@ static int ccp_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, ctx->u.aes.type =CCP_AES_TYPE_256 ;break ;default : -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; } ctx->u.aes.mode = alg->mode;
drivers/crypto/ccp/ccp-crypto-sha.c +1 -3
@@ -293,10 +293,8 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key, ret =crypto_shash_digest (sdesc, key, key_len, ctx->u.sha.key); -if (ret) { -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return -EINVAL ; - } key_len = digest_size; }else {
drivers/crypto/ccree/cc_aead.c +6 -14
@@ -562,7 +562,7 @@ static int cc_aead_setkey(struct crypto_aead *tfm, const u8 *key, rc =crypto_authenc_extractkeys (&keys, key, keylen);if (rc) - goto badkey; +return rc; enckey = keys.enckey; authkey = keys.authkey; ctx->enc_keylen = keys.enckeylen;
@@ -570,10 +570,9 @@ static int cc_aead_setkey(struct crypto_aead *tfm, const u8 *key,if (ctx->cipher_mode ==DRV_CIPHER_CTR ) {/* the nonce is stored in bytes at end of key */ - rc = -EINVAL ;if (ctx->enc_keylen < (AES_MIN_KEY_SIZE +CTR_RFC3686_NONCE_SIZE )) - goto badkey; +return -EINVAL ;/* Copy nonce from last 4 bytes in CTR key to * first 4 bytes in CTR IV */
@@ -591,7 +590,7 @@ static int cc_aead_setkey(struct crypto_aead *tfm, const u8 *key, rc =validate_keys_sizes (ctx);if (rc) - goto badkey; +return rc;/* STAT_PHASE_1: Copy key to ctx */
@@ -605,7 +604,7 @@ static int cc_aead_setkey(struct crypto_aead *tfm, const u8 *key, }else if (ctx->auth_mode !=DRV_HASH_NULL ) {/* HMAC */ rc =cc_get_plain_hmac_key (tfm, authkey, ctx->auth_keylen);if (rc) - goto badkey; +return rc; }/* STAT_PHASE_2: Create sequence */
@@ -622,8 +621,7 @@ static int cc_aead_setkey(struct crypto_aead *tfm, const u8 *key,break ;/* No auth. key setup */ default :dev_err (dev,"Unsupported authenc (%d)\n" , ctx->auth_mode); - rc = -ENOTSUPP ; - goto badkey; +return -ENOTSUPP ; }/* STAT_PHASE_3: Submit sequence to HW */
@@ -632,18 +630,12 @@ static int cc_aead_setkey(struct crypto_aead *tfm, const u8 *key, rc =cc_send_sync_request (ctx->drvdata, &cc_req, desc, seq_len);if (rc) {dev_err (dev,"send_request() failed (rc=%d)\n" , rc); - goto setkey_error; +return rc; } }/* Update STAT_PHASE_3 */ return rc; - -badkey: -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); - -setkey_error: -return rc; } static int cc_des3_aead_setkey(struct crypto_aead *aead, const u8 *key,
drivers/crypto/ccree/cc_cipher.c +0 -3
@@ -291,7 +291,6 @@ static int cc_cipher_sethkey(struct crypto_skcipher *sktfm, const u8 *key,/* This check the size of the protected key token */ if (keylen !=sizeof (hki)) {dev_err (dev,"Unsupported protected key size %d.\n" , keylen); -crypto_tfm_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
@@ -304,7 +303,6 @@ static int cc_cipher_sethkey(struct crypto_skcipher *sktfm, const u8 *key,if (validate_keys_sizes (ctx_p, keylen)) {dev_err (dev,"Unsupported key size %d.\n" , keylen); -crypto_tfm_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
@@ -395,7 +393,6 @@ static int cc_cipher_setkey(struct crypto_skcipher *sktfm, const u8 *key,if (validate_keys_sizes (ctx_p, keylen)) {dev_err (dev,"Unsupported key size %d.\n" , keylen); -crypto_tfm_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
drivers/crypto/ccree/cc_hash.c +0 -6
@@ -899,9 +899,6 @@ static int cc_hash_setkey(struct crypto_ahash *ahash, const u8 *key, rc =cc_send_sync_request (ctx->drvdata, &cc_req, desc, idx); out: -if (rc) -crypto_ahash_set_flags (ahash,CRYPTO_TFM_RES_BAD_KEY_LEN ); -if (ctx->key_params.key_dma_addr) {dma_unmap_single (dev, ctx->key_params.key_dma_addr, ctx->key_params.keylen,DMA_TO_DEVICE );
@@ -990,9 +987,6 @@ static int cc_xcbc_setkey(struct crypto_ahash *ahash, rc =cc_send_sync_request (ctx->drvdata, &cc_req, desc, idx); -if (rc) -crypto_ahash_set_flags (ahash,CRYPTO_TFM_RES_BAD_KEY_LEN ); -dma_unmap_single (dev, ctx->key_params.key_dma_addr, ctx->key_params.keylen,DMA_TO_DEVICE ); dev_dbg(dev, "Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n",
drivers/crypto/chelsio/chcr_algo.c +3 -13
@@ -912,7 +912,6 @@ static int chcr_aes_cbc_setkey(struct crypto_skcipher *cipher, ablkctx->ciph_mode =CHCR_SCMD_CIPHER_MODE_AES_CBC ;return 0 ; badkey_err: -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); ablkctx->enckey_len =0 ;return err;
@@ -943,7 +942,6 @@ static int chcr_aes_ctr_setkey(struct crypto_skcipher *cipher,return 0 ; badkey_err: -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); ablkctx->enckey_len =0 ;return err;
@@ -981,7 +979,6 @@ static int chcr_aes_rfc3686_setkey(struct crypto_skcipher *cipher,return 0 ; badkey_err: -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); ablkctx->enckey_len =0 ;return err;
@@ -2174,7 +2171,6 @@ static int chcr_aes_xts_setkey(struct crypto_skcipher *cipher, const u8 *key, ablkctx->ciph_mode =CHCR_SCMD_CIPHER_MODE_AES_XTS ;return 0 ; badkey_err: -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); ablkctx->enckey_len =0 ;return err;
@@ -3284,7 +3280,6 @@ static int chcr_ccm_common_setkey(struct crypto_aead *aead, ck_size =CHCR_KEYCTX_CIPHER_KEY_SIZE_256 ; mk_size =CHCR_KEYCTX_MAC_KEY_SIZE_256 ; }else { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); aeadctx->enckey_len =0 ;return -EINVAL ; }
@@ -3322,7 +3317,6 @@ static int chcr_aead_rfc4309_setkey(struct crypto_aead *aead, const u8 *key,int error;if (keylen <3 ) { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN ); aeadctx->enckey_len =0 ;return -EINVAL ; }
@@ -3372,7 +3366,6 @@ static int chcr_gcm_setkey(struct crypto_aead *aead, const u8 *key, }else if (keylen ==AES_KEYSIZE_256 ) { ck_size =CHCR_KEYCTX_CIPHER_KEY_SIZE_256 ; }else { -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN );pr_err ("GCM: Invalid key length %d\n" , keylen); ret = -EINVAL ; goto out;
@@ -3429,10 +3422,8 @@ static int chcr_authenc_setkey(struct crypto_aead *authenc, const u8 *key,if (err) goto out; -if (crypto_authenc_extractkeys (&keys, key, keylen) !=0 ) { -crypto_aead_set_flags (authenc,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (crypto_authenc_extractkeys (&keys, key, keylen) !=0 ) goto out; - }if (get_alg_config (¶m, max_authsize)) {pr_err ("chcr : Unsupported digest size\n" );
@@ -3559,10 +3550,9 @@ static int chcr_aead_digest_null_setkey(struct crypto_aead *authenc,if (err) goto out; -if (crypto_authenc_extractkeys (&keys, key, keylen) !=0 ) { -crypto_aead_set_flags (authenc,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (crypto_authenc_extractkeys (&keys, key, keylen) !=0 ) goto out; - } + subtype =get_aead_subtype (authenc);if (subtype ==CRYPTO_ALG_SUB_TYPE_CTR_SHA || subtype ==CRYPTO_ALG_SUB_TYPE_CTR_NULL ) {
drivers/crypto/geode-aes.c +2 -6
@@ -119,11 +119,9 @@ static int geode_setkey_cip(struct crypto_tfm *tfm, const u8 *key,return 0 ; } -if (len !=AES_KEYSIZE_192 && len !=AES_KEYSIZE_256 ) { +if (len !=AES_KEYSIZE_192 && len !=AES_KEYSIZE_256 )/* not supported at all */ - tfm->crt_flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ;return -EINVAL ; - }/* * The requested key size is not supported by HW, do a fallback
@@ -154,11 +152,9 @@ static int geode_setkey_skcipher(struct crypto_skcipher *tfm, const u8 *key,return 0 ; } -if (len !=AES_KEYSIZE_192 && len !=AES_KEYSIZE_256 ) { +if (len !=AES_KEYSIZE_192 && len !=AES_KEYSIZE_256 )/* not supported at all */ -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; - }/* * The requested key size is not supported by HW, do a fallback
drivers/crypto/inside-secure/safexcel_cipher.c +11 -27
@@ -380,10 +380,8 @@ static int safexcel_skcipher_aes_setkey(struct crypto_skcipher *ctfm,int ret, i; ret =aes_expandkey (&aes, key, len); -if (ret) { -crypto_skcipher_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return ret; - }if (priv->flags &EIP197_TRC_CACHE && ctx->base.ctxr_dma) {for (i =0 ; i < len /sizeof (u32); i++) {
@@ -433,12 +431,12 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8 *key,case SAFEXCEL_DES : err =verify_aead_des_key (ctfm, keys.enckey, keys.enckeylen);if (unlikely (err)) - goto badkey_expflags; + goto badkey;break ;case SAFEXCEL_3DES : err =verify_aead_des3_key (ctfm, keys.enckey, keys.enckeylen);if (unlikely (err)) - goto badkey_expflags; + goto badkey;break ;case SAFEXCEL_AES : err =aes_expandkey (&aes, keys.enckey, keys.enckeylen);
@@ -521,8 +519,6 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8 *key,return 0 ; badkey: -crypto_aead_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -badkey_expflags:memzero_explicit (&keys,sizeof (keys));return err; }
@@ -1444,10 +1440,8 @@ static int safexcel_skcipher_aesctr_setkey(struct crypto_skcipher *ctfm,/* exclude the nonce here */ keylen = len -CTR_RFC3686_NONCE_SIZE ; ret =aes_expandkey (&aes, key, keylen); -if (ret) { -crypto_skcipher_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return ret; - }if (priv->flags &EIP197_TRC_CACHE && ctx->base.ctxr_dma) {for (i =0 ; i < keylen /sizeof (u32); i++) {
@@ -2459,10 +2453,8 @@ static int safexcel_skcipher_aesxts_setkey(struct crypto_skcipher *ctfm,/* Only half of the key data is cipher key */ keylen = (len >>1 ); ret =aes_expandkey (&aes, key, keylen); -if (ret) { -crypto_skcipher_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return ret; - }if (priv->flags &EIP197_TRC_CACHE && ctx->base.ctxr_dma) {for (i =0 ; i < keylen /sizeof (u32); i++) {
@@ -2478,10 +2470,8 @@ static int safexcel_skcipher_aesxts_setkey(struct crypto_skcipher *ctfm,/* The other half is the tweak key */ ret =aes_expandkey (&aes, (u8 *)(key + keylen), keylen); -if (ret) { -crypto_skcipher_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return ret; - }if (priv->flags &EIP197_TRC_CACHE && ctx->base.ctxr_dma) {for (i =0 ; i < keylen /sizeof (u32); i++) {
@@ -2570,7 +2560,6 @@ static int safexcel_aead_gcm_setkey(struct crypto_aead *ctfm, const u8 *key, ret =aes_expandkey (&aes, key, len);if (ret) { -crypto_aead_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN );memzero_explicit (&aes,sizeof (aes));return ret; }
@@ -2684,7 +2673,6 @@ static int safexcel_aead_ccm_setkey(struct crypto_aead *ctfm, const u8 *key, ret =aes_expandkey (&aes, key, len);if (ret) { -crypto_aead_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN );memzero_explicit (&aes,sizeof (aes));return ret; }
@@ -2815,10 +2803,9 @@ static int safexcel_skcipher_chacha20_setkey(struct crypto_skcipher *ctfm, {struct safexcel_cipher_ctx *ctx =crypto_skcipher_ctx (ctfm); -if (len !=CHACHA_KEY_SIZE ) { -crypto_skcipher_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (len !=CHACHA_KEY_SIZE )return -EINVAL ; - } +safexcel_chacha20_setkey (ctx, key);return 0 ;
@@ -2872,10 +2859,9 @@ static int safexcel_aead_chachapoly_setkey(struct crypto_aead *ctfm, len -=EIP197_AEAD_IPSEC_NONCE_SIZE ; ctx->nonce = *(u32 *)(key + len); } -if (len !=CHACHA_KEY_SIZE ) { -crypto_aead_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (len !=CHACHA_KEY_SIZE )return -EINVAL ; - } +safexcel_chacha20_setkey (ctx, key);return 0 ;
@@ -3070,10 +3056,8 @@ static int safexcel_skcipher_sm4_setkey(struct crypto_skcipher *ctfm,struct safexcel_cipher_ctx *ctx =crypto_tfm_ctx (tfm);struct safexcel_crypto_priv *priv = ctx->priv; -if (len !=SM4_KEY_SIZE ) { -crypto_skcipher_set_flags (ctfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (len !=SM4_KEY_SIZE )return -EINVAL ; - }if (priv->flags &EIP197_TRC_CACHE && ctx->base.ctxr_dma)if (memcmp (ctx->key, key,SM4_KEY_SIZE ))
drivers/crypto/inside-secure/safexcel_hash.c +4 -12
@@ -1919,10 +1919,8 @@ static int safexcel_crc32_setkey(struct crypto_ahash *tfm, const u8 *key, {struct safexcel_ahash_ctx *ctx =crypto_tfm_ctx (crypto_ahash_tfm (tfm)); -if (keylen !=sizeof (u32)) { -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (u32))return -EINVAL ; - }memcpy (ctx->ipad, key,sizeof (u32));return 0 ;
@@ -1995,10 +1993,8 @@ static int safexcel_cbcmac_setkey(struct crypto_ahash *tfm, const u8 *key,int ret, i; ret =aes_expandkey (&aes, key, len); -if (ret) { -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return ret; - }memset (ctx->ipad,0 ,2 *AES_BLOCK_SIZE );for (i =0 ; i < len /sizeof (u32); i++)
@@ -2065,10 +2061,8 @@ static int safexcel_xcbcmac_setkey(struct crypto_ahash *tfm, const u8 *key,int ret, i; ret =aes_expandkey (&aes, key, len); -if (ret) { -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return ret; - }/* precompute the XCBC key material */ crypto_cipher_clear_flags (ctx->kaes,CRYPTO_TFM_REQ_MASK );
@@ -2168,10 +2162,8 @@ static int safexcel_cmac_setkey(struct crypto_ahash *tfm, const u8 *key,int ret, i; ret =aes_expandkey (&aes, key, len); -if (ret) { -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return ret; - }for (i =0 ; i < len /sizeof (u32); i++) ctx->ipad[i + 8] =
drivers/crypto/ixp4xx_crypto.c +0 -3
@@ -740,7 +740,6 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt,u32 keylen_cfg =0 ;struct ix_sa_dir *dir;struct ixp_ctx *ctx =crypto_tfm_ctx (tfm); -u32 *flags = &tfm->crt_flags; dir = encrypt ? &ctx->encrypt : &ctx->decrypt; cinfo = dir->npe_ctx;
@@ -757,7 +756,6 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt,case 24 : keylen_cfg =MOD_AES192 ;break ;case 32 : keylen_cfg =MOD_AES256 ;break ;default : - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ;return -EINVAL ; } cipher_cfg |= keylen_cfg;
@@ -1169,7 +1167,6 @@ static int aead_setkey(struct crypto_aead *tfm, const u8 *key,memzero_explicit (&keys,sizeof (keys));return aead_setup (tfm,crypto_aead_authsize (tfm)); badkey: -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );memzero_explicit (&keys,sizeof (keys));return -EINVAL ; }
drivers/crypto/marvell/cipher.c +1 -3
@@ -255,10 +255,8 @@ static int mv_cesa_aes_setkey(struct crypto_skcipher *cipher, const u8 *key,int i; ret =aes_expandkey (&ctx->aes, key, len); -if (ret) { -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return ret; - } remaining = (ctx->aes.key_length -16 ) /4 ; offset = ctx->aes.key_length +24 - remaining;
drivers/crypto/mediatek/mtk-aes.c +0 -2
@@ -652,7 +652,6 @@ static int mtk_aes_setkey(struct crypto_skcipher *tfm,break ;default : -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
@@ -1022,7 +1021,6 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,break ;default : -crypto_aead_set_flags (aead,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
drivers/crypto/n2_core.c +0 -1
@@ -746,7 +746,6 @@ static int n2_aes_setkey(struct crypto_skcipher *skcipher, const u8 *key, ctx->enc_type |=ENC_TYPE_ALG_AES256 ;break ;default : -crypto_skcipher_set_flags (skcipher,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; }
drivers/crypto/padlock-aes.c +2 -7
@@ -108,14 +108,11 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, {struct aes_ctx *ctx =aes_ctx (tfm);const __le32 *key = (const __le32 *)in_key; -u32 *flags = &tfm->crt_flags;struct crypto_aes_ctx gen_aes;int cpu; -if (key_len %8 ) { - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +if (key_len %8 )return -EINVAL ; - }/* * If the hardware is capable of generating the extended key
@@ -146,10 +143,8 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, ctx->cword.encrypt.keygen =1 ; ctx->cword.decrypt.keygen =1 ; -if (aes_expandkey (&gen_aes, in_key, key_len)) { - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +if (aes_expandkey (&gen_aes, in_key, key_len))return -EINVAL ; - }memcpy (ctx->E, gen_aes.key_enc,AES_MAX_KEYLENGTH );memcpy (ctx->D, gen_aes.key_dec,AES_MAX_KEYLENGTH );
drivers/crypto/picoxcell_crypto.c +1 -5
@@ -490,7 +490,6 @@ static int spacc_aead_setkey(struct crypto_aead *tfm, const u8 *key,return 0 ; badkey: -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );memzero_explicit (&keys,sizeof (keys));return -EINVAL ; }
@@ -780,10 +779,8 @@ static int spacc_aes_setkey(struct crypto_skcipher *cipher, const u8 *key,struct spacc_ablk_ctx *ctx =crypto_tfm_ctx (tfm);int err =0 ; -if (len >AES_MAX_KEY_SIZE ) { -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (len >AES_MAX_KEY_SIZE )return -EINVAL ; - }/* * IPSec engine only supports 128 and 256 bit AES keys. If we get a
@@ -830,7 +827,6 @@ static int spacc_kasumi_f8_setkey(struct crypto_skcipher *cipher,int err =0 ;if (len >AES_MAX_KEY_SIZE ) { -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); err = -EINVAL ; goto out; }
drivers/crypto/qat/qat_common/qat_algs.c +1 -5
@@ -570,7 +570,6 @@ static int qat_alg_aead_init_sessions(struct crypto_aead *tfm, const u8 *key,memzero_explicit (&keys,sizeof (keys));return 0 ; bad_key: -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );memzero_explicit (&keys,sizeof (keys));return -EINVAL ; error:
@@ -586,14 +585,11 @@ static int qat_alg_skcipher_init_sessions(struct qat_alg_skcipher_ctx *ctx,int alg;if (qat_alg_validate_key (keylen, &alg, mode)) - goto bad_key; +return -EINVAL ;qat_alg_skcipher_init_enc (ctx, alg, key, keylen, mode);qat_alg_skcipher_init_dec (ctx, alg, key, keylen, mode);return 0 ; -bad_key: -crypto_skcipher_set_flags (ctx->tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; } static int qat_alg_aead_rekey(struct crypto_aead *tfm, const uint8_t *key,
drivers/crypto/qce/sha.c +0 -2
@@ -396,8 +396,6 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,ahash_request_set_crypt (req, &sg, ctx->authkey, keylen); ret =crypto_wait_req (crypto_ahash_digest (req), &wait); -if (ret) -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );kfree (buf); err_free_req:
drivers/crypto/rockchip/rk3288_crypto_skcipher.c +1 -3
@@ -34,10 +34,8 @@ static int rk_aes_setkey(struct crypto_skcipher *cipher,struct rk_cipher_ctx *ctx =crypto_tfm_ctx (tfm);if (keylen !=AES_KEYSIZE_128 && keylen !=AES_KEYSIZE_192 && - keylen !=AES_KEYSIZE_256 ) { -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); + keylen !=AES_KEYSIZE_256 )return -EINVAL ; - } ctx->keylen = keylen;memcpy_toio (ctx->dev->reg +RK_CRYPTO_AES_KEY_0 , key, keylen);return 0 ;
drivers/crypto/stm32/stm32-crc32.c +1 -3
@@ -85,10 +85,8 @@ static int stm32_crc_setkey(struct crypto_shash *tfm, const u8 *key, {struct stm32_crc_ctx *mctx =crypto_shash_ctx (tfm); -if (keylen !=sizeof (u32)) { -crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=sizeof (u32))return -EINVAL ; - } mctx->key =get_unaligned_le32 (key);return 0 ;
drivers/crypto/talitos.c +3 -12
@@ -914,7 +914,6 @@ static int aead_setkey(struct crypto_aead *authenc,return 0 ; badkey: -crypto_aead_set_flags (authenc,CRYPTO_TFM_RES_BAD_KEY_LEN );memzero_explicit (&keys,sizeof (keys));return -EINVAL ; }
@@ -929,11 +928,11 @@ static int aead_des3_setkey(struct crypto_aead *authenc, err =crypto_authenc_extractkeys (&keys, key, keylen);if (unlikely (err)) - goto badkey; + goto out; err = -EINVAL ;if (keys.authkeylen + keys.enckeylen >TALITOS_MAX_KEY_SIZE ) - goto badkey; + goto out; err =verify_aead_des3_key (authenc, keys.enckey, keys.enckeylen);if (err)
@@ -954,10 +953,6 @@ static int aead_des3_setkey(struct crypto_aead *authenc, out:memzero_explicit (&keys,sizeof (keys));return err; - -badkey: -crypto_aead_set_flags (authenc,CRYPTO_TFM_RES_BAD_KEY_LEN ); - goto out; } static void talitos_sg_unmap(struct device *dev,
@@ -1528,8 +1523,6 @@ static int skcipher_aes_setkey(struct crypto_skcipher *cipher, keylen == AES_KEYSIZE_256)return skcipher_setkey (cipher, key, keylen); -crypto_skcipher_set_flags (cipher,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; }
@@ -2234,10 +2227,8 @@ static int ahash_setkey(struct crypto_ahash *tfm, const u8 *key,/* Must get the hash of the long key */ ret =keyhash (tfm, key, keylen, hash); -if (ret) { -crypto_ahash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (ret)return -EINVAL ; - } keysize = digestsize;memcpy (ctx->key, hash, digestsize);
drivers/crypto/ux500/cryp/cryp_core.c +0 -2
@@ -951,7 +951,6 @@ static int aes_skcipher_setkey(struct crypto_skcipher *cipher, const u8 *key, unsigned int keylen) {struct cryp_ctx *ctx =crypto_skcipher_ctx (cipher); -u32 *flags = &cipher->base.crt_flags;pr_debug (DEV_DBG_NAME " [%s]" , __func__);
@@ -970,7 +969,6 @@ static int aes_skcipher_setkey(struct crypto_skcipher *cipher,default :pr_err (DEV_DBG_NAME "[%s]: Unknown keylen!" , __func__); - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ;return -EINVAL ; }
drivers/crypto/virtio/virtio_crypto_algs.c +2 -6
@@ -272,11 +272,11 @@ static int virtio_crypto_alg_skcipher_init_sessions(if (keylen > vcrypto->max_cipher_key_len) {pr_err ("virtio_crypto: the key is too long\n" ); - goto bad_key; +return -EINVAL ; }if (virtio_crypto_alg_validate_key (keylen, &alg)) - goto bad_key; +return -EINVAL ;/* Create encryption session */ ret = virtio_crypto_alg_skcipher_init_session(ctx,
@@ -291,10 +291,6 @@ static int virtio_crypto_alg_skcipher_init_sessions(return ret; }return 0 ; - -bad_key: -crypto_skcipher_set_flags (ctx->tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); -return -EINVAL ; }/* Note: kernel crypto API realization */
include/crypto/cast6.h +1 -2
@@ -15,8 +15,7 @@ struct cast6_ctx {u8 Kr[12 ][4 ]; }; -int __cast6_setkey (struct cast6_ctx *ctx,const u8 *key, -unsigned int keylen,u32 *flags); +int __cast6_setkey (struct cast6_ctx *ctx,const u8 *key,unsigned int keylen);int cast6_setkey (struct crypto_tfm *tfm,const u8 *key,unsigned int keylen);void __cast6_encrypt (const void *ctx,u8 *dst,const u8 *src);
include/crypto/internal/des.h +2 -6
@@ -120,20 +120,16 @@ static inline int verify_skcipher_des3_key(struct crypto_skcipher *tfm,static inline int verify_aead_des_key (struct crypto_aead *tfm,const u8 *key,int keylen) { -if (keylen !=DES_KEY_SIZE ) { -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=DES_KEY_SIZE )return -EINVAL ; - }return crypto_des_verify_key (crypto_aead_tfm (tfm), key); }static inline int verify_aead_des3_key (struct crypto_aead *tfm,const u8 *key,int keylen) { -if (keylen !=DES3_EDE_KEY_SIZE ) { -crypto_aead_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen !=DES3_EDE_KEY_SIZE )return -EINVAL ; - }return crypto_des3_ede_verify_key (crypto_aead_tfm (tfm), key); }
include/crypto/twofish.h +1 -1
@@ -19,7 +19,7 @@ struct twofish_ctx { };int __twofish_setkey (struct twofish_ctx *ctx,const u8 *key, -unsigned int key_len,u32 *flags); +unsigned int key_len);int twofish_setkey (struct crypto_tfm *tfm,const u8 *key,unsigned int key_len);#endif
include/crypto/xts.h +2 -6
@@ -17,10 +17,8 @@ static inline int xts_check_key(struct crypto_tfm *tfm,* key consists of keys of equal size concatenated, therefore * the length must be even. */ -if (keylen %2 ) { - *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +if (keylen %2 )return -EINVAL ; - }/* ensure that the AES and tweak key are not identical */ if (fips_enabled &&
@@ -39,10 +37,8 @@ static inline int xts_verify_key(struct crypto_skcipher *tfm,* key consists of keys of equal size concatenated, therefore * the length must be even. */ -if (keylen %2 ) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN ); +if (keylen %2 )return -EINVAL ; - }/* ensure that the AES and tweak key are not identical */ if ((fips_enabled || (crypto_skcipher_get_flags(tfm) &
include/linux/crypto.h +0 -1
@@ -113,7 +113,6 @@#define CRYPTO_TFM_REQ_MAY_SLEEP 0x00000200#define CRYPTO_TFM_REQ_MAY_BACKLOG 0x00000400#define CRYPTO_TFM_RES_WEAK_KEY 0x00100000 -#define CRYPTO_TFM_RES_BAD_KEY_LEN 0x00200000/* * Miscellaneous stuff.
Signature · 1 line
2.24.1
Re: [PATCH 6/8] crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN
Quoted 27 lines · Eric Biggers
From: Eric Biggers <[email protected]>
The
CRYPTO_TFM_RES_BAD_KEY_LENflag was apparently meant as a way to make the ->setkey() functions provide more information about errors.However, no one actually checks for this flag, which makes it pointless.
Also, many algorithms fail to set this flag when given a bad length key. Reviewing just the generic implementations, this is the case for aes-fixed-time, cbcmac, echainiv, nhpoly1305, pcrypt, rfc3686, rfc4309, rfc7539, rfc7539esp, salsa20, seqiv, and xcbc. But there are probably many more in
arch/*/crypto/anddrivers/crypto/.Some algorithms can even set this flag when the key is the correct length. For example, authenc and authencesn set it when the key payload is malformed in any way (not just a bad length), the atmel-sha and ccree drivers can set it if a memory allocation fails, and the chelsio driver sets it for bad auth tag lengths, not just bad key lengths.
So even if someone actually wanted to start checking this flag (which seems unlikely, since it's been unused for a long time), there would be a lot of work needed to get it working correctly. But it would probably be much better to go back to the drawing board and just define different return values, like
-EINVALif the key is invalid for the algorithm vs.-EKEYREJECTEDif the key was rejected by a policy like "no weak keys". That would be much simpler, less error-prone, and easier to test.
Quoted 3 lines
So just remove this flag.
Signed-off-by Eric Biggers <[email protected]>
for caam and talitos drivers.
Thanks,
Horia
PATCH 7/8 crypto: remove CRYPTO_TFM_RES_WEAK_KEY
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The CRYPTO_TFM_RES_WEAK_KEY flag was apparently meant as a way to make the ->setkey() functions provide more information about errors.
However, no one actually checks for this flag, which makes it pointless. There are also no tests that verify that all algorithms actually set (or don't set) it correctly.
This is also the last remaining CRYPTO_TFM_RES_* flag, which means that it's the only thing still needing all the boilerplate code which propagates these flags around from child => parent tfms.
And if someone ever needs to distinguish this error in the future (which is somewhat unlikely, as it's been unneeded for a long time), it would be much better to just define a new return value like -EKEYREJECTED. That would be much simpler, less error-prone, and easier to test.
So just remove this flag.
--- crypto/des_generic.c | 10 ++-------- drivers/crypto/ixp4xx_crypto.c | 28 ++++------------------------ include/crypto/internal/des.h | 15 +++------------ include/crypto/xts.h | 11 ++--------- include/linux/crypto.h | 1 - 5 files changed, 11 insertions(+), 54 deletions(-)
crypto/des_generic.c +2 -8
@@ -29,11 +29,8 @@ static int des_setkey(struct crypto_tfm *tfm, const u8 *key,else err =0 ; } - -if (err) { +if (err)memset (dctx,0 ,sizeof (*dctx)); -crypto_tfm_set_flags (tfm,CRYPTO_TFM_RES_WEAK_KEY ); - }return err; }
@@ -64,11 +61,8 @@ static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key,else err =0 ; } - -if (err) { +if (err)memset (dctx,0 ,sizeof (*dctx)); -crypto_tfm_set_flags (tfm,CRYPTO_TFM_RES_WEAK_KEY ); - }return err; }
drivers/crypto/ixp4xx_crypto.c +4 -24
@@ -740,6 +740,7 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt,u32 keylen_cfg =0 ;struct ix_sa_dir *dir;struct ixp_ctx *ctx =crypto_tfm_ctx (tfm); +int err; dir = encrypt ? &ctx->encrypt : &ctx->decrypt; cinfo = dir->npe_ctx;
@@ -760,7 +761,9 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt, } cipher_cfg |= keylen_cfg; }else { -crypto_des_verify_key (tfm, key); + err =crypto_des_verify_key (tfm, key); +if (err) +return err; }/* write cfg word to cryptinfo */ *(u32 *)cinfo =cpu_to_be32 (cipher_cfg);
@@ -817,7 +820,6 @@ static int ablk_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int key_len) {struct ixp_ctx *ctx =crypto_skcipher_ctx (tfm); -u32 *flags = &tfm->base.crt_flags;int ret;init_completion (&ctx->completion);
@@ -833,16 +835,6 @@ static int ablk_setkey(struct crypto_skcipher *tfm, const u8 *key,if (ret) goto out; ret =setup_cipher (&tfm->base,1 , key, key_len); -if (ret) - goto out; - -if (*flags &CRYPTO_TFM_RES_WEAK_KEY ) { -if (*flags &CRYPTO_TFM_REQ_FORBID_WEAK_KEYS ) { - ret = -EINVAL ; - }else { - *flags &= ~CRYPTO_TFM_RES_WEAK_KEY ; - } - } out:if (!atomic_dec_and_test (&ctx->configuring))wait_for_completion (&ctx->completion);
@@ -1094,7 +1086,6 @@ static int aead_perform(struct aead_request *req, int encrypt,static int aead_setup (struct crypto_aead *tfm,unsigned int authsize) {struct ixp_ctx *ctx =crypto_aead_ctx (tfm); -u32 *flags = &tfm->base.crt_flags;unsigned digest_len =crypto_aead_maxauthsize (tfm);int ret;
@@ -1118,17 +1109,6 @@ static int aead_setup(struct crypto_aead *tfm, unsigned int authsize) goto out; ret =setup_auth (&tfm->base,1 , authsize, ctx->authkey, ctx->authkey_len, digest_len); -if (ret) - goto out; - -if (*flags &CRYPTO_TFM_RES_WEAK_KEY ) { -if (*flags &CRYPTO_TFM_REQ_FORBID_WEAK_KEYS ) { - ret = -EINVAL ; - goto out; - }else { - *flags &= ~CRYPTO_TFM_RES_WEAK_KEY ; - } - } out:if (!atomic_dec_and_test (&ctx->configuring))wait_for_completion (&ctx->completion);
include/crypto/internal/des.h +3 -12
@@ -35,10 +35,6 @@ static inline int crypto_des_verify_key(struct crypto_tfm *tfm, const u8 *key)else err =0 ; } - -if (err) -crypto_tfm_set_flags (tfm,CRYPTO_TFM_RES_WEAK_KEY ); -memzero_explicit (&tmp,sizeof (tmp));return err; }
@@ -95,14 +91,9 @@ static inline int des3_ede_verify_key(const u8 *key, unsigned int key_len,static inline int crypto_des3_ede_verify_key (struct crypto_tfm *tfm,const u8 *key) { -int err; - - err =des3_ede_verify_key (key,DES3_EDE_KEY_SIZE , -crypto_tfm_get_flags (tfm) & -CRYPTO_TFM_REQ_FORBID_WEAK_KEYS ); -if (err) -crypto_tfm_set_flags (tfm,CRYPTO_TFM_RES_WEAK_KEY ); -return err; +return des3_ede_verify_key (key,DES3_EDE_KEY_SIZE , +crypto_tfm_get_flags (tfm) & +CRYPTO_TFM_REQ_FORBID_WEAK_KEYS ); } static inline int verify_skcipher_des_key(struct crypto_skcipher *tfm,
include/crypto/xts.h +2 -9
@@ -11,8 +11,6 @@static inline int xts_check_key (struct crypto_tfm *tfm,const u8 *key,unsigned int keylen) { -u32 *flags = &tfm->crt_flags; -/* * key consists of keys of equal size concatenated, therefore * the length must be even.
@@ -21,11 +19,8 @@ static inline int xts_check_key(struct crypto_tfm *tfm,return -EINVAL ;/* ensure that the AES and tweak key are not identical */ -if (fips_enabled && - !crypto_memneq (key, key + (keylen /2 ), keylen /2 )) { - *flags |=CRYPTO_TFM_RES_WEAK_KEY ; +if (fips_enabled && !crypto_memneq (key, key + (keylen /2 ), keylen /2 ))return -EINVAL ; - }return 0 ; }
@@ -43,10 +38,8 @@ static inline int xts_verify_key(struct crypto_skcipher *tfm,/* ensure that the AES and tweak key are not identical */ if ((fips_enabled || (crypto_skcipher_get_flags (tfm) &CRYPTO_TFM_REQ_FORBID_WEAK_KEYS )) && - !crypto_memneq (key, key + (keylen /2 ), keylen /2 )) { -crypto_skcipher_set_flags (tfm,CRYPTO_TFM_RES_WEAK_KEY ); + !crypto_memneq (key, key + (keylen /2 ), keylen /2 ))return -EINVAL ; - }return 0 ; }
include/linux/crypto.h +0 -1
@@ -112,7 +112,6 @@#define CRYPTO_TFM_REQ_FORBID_WEAK_KEYS 0x00000100#define CRYPTO_TFM_REQ_MAY_SLEEP 0x00000200#define CRYPTO_TFM_REQ_MAY_BACKLOG 0x00000400 -#define CRYPTO_TFM_RES_WEAK_KEY 0x00100000/* * Miscellaneous stuff.
Signature · 1 line
2.24.1
PATCH 8/8 crypto: remove propagation of CRYPTO_TFM_RES_* flags
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The CRYPTO_TFM_RES_* flags were apparently meant as a way to make the ->setkey() functions provide more information about errors. But these flags weren't actually being used or tested, and in many cases they weren't being set correctly anyway. So they've now been removed.
Also, if someone ever actually needs to start better distinguishing ->setkey() errors (which is somewhat unlikely, as this has been unneeded for a long time), we'd be much better off just defining different return values, like -EINVAL if the key is invalid for the algorithm vs. -EKEYREJECTED if the key was rejected by a policy like "no weak keys". That would be much simpler, less error-prone, and easier to test.
So just remove CRYPTO_TFM_RES_MASK and all the unneeded logic that propagates these flags around.
--- arch/arm/crypto/ghash-ce-glue.c | 7 +----- arch/s390/crypto/aes_s390.c | 23 +++--------------- arch/x86/crypto/ghash-clmulni-intel_glue.c | 7 +----- crypto/adiantum.c | 8 ------- crypto/authenc.c | 6 ----- crypto/authencesn.c | 6 ----- crypto/ccm.c | 20 ++++------------ crypto/chacha20poly1305.c | 7 +----- crypto/cipher.c | 1 - crypto/cryptd.c | 13 ++-------- crypto/ctr.c | 7 +----- crypto/cts.c | 6 +---- crypto/essiv.c | 22 ++++------------- crypto/gcm.c | 19 ++------------- crypto/lrw.c | 2 -- crypto/simd.c | 12 ++-------- crypto/skcipher.c | 6 +---- crypto/xts.c | 8 +------ drivers/crypto/amcc/crypto4xx_alg.c | 20 ++-------------- drivers/crypto/atmel-aes.c | 5 +--- drivers/crypto/atmel-authenc.h | 3 +-- drivers/crypto/atmel-sha.c | 11 +++------ drivers/crypto/bcm/cipher.c | 14 ++--------- drivers/crypto/chelsio/chcr_algo.c | 24 +------------------ drivers/crypto/geode-aes.c | 16 ++----------- .../crypto/inside-secure/safexcel_cipher.c | 5 ---- drivers/crypto/inside-secure/safexcel_hash.c | 6 ----- drivers/crypto/mediatek/mtk-aes.c | 2 -- drivers/crypto/mxs-dcp.c | 12 +--------- drivers/crypto/picoxcell_crypto.c | 9 ------- drivers/crypto/sahara.c | 9 +------ include/linux/crypto.h | 2 -- 32 files changed, 38 insertions(+), 280 deletions(-)
arch/arm/crypto/ghash-ce-glue.c +1 -6
@@ -294,16 +294,11 @@ static int ghash_async_setkey(struct crypto_ahash *tfm, const u8 *key, {struct ghash_async_ctx *ctx =crypto_ahash_ctx (tfm);struct crypto_ahash *child = &ctx->cryptd_tfm->base; -int err;crypto_ahash_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_ahash_set_flags (child,crypto_ahash_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - err =crypto_ahash_setkey (child, key, keylen); -crypto_ahash_set_flags (tfm,crypto_ahash_get_flags (child) - &CRYPTO_TFM_RES_MASK ); - -return err; +return crypto_ahash_setkey (child, key, keylen); }static int ghash_async_init_tfm (struct crypto_tfm *tfm)
arch/s390/crypto/aes_s390.c +3 -20
@@ -72,19 +72,12 @@ static int setkey_fallback_cip(struct crypto_tfm *tfm, const u8 *in_key, unsigned int key_len) {struct s390_aes_ctx *sctx =crypto_tfm_ctx (tfm); -int ret; sctx->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK ; sctx->fallback.cip->base.crt_flags |= (tfm->crt_flags &CRYPTO_TFM_REQ_MASK ); - ret =crypto_cipher_setkey (sctx->fallback.cip, in_key, key_len); -if (ret) { - tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK ; - tfm->crt_flags |= (sctx->fallback.cip->base.crt_flags & -CRYPTO_TFM_RES_MASK ); - } -return ret; +return crypto_cipher_setkey (sctx->fallback.cip, in_key, key_len); } static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
@@ -182,18 +175,13 @@ static int setkey_fallback_skcipher(struct crypto_skcipher *tfm, const u8 *key, unsigned int len) {struct s390_aes_ctx *sctx =crypto_skcipher_ctx (tfm); -int ret;crypto_skcipher_clear_flags (sctx->fallback.skcipher,CRYPTO_TFM_REQ_MASK );crypto_skcipher_set_flags (sctx->fallback.skcipher,crypto_skcipher_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - ret =crypto_skcipher_setkey (sctx->fallback.skcipher, key, len); -crypto_skcipher_set_flags (tfm, -crypto_skcipher_get_flags (sctx->fallback.skcipher) & -CRYPTO_TFM_RES_MASK ); -return ret; +return crypto_skcipher_setkey (sctx->fallback.skcipher, key, len); } static int fallback_skcipher_crypt(struct s390_aes_ctx *sctx,
@@ -389,17 +377,12 @@ static int xts_fallback_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int len) {struct s390_xts_ctx *xts_ctx =crypto_skcipher_ctx (tfm); -int ret;crypto_skcipher_clear_flags (xts_ctx->fallback,CRYPTO_TFM_REQ_MASK );crypto_skcipher_set_flags (xts_ctx->fallback,crypto_skcipher_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - ret =crypto_skcipher_setkey (xts_ctx->fallback, key, len); -crypto_skcipher_set_flags (tfm, -crypto_skcipher_get_flags (xts_ctx->fallback) & -CRYPTO_TFM_RES_MASK ); -return ret; +return crypto_skcipher_setkey (xts_ctx->fallback, key, len); } static int xts_aes_set_key(struct crypto_skcipher *tfm, const u8 *in_key,
arch/x86/crypto/ghash-clmulni-intel_glue.c +1 -6
@@ -255,16 +255,11 @@ static int ghash_async_setkey(struct crypto_ahash *tfm, const u8 *key, {struct ghash_async_ctx *ctx =crypto_ahash_ctx (tfm);struct crypto_ahash *child = &ctx->cryptd_tfm->base; -int err;crypto_ahash_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_ahash_set_flags (child,crypto_ahash_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - err =crypto_ahash_setkey (child, key, keylen); -crypto_ahash_set_flags (tfm,crypto_ahash_get_flags (child) - &CRYPTO_TFM_RES_MASK ); - -return err; +return crypto_ahash_setkey (child, key, keylen); }static int ghash_async_init_tfm (struct crypto_tfm *tfm)
crypto/adiantum.c +0 -8
@@ -133,9 +133,6 @@ static int adiantum_setkey(struct crypto_skcipher *tfm, const u8 *key,crypto_skcipher_get_flags (tfm) & CRYPTO_TFM_REQ_MASK); err =crypto_skcipher_setkey (tctx->streamcipher, key, keylen); -crypto_skcipher_set_flags (tfm, -crypto_skcipher_get_flags (tctx->streamcipher) & -CRYPTO_TFM_RES_MASK );if (err)return err;
@@ -165,9 +162,6 @@ static int adiantum_setkey(struct crypto_skcipher *tfm, const u8 *key, CRYPTO_TFM_REQ_MASK); err =crypto_cipher_setkey (tctx->blockcipher, keyp,BLOCKCIPHER_KEY_SIZE ); -crypto_skcipher_set_flags (tfm, -crypto_cipher_get_flags (tctx->blockcipher) & -CRYPTO_TFM_RES_MASK );if (err) goto out; keyp +=BLOCKCIPHER_KEY_SIZE ;
@@ -180,8 +174,6 @@ static int adiantum_setkey(struct crypto_skcipher *tfm, const u8 *key,crypto_shash_set_flags (tctx->hash,crypto_skcipher_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); err =crypto_shash_setkey (tctx->hash, keyp,NHPOLY1305_KEY_SIZE ); -crypto_skcipher_set_flags (tfm,crypto_shash_get_flags (tctx->hash) & -CRYPTO_TFM_RES_MASK ); keyp +=NHPOLY1305_KEY_SIZE ;WARN_ON (keyp != &data->derived_keys[ARRAY_SIZE (data->derived_keys)]); out:
crypto/authenc.c +0 -6
@@ -97,9 +97,6 @@ static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,crypto_ahash_set_flags (auth,crypto_aead_get_flags (authenc) &CRYPTO_TFM_REQ_MASK ); err =crypto_ahash_setkey (auth, keys.authkey, keys.authkeylen); -crypto_aead_set_flags (authenc,crypto_ahash_get_flags (auth) & -CRYPTO_TFM_RES_MASK ); -if (err) goto out;
@@ -107,9 +104,6 @@ static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,crypto_skcipher_set_flags (enc,crypto_aead_get_flags (authenc) &CRYPTO_TFM_REQ_MASK ); err =crypto_skcipher_setkey (enc, keys.enckey, keys.enckeylen); -crypto_aead_set_flags (authenc,crypto_skcipher_get_flags (enc) & -CRYPTO_TFM_RES_MASK ); - out:memzero_explicit (&keys,sizeof (keys));return err;
crypto/authencesn.c +0 -6
@@ -71,9 +71,6 @@ static int crypto_authenc_esn_setkey(struct crypto_aead *authenc_esn, const u8 *crypto_ahash_set_flags (auth,crypto_aead_get_flags (authenc_esn) &CRYPTO_TFM_REQ_MASK ); err =crypto_ahash_setkey (auth, keys.authkey, keys.authkeylen); -crypto_aead_set_flags (authenc_esn,crypto_ahash_get_flags (auth) & -CRYPTO_TFM_RES_MASK ); -if (err) goto out;
@@ -81,9 +78,6 @@ static int crypto_authenc_esn_setkey(struct crypto_aead *authenc_esn, const u8 *crypto_skcipher_set_flags (enc,crypto_aead_get_flags (authenc_esn) &CRYPTO_TFM_REQ_MASK ); err =crypto_skcipher_setkey (enc, keys.enckey, keys.enckeylen); -crypto_aead_set_flags (authenc_esn,crypto_skcipher_get_flags (enc) & -CRYPTO_TFM_RES_MASK ); - out:memzero_explicit (&keys,sizeof (keys));return err;
crypto/ccm.c +4 -16
@@ -89,26 +89,19 @@ static int crypto_ccm_setkey(struct crypto_aead *aead, const u8 *key,struct crypto_ccm_ctx *ctx =crypto_aead_ctx (aead);struct crypto_skcipher *ctr = ctx->ctr;struct crypto_ahash *mac = ctx->mac; -int err =0 ; +int err;crypto_skcipher_clear_flags (ctr,CRYPTO_TFM_REQ_MASK );crypto_skcipher_set_flags (ctr,crypto_aead_get_flags (aead) &CRYPTO_TFM_REQ_MASK ); err =crypto_skcipher_setkey (ctr, key, keylen); -crypto_aead_set_flags (aead,crypto_skcipher_get_flags (ctr) & -CRYPTO_TFM_RES_MASK );if (err) - goto out; +return err;crypto_ahash_clear_flags (mac,CRYPTO_TFM_REQ_MASK );crypto_ahash_set_flags (mac,crypto_aead_get_flags (aead) &CRYPTO_TFM_REQ_MASK ); - err =crypto_ahash_setkey (mac, key, keylen); -crypto_aead_set_flags (aead,crypto_ahash_get_flags (mac) & -CRYPTO_TFM_RES_MASK ); - -out: -return err; +return crypto_ahash_setkey (mac, key, keylen); } static int crypto_ccm_setauthsize(struct crypto_aead *tfm,
@@ -583,7 +576,6 @@ static int crypto_rfc4309_setkey(struct crypto_aead *parent, const u8 *key, {struct crypto_rfc4309_ctx *ctx =crypto_aead_ctx (parent);struct crypto_aead *child = ctx->child; -int err;if (keylen <3 )return -EINVAL ;
@@ -594,11 +586,7 @@ static int crypto_rfc4309_setkey(struct crypto_aead *parent, const u8 *key,crypto_aead_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_aead_set_flags (child,crypto_aead_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); - err =crypto_aead_setkey (child, key, keylen); -crypto_aead_set_flags (parent,crypto_aead_get_flags (child) & -CRYPTO_TFM_RES_MASK ); - -return err; +return crypto_aead_setkey (child, key, keylen); } static int crypto_rfc4309_setauthsize(struct crypto_aead *parent,
crypto/chacha20poly1305.c +1 -6
@@ -475,7 +475,6 @@ static int chachapoly_setkey(struct crypto_aead *aead, const u8 *key, unsigned int keylen) {struct chachapoly_ctx *ctx =crypto_aead_ctx (aead); -int err;if (keylen != ctx->saltlen +CHACHA_KEY_SIZE )return -EINVAL ;
@@ -486,11 +485,7 @@ static int chachapoly_setkey(struct crypto_aead *aead, const u8 *key,crypto_skcipher_clear_flags (ctx->chacha,CRYPTO_TFM_REQ_MASK );crypto_skcipher_set_flags (ctx->chacha,crypto_aead_get_flags (aead) &CRYPTO_TFM_REQ_MASK ); - - err =crypto_skcipher_setkey (ctx->chacha, key, keylen); -crypto_aead_set_flags (aead,crypto_skcipher_get_flags (ctx->chacha) & -CRYPTO_TFM_RES_MASK ); -return err; +return crypto_skcipher_setkey (ctx->chacha, key, keylen); } static int chachapoly_setauthsize(struct crypto_aead *tfm,
crypto/cipher.c +0 -1
@@ -45,7 +45,6 @@ int crypto_cipher_setkey(struct crypto_cipher *tfm,struct cipher_alg *cia =crypto_cipher_alg (tfm);unsigned long alignmask =crypto_cipher_alignmask (tfm); -crypto_cipher_clear_flags (tfm,CRYPTO_TFM_RES_MASK );if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize)return -EINVAL ;
crypto/cryptd.c +2 -11
@@ -226,17 +226,12 @@ static int cryptd_skcipher_setkey(struct crypto_skcipher *parent, {struct cryptd_skcipher_ctx *ctx =crypto_skcipher_ctx (parent);struct crypto_sync_skcipher *child = ctx->child; -int err;crypto_sync_skcipher_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_sync_skcipher_set_flags (child,crypto_skcipher_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); - err =crypto_sync_skcipher_setkey (child, key, keylen); -crypto_skcipher_set_flags (parent, -crypto_sync_skcipher_get_flags (child) & -CRYPTO_TFM_RES_MASK ); -return err; +return crypto_sync_skcipher_setkey (child, key, keylen); }static void cryptd_skcipher_complete (struct skcipher_request *req,int err)
@@ -465,15 +460,11 @@ static int cryptd_hash_setkey(struct crypto_ahash *parent, {struct cryptd_hash_ctx *ctx =crypto_ahash_ctx (parent);struct crypto_shash *child = ctx->child; -int err;crypto_shash_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_shash_set_flags (child,crypto_ahash_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); - err =crypto_shash_setkey (child, key, keylen); -crypto_ahash_set_flags (parent,crypto_shash_get_flags (child) & -CRYPTO_TFM_RES_MASK ); -return err; +return crypto_shash_setkey (child, key, keylen); } static int cryptd_hash_enqueue(struct ahash_request *req,
crypto/ctr.c +1 -6
@@ -170,7 +170,6 @@ static int crypto_rfc3686_setkey(struct crypto_skcipher *parent, {struct crypto_rfc3686_ctx *ctx =crypto_skcipher_ctx (parent);struct crypto_skcipher *child = ctx->child; -int err;/* the nonce is stored in bytes at end of key */ if (keylen <CTR_RFC3686_NONCE_SIZE )
@@ -184,11 +183,7 @@ static int crypto_rfc3686_setkey(struct crypto_skcipher *parent,crypto_skcipher_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_skcipher_set_flags (child,crypto_skcipher_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); - err =crypto_skcipher_setkey (child, key, keylen); -crypto_skcipher_set_flags (parent,crypto_skcipher_get_flags (child) & -CRYPTO_TFM_RES_MASK ); - -return err; +return crypto_skcipher_setkey (child, key, keylen); }static int crypto_rfc3686_crypt (struct skcipher_request *req)
crypto/cts.c +1 -5
@@ -78,15 +78,11 @@ static int crypto_cts_setkey(struct crypto_skcipher *parent, const u8 *key, {struct crypto_cts_ctx *ctx =crypto_skcipher_ctx (parent);struct crypto_skcipher *child = ctx->child; -int err;crypto_skcipher_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_skcipher_set_flags (child,crypto_skcipher_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); - err =crypto_skcipher_setkey (child, key, keylen); -crypto_skcipher_set_flags (parent,crypto_skcipher_get_flags (child) & -CRYPTO_TFM_RES_MASK ); -return err; +return crypto_skcipher_setkey (child, key, keylen); }static void cts_cbc_crypt_done (struct crypto_async_request *areq,int err)
crypto/essiv.c +4 -18
@@ -75,9 +75,6 @@ static int essiv_skcipher_setkey(struct crypto_skcipher *tfm,crypto_skcipher_get_flags (tfm) & CRYPTO_TFM_REQ_MASK); err =crypto_skcipher_setkey (tctx->u.skcipher, key, keylen); -crypto_skcipher_set_flags (tfm, -crypto_skcipher_get_flags (tctx->u.skcipher) & -CRYPTO_TFM_RES_MASK );if (err)return err;
@@ -90,13 +87,8 @@ static int essiv_skcipher_setkey(struct crypto_skcipher *tfm,crypto_cipher_set_flags (tctx->essiv_cipher,crypto_skcipher_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - err =crypto_cipher_setkey (tctx->essiv_cipher, salt, -crypto_shash_digestsize (tctx->hash)); -crypto_skcipher_set_flags (tfm, -crypto_cipher_get_flags (tctx->essiv_cipher) & -CRYPTO_TFM_RES_MASK ); - -return err; +return crypto_cipher_setkey (tctx->essiv_cipher, salt, +crypto_shash_digestsize (tctx->hash)); } static int essiv_aead_setkey(struct crypto_aead *tfm, const u8 *key,
@@ -112,8 +104,6 @@ static int essiv_aead_setkey(struct crypto_aead *tfm, const u8 *key,crypto_aead_set_flags (tctx->u.aead,crypto_aead_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); err =crypto_aead_setkey (tctx->u.aead, key, keylen); -crypto_aead_set_flags (tfm,crypto_aead_get_flags (tctx->u.aead) & -CRYPTO_TFM_RES_MASK );if (err)return err;
@@ -130,12 +120,8 @@ static int essiv_aead_setkey(struct crypto_aead *tfm, const u8 *key,crypto_cipher_clear_flags (tctx->essiv_cipher,CRYPTO_TFM_REQ_MASK );crypto_cipher_set_flags (tctx->essiv_cipher,crypto_aead_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - err =crypto_cipher_setkey (tctx->essiv_cipher, salt, -crypto_shash_digestsize (tctx->hash)); -crypto_aead_set_flags (tfm,crypto_cipher_get_flags (tctx->essiv_cipher) & -CRYPTO_TFM_RES_MASK ); - -return err; +return crypto_cipher_setkey (tctx->essiv_cipher, salt, +crypto_shash_digestsize (tctx->hash)); } static int essiv_aead_setauthsize(struct crypto_aead *tfm,
crypto/gcm.c +2 -17
@@ -110,8 +110,6 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,crypto_skcipher_set_flags (ctr,crypto_aead_get_flags (aead) &CRYPTO_TFM_REQ_MASK ); err =crypto_skcipher_setkey (ctr, key, keylen); -crypto_aead_set_flags (aead,crypto_skcipher_get_flags (ctr) & -CRYPTO_TFM_RES_MASK );if (err)return err;
@@ -140,9 +138,6 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,crypto_ahash_set_flags (ghash,crypto_aead_get_flags (aead) &CRYPTO_TFM_REQ_MASK ); err =crypto_ahash_setkey (ghash, (u8 *)&data->hash,sizeof (be128)); -crypto_aead_set_flags (aead,crypto_ahash_get_flags (ghash) & -CRYPTO_TFM_RES_MASK ); - out:kzfree (data);return err;
@@ -705,7 +700,6 @@ static int crypto_rfc4106_setkey(struct crypto_aead *parent, const u8 *key, {struct crypto_rfc4106_ctx *ctx =crypto_aead_ctx (parent);struct crypto_aead *child = ctx->child; -int err;if (keylen <4 )return -EINVAL ;
@@ -716,11 +710,7 @@ static int crypto_rfc4106_setkey(struct crypto_aead *parent, const u8 *key,crypto_aead_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_aead_set_flags (child,crypto_aead_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); - err =crypto_aead_setkey (child, key, keylen); -crypto_aead_set_flags (parent,crypto_aead_get_flags (child) & -CRYPTO_TFM_RES_MASK ); - -return err; +return crypto_aead_setkey (child, key, keylen); } static int crypto_rfc4106_setauthsize(struct crypto_aead *parent,
@@ -936,7 +926,6 @@ static int crypto_rfc4543_setkey(struct crypto_aead *parent, const u8 *key, {struct crypto_rfc4543_ctx *ctx =crypto_aead_ctx (parent);struct crypto_aead *child = ctx->child; -int err;if (keylen <4 )return -EINVAL ;
@@ -947,11 +936,7 @@ static int crypto_rfc4543_setkey(struct crypto_aead *parent, const u8 *key,crypto_aead_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_aead_set_flags (child,crypto_aead_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); - err =crypto_aead_setkey (child, key, keylen); -crypto_aead_set_flags (parent,crypto_aead_get_flags (child) & -CRYPTO_TFM_RES_MASK ); - -return err; +return crypto_aead_setkey (child, key, keylen); } static int crypto_rfc4543_setauthsize(struct crypto_aead *parent,
crypto/lrw.c +0 -2
@@ -79,8 +79,6 @@ static int setkey(struct crypto_skcipher *parent, const u8 *key,crypto_skcipher_set_flags (child,crypto_skcipher_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); err =crypto_skcipher_setkey (child, key, keylen - bsize); -crypto_skcipher_set_flags (parent,crypto_skcipher_get_flags (child) & -CRYPTO_TFM_RES_MASK );if (err)return err;
crypto/simd.c +2 -10
@@ -52,15 +52,11 @@ static int simd_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key, {struct simd_skcipher_ctx *ctx =crypto_skcipher_ctx (tfm);struct crypto_skcipher *child = &ctx->cryptd_tfm->base; -int err;crypto_skcipher_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_skcipher_set_flags (child,crypto_skcipher_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - err =crypto_skcipher_setkey (child, key, key_len); -crypto_skcipher_set_flags (tfm,crypto_skcipher_get_flags (child) & -CRYPTO_TFM_RES_MASK ); -return err; +return crypto_skcipher_setkey (child, key, key_len); }static int simd_skcipher_encrypt (struct skcipher_request *req)
@@ -295,15 +291,11 @@ static int simd_aead_setkey(struct crypto_aead *tfm, const u8 *key, {struct simd_aead_ctx *ctx =crypto_aead_ctx (tfm);struct crypto_aead *child = &ctx->cryptd_tfm->base; -int err;crypto_aead_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_aead_set_flags (child,crypto_aead_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - err =crypto_aead_setkey (child, key, key_len); -crypto_aead_set_flags (tfm,crypto_aead_get_flags (child) & -CRYPTO_TFM_RES_MASK ); -return err; +return crypto_aead_setkey (child, key, key_len); }static int simd_aead_setauthsize (struct crypto_aead *tfm,unsigned int authsize)
crypto/skcipher.c +1 -5
@@ -880,15 +880,11 @@ static int skcipher_setkey_simple(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) {struct crypto_cipher *cipher =skcipher_cipher_simple (tfm); -int err;crypto_cipher_clear_flags (cipher,CRYPTO_TFM_REQ_MASK );crypto_cipher_set_flags (cipher,crypto_skcipher_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - err =crypto_cipher_setkey (cipher, key, keylen); -crypto_skcipher_set_flags (tfm,crypto_cipher_get_flags (cipher) & -CRYPTO_TFM_RES_MASK ); -return err; +return crypto_cipher_setkey (cipher, key, keylen); }static int skcipher_init_tfm_simple (struct crypto_skcipher *tfm)
crypto/xts.c +1 -7
@@ -61,8 +61,6 @@ static int setkey(struct crypto_skcipher *parent, const u8 *key,crypto_cipher_set_flags (tweak,crypto_skcipher_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); err =crypto_cipher_setkey (tweak, key + keylen, keylen); -crypto_skcipher_set_flags (parent,crypto_cipher_get_flags (tweak) & -CRYPTO_TFM_RES_MASK );if (err)return err;
@@ -71,11 +69,7 @@ static int setkey(struct crypto_skcipher *parent, const u8 *key,crypto_skcipher_clear_flags (child,CRYPTO_TFM_REQ_MASK );crypto_skcipher_set_flags (child,crypto_skcipher_get_flags (parent) &CRYPTO_TFM_REQ_MASK ); - err =crypto_skcipher_setkey (child, key, keylen); -crypto_skcipher_set_flags (parent,crypto_skcipher_get_flags (child) & -CRYPTO_TFM_RES_MASK ); - -return err; +return crypto_skcipher_setkey (child, key, keylen); }/*
drivers/crypto/amcc/crypto4xx_alg.c +2 -18
@@ -289,19 +289,11 @@ static int crypto4xx_sk_setup_fallback(struct crypto4xx_ctx *ctx,const u8 *key, unsigned int keylen) { - int rc; - crypto_sync_skcipher_clear_flags(ctx->sw_cipher.cipher,CRYPTO_TFM_REQ_MASK );crypto_sync_skcipher_set_flags (ctx->sw_cipher.cipher,crypto_skcipher_get_flags (cipher) &CRYPTO_TFM_REQ_MASK ); - rc =crypto_sync_skcipher_setkey (ctx->sw_cipher.cipher, key, keylen); -crypto_skcipher_clear_flags (cipher,CRYPTO_TFM_RES_MASK ); -crypto_skcipher_set_flags (cipher, -crypto_sync_skcipher_get_flags (ctx->sw_cipher.cipher) & -CRYPTO_TFM_RES_MASK ); - -return rc; +return crypto_sync_skcipher_setkey (ctx->sw_cipher.cipher, key, keylen); } int crypto4xx_setkey_aes_ctr(struct crypto_skcipher *cipher,
@@ -376,18 +368,10 @@ static int crypto4xx_aead_setup_fallback(struct crypto4xx_ctx *ctx,const u8 *key, unsigned int keylen) { - int rc; - crypto_aead_clear_flags(ctx->sw_cipher.aead, CRYPTO_TFM_REQ_MASK);crypto_aead_set_flags (ctx->sw_cipher.aead,crypto_aead_get_flags (cipher) &CRYPTO_TFM_REQ_MASK ); - rc =crypto_aead_setkey (ctx->sw_cipher.aead, key, keylen); -crypto_aead_clear_flags (cipher,CRYPTO_TFM_RES_MASK ); -crypto_aead_set_flags (cipher, -crypto_aead_get_flags (ctx->sw_cipher.aead) & -CRYPTO_TFM_RES_MASK ); - -return rc; +return crypto_aead_setkey (ctx->sw_cipher.aead, key, keylen); }/**
drivers/crypto/atmel-aes.c +1 -4
@@ -2041,7 +2041,6 @@ static int atmel_aes_authenc_setkey(struct crypto_aead *tfm, const u8 *key, {struct atmel_aes_authenc_ctx *ctx =crypto_aead_ctx (tfm);struct crypto_authenc_keys keys; -u32 flags;int err;if (crypto_authenc_extractkeys (&keys, key, keylen) !=0 )
@@ -2051,11 +2050,9 @@ static int atmel_aes_authenc_setkey(struct crypto_aead *tfm, const u8 *key, goto badkey;/* Save auth key. */ - flags =crypto_aead_get_flags (tfm); err =atmel_sha_authenc_setkey (ctx->auth, keys.authkey, keys.authkeylen, - &flags); -crypto_aead_set_flags (tfm, flags &CRYPTO_TFM_RES_MASK ); +crypto_aead_get_flags (tfm));if (err) {memzero_explicit (&keys,sizeof (keys));return err;
drivers/crypto/atmel-authenc.h +1 -2
@@ -30,8 +30,7 @@ unsigned int atmel_sha_authenc_get_reqsize(void);struct atmel_sha_authenc_ctx *atmel_sha_authenc_spawn (unsigned long mode);void atmel_sha_authenc_free (struct atmel_sha_authenc_ctx *auth);int atmel_sha_authenc_setkey (struct atmel_sha_authenc_ctx *auth, -const u8 *key,unsigned int keylen, -u32 *flags); +const u8 *key,unsigned int keylen,u32 flags); int atmel_sha_authenc_schedule(struct ahash_request *req, struct atmel_sha_authenc_ctx *auth,
drivers/crypto/atmel-sha.c +3 -8
@@ -2207,18 +2207,13 @@ void atmel_sha_authenc_free(struct atmel_sha_authenc_ctx *auth)EXPORT_SYMBOL_GPL (atmel_sha_authenc_free);int atmel_sha_authenc_setkey (struct atmel_sha_authenc_ctx *auth, -const u8 *key,unsigned int keylen, -u32 *flags) +const u8 *key,unsigned int keylen,u32 flags) {struct crypto_ahash *tfm = auth->tfm; -int err;crypto_ahash_clear_flags (tfm,CRYPTO_TFM_REQ_MASK ); -crypto_ahash_set_flags (tfm, *flags &CRYPTO_TFM_REQ_MASK ); - err =crypto_ahash_setkey (tfm, key, keylen); - *flags =crypto_ahash_get_flags (tfm); - -return err; +crypto_ahash_set_flags (tfm, flags &CRYPTO_TFM_REQ_MASK ); +return crypto_ahash_setkey (tfm, key, keylen); }EXPORT_SYMBOL_GPL (atmel_sha_authenc_setkey);
drivers/crypto/bcm/cipher.c +2 -12
@@ -2893,13 +2893,8 @@ static int aead_authenc_setkey(struct crypto_aead *cipher, ctx->fallback_cipher->base.crt_flags |= tfm->crt_flags &CRYPTO_TFM_REQ_MASK ; ret =crypto_aead_setkey (ctx->fallback_cipher, key, keylen); -if (ret) { +if (ret)flow_log (" fallback setkey() returned:%d\n" , ret); - tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK ; - tfm->crt_flags |= - (ctx->fallback_cipher->base.crt_flags & -CRYPTO_TFM_RES_MASK ); - } } ctx->spu_resp_hdr_len = spu->spu_response_hdr_len(ctx->authkeylen,
@@ -2965,13 +2960,8 @@ static int aead_gcm_ccm_setkey(struct crypto_aead *cipher, tfm->crt_flags &CRYPTO_TFM_REQ_MASK ; ret =crypto_aead_setkey (ctx->fallback_cipher, key, keylen + ctx->salt_len); -if (ret) { +if (ret)flow_log (" fallback setkey() returned:%d\n" , ret); - tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK ; - tfm->crt_flags |= - (ctx->fallback_cipher->base.crt_flags & -CRYPTO_TFM_RES_MASK ); - } } ctx->spu_resp_hdr_len = spu->spu_response_hdr_len(ctx->authkeylen,
drivers/crypto/chelsio/chcr_algo.c +1 -23
@@ -870,20 +870,13 @@ static int chcr_cipher_fallback_setkey(struct crypto_skcipher *cipher,const u8 *key, unsigned int keylen) { -struct crypto_tfm *tfm =crypto_skcipher_tfm (cipher); struct ablk_ctx *ablkctx = ABLK_CTX(c_ctx(cipher)); -int err =0 ;crypto_sync_skcipher_clear_flags (ablkctx->sw_cipher,CRYPTO_TFM_REQ_MASK );crypto_sync_skcipher_set_flags (ablkctx->sw_cipher, cipher->base.crt_flags &CRYPTO_TFM_REQ_MASK ); - err =crypto_sync_skcipher_setkey (ablkctx->sw_cipher, key, keylen); - tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK ; - tfm->crt_flags |= -crypto_sync_skcipher_get_flags (ablkctx->sw_cipher) & -CRYPTO_TFM_RES_MASK ; -return err; +return crypto_sync_skcipher_setkey (ablkctx->sw_cipher, key, keylen); } static int chcr_aes_cbc_setkey(struct crypto_skcipher *cipher,
@@ -3302,9 +3295,6 @@ static int chcr_aead_ccm_setkey(struct crypto_aead *aead,crypto_aead_set_flags (aeadctx->sw_cipher,crypto_aead_get_flags (aead) &CRYPTO_TFM_REQ_MASK ); error =crypto_aead_setkey (aeadctx->sw_cipher, key, keylen); -crypto_aead_clear_flags (aead,CRYPTO_TFM_RES_MASK ); -crypto_aead_set_flags (aead,crypto_aead_get_flags (aeadctx->sw_cipher) & -CRYPTO_TFM_RES_MASK );if (error)return error;return chcr_ccm_common_setkey (aead, key, keylen);
@@ -3324,9 +3314,6 @@ static int chcr_aead_rfc4309_setkey(struct crypto_aead *aead, const u8 *key,crypto_aead_set_flags (aeadctx->sw_cipher,crypto_aead_get_flags (aead) &CRYPTO_TFM_REQ_MASK ); error =crypto_aead_setkey (aeadctx->sw_cipher, key, keylen); -crypto_aead_clear_flags (aead,CRYPTO_TFM_RES_MASK ); -crypto_aead_set_flags (aead,crypto_aead_get_flags (aeadctx->sw_cipher) & -CRYPTO_TFM_RES_MASK );if (error)return error; keylen -=3 ;
@@ -3348,9 +3335,6 @@ static int chcr_gcm_setkey(struct crypto_aead *aead, const u8 *key,crypto_aead_set_flags (aeadctx->sw_cipher,crypto_aead_get_flags (aead) &CRYPTO_TFM_REQ_MASK ); ret =crypto_aead_setkey (aeadctx->sw_cipher, key, keylen); -crypto_aead_clear_flags (aead,CRYPTO_TFM_RES_MASK ); -crypto_aead_set_flags (aead,crypto_aead_get_flags (aeadctx->sw_cipher) & -CRYPTO_TFM_RES_MASK );if (ret) goto out;
@@ -3416,9 +3400,6 @@ static int chcr_authenc_setkey(struct crypto_aead *authenc, const u8 *key,crypto_aead_set_flags (aeadctx->sw_cipher,crypto_aead_get_flags (authenc) &CRYPTO_TFM_REQ_MASK ); err =crypto_aead_setkey (aeadctx->sw_cipher, key, keylen); -crypto_aead_clear_flags (authenc,CRYPTO_TFM_RES_MASK ); -crypto_aead_set_flags (authenc,crypto_aead_get_flags (aeadctx->sw_cipher) - &CRYPTO_TFM_RES_MASK );if (err) goto out;
@@ -3544,9 +3525,6 @@ static int chcr_aead_digest_null_setkey(struct crypto_aead *authenc,crypto_aead_set_flags (aeadctx->sw_cipher,crypto_aead_get_flags (authenc) &CRYPTO_TFM_REQ_MASK ); err =crypto_aead_setkey (aeadctx->sw_cipher, key, keylen); -crypto_aead_clear_flags (authenc,CRYPTO_TFM_RES_MASK ); -crypto_aead_set_flags (authenc,crypto_aead_get_flags (aeadctx->sw_cipher) - &CRYPTO_TFM_RES_MASK );if (err) goto out;
drivers/crypto/geode-aes.c +2 -14
@@ -110,7 +110,6 @@ static int geode_setkey_cip(struct crypto_tfm *tfm, const u8 *key, unsigned int len) {struct geode_aes_tfm_ctx *tctx =crypto_tfm_ctx (tfm); -unsigned int ret; tctx->keylen = len;
@@ -130,20 +129,13 @@ static int geode_setkey_cip(struct crypto_tfm *tfm, const u8 *key, tctx->fallback.cip->base.crt_flags |= (tfm->crt_flags &CRYPTO_TFM_REQ_MASK ); - ret =crypto_cipher_setkey (tctx->fallback.cip, key, len); -if (ret) { - tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK ; - tfm->crt_flags |= (tctx->fallback.cip->base.crt_flags & -CRYPTO_TFM_RES_MASK ); - } -return ret; +return crypto_cipher_setkey (tctx->fallback.cip, key, len); }static int geode_setkey_skcipher (struct crypto_skcipher *tfm,const u8 *key,unsigned int len) {struct geode_aes_tfm_ctx *tctx =crypto_skcipher_ctx (tfm); -unsigned int ret; tctx->keylen = len;
@@ -164,11 +156,7 @@ static int geode_setkey_skcipher(struct crypto_skcipher *tfm, const u8 *key,crypto_skcipher_set_flags (tctx->fallback.skcipher,crypto_skcipher_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); - ret =crypto_skcipher_setkey (tctx->fallback.skcipher, key, len); -crypto_skcipher_set_flags (tfm, -crypto_skcipher_get_flags (tctx->fallback.skcipher) & -CRYPTO_TFM_RES_MASK ); -return ret; +return crypto_skcipher_setkey (tctx->fallback.skcipher, key, len); } static void
drivers/crypto/inside-secure/safexcel_cipher.c +0 -5
@@ -499,9 +499,6 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8 *key, goto badkey; } -crypto_aead_set_flags (ctfm,crypto_aead_get_flags (ctfm) & -CRYPTO_TFM_RES_MASK ); -if (priv->flags &EIP197_TRC_CACHE && ctx->base.ctxr_dma && (memcmp (ctx->ipad, istate.state, ctx->state_sz) ||memcmp (ctx->opad, ostate.state, ctx->state_sz)))
@@ -2583,8 +2580,6 @@ static int safexcel_aead_gcm_setkey(struct crypto_aead *ctfm, const u8 *key,crypto_cipher_set_flags (ctx->hkaes,crypto_aead_get_flags (ctfm) &CRYPTO_TFM_REQ_MASK ); ret =crypto_cipher_setkey (ctx->hkaes, key, len); -crypto_aead_set_flags (ctfm,crypto_cipher_get_flags (ctx->hkaes) & -CRYPTO_TFM_RES_MASK );if (ret)return ret;
drivers/crypto/inside-secure/safexcel_hash.c +0 -6
@@ -2069,8 +2069,6 @@ static int safexcel_xcbcmac_setkey(struct crypto_ahash *tfm, const u8 *key,crypto_cipher_set_flags (ctx->kaes,crypto_ahash_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); ret =crypto_cipher_setkey (ctx->kaes, key, len); -crypto_ahash_set_flags (tfm,crypto_cipher_get_flags (ctx->kaes) & -CRYPTO_TFM_RES_MASK );if (ret)return ret;
@@ -2090,8 +2088,6 @@ static int safexcel_xcbcmac_setkey(struct crypto_ahash *tfm, const u8 *key, ret =crypto_cipher_setkey (ctx->kaes, (u8 *)key_tmp +2 *AES_BLOCK_SIZE ,AES_MIN_KEY_SIZE ); -crypto_ahash_set_flags (tfm,crypto_cipher_get_flags (ctx->kaes) & -CRYPTO_TFM_RES_MASK );if (ret)return ret;
@@ -2174,8 +2170,6 @@ static int safexcel_cmac_setkey(struct crypto_ahash *tfm, const u8 *key,crypto_cipher_set_flags (ctx->kaes,crypto_ahash_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); ret =crypto_cipher_setkey (ctx->kaes, key, len); -crypto_ahash_set_flags (tfm,crypto_cipher_get_flags (ctx->kaes) & -CRYPTO_TFM_RES_MASK );if (ret)return ret;
drivers/crypto/mediatek/mtk-aes.c +0 -2
@@ -1031,8 +1031,6 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,crypto_skcipher_set_flags (ctr,crypto_aead_get_flags (aead) &CRYPTO_TFM_REQ_MASK ); err =crypto_skcipher_setkey (ctr, key, keylen); -crypto_aead_set_flags (aead,crypto_skcipher_get_flags (ctr) & -CRYPTO_TFM_RES_MASK );if (err)return err;
drivers/crypto/mxs-dcp.c +1 -11
@@ -492,7 +492,6 @@ static int mxs_dcp_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int len) {struct dcp_async_ctx *actx =crypto_skcipher_ctx (tfm); -unsigned int ret;/* * AES 128 is supposed by the hardware, store key into temporary
@@ -513,16 +512,7 @@ static int mxs_dcp_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,crypto_sync_skcipher_clear_flags (actx->fallback,CRYPTO_TFM_REQ_MASK );crypto_sync_skcipher_set_flags (actx->fallback, tfm->base.crt_flags &CRYPTO_TFM_REQ_MASK ); - - ret =crypto_sync_skcipher_setkey (actx->fallback, key, len); -if (!ret) -return 0 ; - - tfm->base.crt_flags &= ~CRYPTO_TFM_RES_MASK ; - tfm->base.crt_flags |=crypto_sync_skcipher_get_flags (actx->fallback) & -CRYPTO_TFM_RES_MASK ; - -return ret; +return crypto_sync_skcipher_setkey (actx->fallback, key, len); }static int mxs_dcp_aes_fallback_init_tfm (struct crypto_skcipher *tfm)
drivers/crypto/picoxcell_crypto.c +0 -9
@@ -465,9 +465,6 @@ static int spacc_aead_setkey(struct crypto_aead *tfm, const u8 *key,crypto_aead_set_flags (ctx->sw_cipher,crypto_aead_get_flags (tfm) &CRYPTO_TFM_REQ_MASK ); err =crypto_aead_setkey (ctx->sw_cipher, key, keylen); -crypto_aead_clear_flags (tfm,CRYPTO_TFM_RES_MASK ); -crypto_aead_set_flags (tfm,crypto_aead_get_flags (ctx->sw_cipher) & -CRYPTO_TFM_RES_MASK );if (err)return err;
@@ -802,12 +799,6 @@ static int spacc_aes_setkey(struct crypto_skcipher *cipher, const u8 *key, CRYPTO_TFM_REQ_MASK); err =crypto_sync_skcipher_setkey (ctx->sw_cipher, key, len); - - tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK ; - tfm->crt_flags |= -crypto_sync_skcipher_get_flags (ctx->sw_cipher) & -CRYPTO_TFM_RES_MASK ; -if (err) goto sw_setkey_failed; }
drivers/crypto/sahara.c +1 -8
@@ -601,7 +601,6 @@ static int sahara_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) {struct sahara_ctx *ctx =crypto_skcipher_ctx (tfm); -int ret; ctx->keylen = keylen;
@@ -621,13 +620,7 @@ static int sahara_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,crypto_sync_skcipher_clear_flags (ctx->fallback,CRYPTO_TFM_REQ_MASK );crypto_sync_skcipher_set_flags (ctx->fallback, tfm->base.crt_flags &CRYPTO_TFM_REQ_MASK ); - - ret =crypto_sync_skcipher_setkey (ctx->fallback, key, keylen); - - tfm->base.crt_flags &= ~CRYPTO_TFM_RES_MASK ; - tfm->base.crt_flags |=crypto_sync_skcipher_get_flags (ctx->fallback) & -CRYPTO_TFM_RES_MASK ; -return ret; +return crypto_sync_skcipher_setkey (ctx->fallback, key, keylen); }static int sahara_aes_crypt (struct skcipher_request *req,unsigned long mode)
include/linux/crypto.h +0 -2
@@ -107,8 +107,6 @@#define CRYPTO_TFM_NEED_KEY 0x00000001#define CRYPTO_TFM_REQ_MASK 0x000fff00 -#define CRYPTO_TFM_RES_MASK 0xfff00000 -#define CRYPTO_TFM_REQ_FORBID_WEAK_KEYS 0x00000100#define CRYPTO_TFM_REQ_MAY_SLEEP 0x00000200#define CRYPTO_TFM_REQ_MAY_BACKLOG 0x00000400
Signature · 1 line
2.24.1
Quoted 30 lines · Eric Biggers
The CRYPTO_TFM_RES_* flags are pointless since they are never checked anywhere. And it's not really possible for anyone to start using them without a lot of work, since many drivers aren't setting them or are setting them when they shouldn't.
Also, if we ever actually need to start distinguishing ->setkey() errors better (which is somewhat unlikely, as it's been a long time with no one caring), we'd probably be much better off just using different return values, like
-EINVALif the key is invalid for the algorithm vs.-EKEYREJECTEDif the key was rejected by a policy like "no weak keys". That would be much simpler, less error-prone, and easier to test.So let's just remove these flags for now. This gets rid of a lot of pointless boilerplate code.
Patches 6 and 8 are a bit large since they touch so many drivers, though the changes are straightforward and it would seem overkill to do this as a series of 70 separate patches. But let me know if it's needed.
Eric Biggers (8):
crypto: chelsio - fix writing tfm flags to wrong place
crypto: artpec6 - return correct error code for failedsetkey()
crypto: atmel-sha - fix error handling when setting hmac key
crypto: remove unused tfm result flags
crypto: removeCRYPTO_TFM_RES_BAD_BLOCK_LEN
crypto: removeCRYPTO_TFM_RES_BAD_KEY_LEN
crypto: removeCRYPTO_TFM_RES_WEAK_KEY
crypto: remove propagation of CRYPTO_TFM_RES_* flags
...
Quoted 2 lines
108 files changed, 218 insertions(+), 917 deletions(-)
For the series:
Herbert Xu
maintainerQuoted 130 lines · Eric Biggers
The CRYPTO_TFM_RES_* flags are pointless since they are never checked anywhere. And it's not really possible for anyone to start using them without a lot of work, since many drivers aren't setting them or are setting them when they shouldn't.
Also, if we ever actually need to start distinguishing ->setkey() errors better (which is somewhat unlikely, as it's been a long time with no one caring), we'd probably be much better off just using different return values, like
-EINVALif the key is invalid for the algorithm vs.-EKEYREJECTEDif the key was rejected by a policy like "no weak keys". That would be much simpler, less error-prone, and easier to test.So let's just remove these flags for now. This gets rid of a lot of pointless boilerplate code.
Patches 6 and 8 are a bit large since they touch so many drivers, though the changes are straightforward and it would seem overkill to do this as a series of 70 separate patches. But let me know if it's needed.
Eric Biggers (8):
crypto: chelsio - fix writing tfm flags to wrong place
crypto: artpec6 - return correct error code for failedsetkey()
crypto: atmel-sha - fix error handling when setting hmac key
crypto: remove unused tfm result flags
crypto: removeCRYPTO_TFM_RES_BAD_BLOCK_LEN
crypto: removeCRYPTO_TFM_RES_BAD_KEY_LEN
crypto: removeCRYPTO_TFM_RES_WEAK_KEY
crypto: remove propagation of CRYPTO_TFM_RES_* flagsarch/arm/crypto/aes-ce-glue.c | 14 +----- arch/arm/crypto/crc32-ce-glue.c | 4 +- arch/arm/crypto/ghash-ce-glue.c | 11 +--- arch/arm64/crypto/aes-ce-ccm-glue.c | 8 +-- arch/arm64/crypto/aes-ce-glue.c | 8 +-- arch/arm64/crypto/aes-glue.c | 31 ++---------- arch/arm64/crypto/ghash-ce-glue.c | 8 +-- arch/mips/crypto/crc32-mips.c | 4 +- arch/powerpc/crypto/aes-spe-glue.c | 18 ++----- arch/powerpc/crypto/crc32c-vpmsum_glue.c | 4 +- arch/s390/crypto/aes_s390.c | 27 ++-------- arch/s390/crypto/crc32-vx.c | 8 +-- arch/s390/crypto/ghash_s390.c | 4 +- arch/s390/crypto/paes_s390.c | 25 +++------- arch/sparc/crypto/aes_glue.c | 2 - arch/sparc/crypto/camellia_glue.c | 5 +- arch/sparc/crypto/crc32c_glue.c | 4 +- arch/x86/crypto/aegis128-aesni-glue.c | 4 +- arch/x86/crypto/aesni-intel_glue.c | 10 ++-- arch/x86/crypto/blake2s-glue.c | 4 +- arch/x86/crypto/camellia_aesni_avx2_glue.c | 3 +- arch/x86/crypto/camellia_aesni_avx_glue.c | 9 ++-- arch/x86/crypto/camellia_glue.c | 9 ++-- arch/x86/crypto/cast6_avx_glue.c | 6 +-- arch/x86/crypto/crc32-pclmul_glue.c | 4 +- arch/x86/crypto/crc32c-intel_glue.c | 4 +- arch/x86/crypto/ghash-clmulni-intel_glue.c | 11 +--- arch/x86/crypto/twofish_avx_glue.c | 6 +-- arch/x86/include/asm/crypto/camellia.h | 2 +- crypto/adiantum.c | 8 --- crypto/aegis128-core.c | 4 +- crypto/aes_generic.c | 18 +++---- crypto/anubis.c | 2 - crypto/authenc.c | 12 +---- crypto/authencesn.c | 12 +---- crypto/blake2b_generic.c | 4 +- crypto/blake2s_generic.c | 4 +- crypto/camellia_generic.c | 5 +- crypto/cast6_generic.c | 10 ++-- crypto/ccm.c | 20 ++------ crypto/chacha20poly1305.c | 7 +-- crypto/cipher.c | 5 +- crypto/crc32_generic.c | 4 +- crypto/crc32c_generic.c | 4 +- crypto/cryptd.c | 13 +---- crypto/ctr.c | 7 +-- crypto/cts.c | 6 +-- crypto/des_generic.c | 10 +--- crypto/essiv.c | 26 ++-------- crypto/gcm.c | 19 +------ crypto/ghash-generic.c | 4 +- crypto/lrw.c | 2 - crypto/michael_mic.c | 4 +- crypto/simd.c | 12 +---- crypto/skcipher.c | 10 +--- crypto/sm4_generic.c | 16 ++---- crypto/twofish_common.c | 8 +-- crypto/vmac.c | 4 +- crypto/xts.c | 8 +-- crypto/xxhash_generic.c | 4 +- .../allwinner/sun4i-ss/sun4i-ss-cipher.c | 1 - .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 1 - .../allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 - drivers/crypto/amcc/crypto4xx_alg.c | 31 ++---------- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 1 - drivers/crypto/atmel-aes.c | 14 ++---- drivers/crypto/atmel-authenc.h | 3 +- drivers/crypto/atmel-sha.c | 18 ++----- drivers/crypto/axis/artpec6_crypto.c | 10 +--- drivers/crypto/bcm/cipher.c | 17 +------ drivers/crypto/caam/caamalg.c | 33 +++--------- drivers/crypto/caam/caamalg_qi.c | 44 ++++------------ drivers/crypto/caam/caamalg_qi2.c | 47 ++++------------- drivers/crypto/caam/caamhash.c | 9 +--- drivers/crypto/cavium/cpt/cptvf_algs.c | 2 - drivers/crypto/cavium/nitrox/nitrox_aead.c | 4 +- .../crypto/cavium/nitrox/nitrox_skcipher.c | 12 ++--- drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 1 - drivers/crypto/ccp/ccp-crypto-aes-galois.c | 1 - drivers/crypto/ccp/ccp-crypto-aes.c | 1 - drivers/crypto/ccp/ccp-crypto-sha.c | 4 +- drivers/crypto/ccree/cc_aead.c | 21 +++----- drivers/crypto/ccree/cc_cipher.c | 4 -- drivers/crypto/ccree/cc_hash.c | 6 --- drivers/crypto/chelsio/chcr_algo.c | 50 ++----------------- drivers/crypto/geode-aes.c | 24 ++------- .../crypto/inside-secure/safexcel_cipher.c | 43 ++++------------ drivers/crypto/inside-secure/safexcel_hash.c | 22 ++------ drivers/crypto/ixp4xx_crypto.c | 31 ++---------- drivers/crypto/marvell/cipher.c | 4 +- drivers/crypto/mediatek/mtk-aes.c | 4 -- drivers/crypto/mxs-dcp.c | 12 +---- drivers/crypto/n2_core.c | 1 - drivers/crypto/padlock-aes.c | 9 +--- drivers/crypto/picoxcell_crypto.c | 15 +----- drivers/crypto/qat/qat_common/qat_algs.c | 6 +-- drivers/crypto/qce/sha.c | 2 - .../crypto/rockchip/rk3288_crypto_skcipher.c | 4 +- drivers/crypto/sahara.c | 9 +--- drivers/crypto/stm32/stm32-crc32.c | 4 +- drivers/crypto/talitos.c | 15 ++----
Quoted 8 lines
drivers/crypto/ux500/cryp/cryp_core.c | 2 - drivers/crypto/virtio/virtio_crypto_algs.c | 8 +-- include/crypto/cast6.h | 3 +- include/crypto/internal/des.h | 23 ++------- include/crypto/twofish.h | 2 +- include/crypto/xts.h | 19 ++----- include/linux/crypto.h | 7 --- 108 files changed, 218 insertions(+), 917 deletions(-)
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt