Commit 19291691 authored by Herbert Xu's avatar Herbert Xu

crypto: nitrox - Forbid 2-key 3DES in FIPS mode

This patch forbids the use of 2-key 3DES (K1 == K3) in FIPS mode.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3b2de724
...@@ -257,12 +257,8 @@ static int nitrox_aes_decrypt(struct skcipher_request *skreq) ...@@ -257,12 +257,8 @@ static int nitrox_aes_decrypt(struct skcipher_request *skreq)
static int nitrox_3des_setkey(struct crypto_skcipher *cipher, static int nitrox_3des_setkey(struct crypto_skcipher *cipher,
const u8 *key, unsigned int keylen) const u8 *key, unsigned int keylen)
{ {
if (keylen != DES3_EDE_KEY_SIZE) { return unlikely(des3_verify_key(cipher, key)) ?:
crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN); nitrox_skcipher_setkey(cipher, 0, key, keylen);
return -EINVAL;
}
return nitrox_skcipher_setkey(cipher, 0, key, keylen);
} }
static int nitrox_3des_encrypt(struct skcipher_request *skreq) static int nitrox_3des_encrypt(struct skcipher_request *skreq)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment