diff options
| author | Herbert Xu | 2019-04-11 10:51:10 +0200 |
|---|---|---|
| committer | Herbert Xu | 2019-04-18 16:15:00 +0200 |
| commit | 67ac62bf3d79e4346ab7480dccc333cb2721f901 (patch) | |
| tree | e15cf295d484e783329058737e0f50b42aa742df /drivers/crypto/inside-secure | |
| parent | crypto: hisilicon - Forbid 2-key 3DES in FIPS mode (diff) | |
| download | kernel-qcow2-linux-67ac62bf3d79e4346ab7480dccc333cb2721f901.tar.gz kernel-qcow2-linux-67ac62bf3d79e4346ab7480dccc333cb2721f901.tar.xz kernel-qcow2-linux-67ac62bf3d79e4346ab7480dccc333cb2721f901.zip | |
crypto: inside-secure - Forbid 2-key 3DES in FIPS mode
This patch forbids the use of 2-key 3DES (K1 == K3) in FIPS mode.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/inside-secure')
| -rw-r--r-- | drivers/crypto/inside-secure/safexcel_cipher.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c index 7ef30a98cb24..de4be10b172f 100644 --- a/drivers/crypto/inside-secure/safexcel_cipher.c +++ b/drivers/crypto/inside-secure/safexcel_cipher.c @@ -1039,13 +1039,12 @@ static int safexcel_cbc_des3_ede_decrypt(struct skcipher_request *req) static int safexcel_des3_ede_setkey(struct crypto_skcipher *ctfm, const u8 *key, unsigned int len) { - struct crypto_tfm *tfm = crypto_skcipher_tfm(ctfm); - struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm); + struct safexcel_cipher_ctx *ctx = crypto_skcipher_ctx(ctfm); + int err; - if (len != DES3_EDE_KEY_SIZE) { - crypto_skcipher_set_flags(ctfm, CRYPTO_TFM_RES_BAD_KEY_LEN); - return -EINVAL; - } + err = des3_verify_key(ctfm, key); + if (unlikely(err)) + return err; /* if context exits and key changed, need to invalidate it */ if (ctx->base.ctxr_dma) { |