crypto: bcm - 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>

diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c
index 28f592f7e1b7aaab0087fc460c10bce7de28573d..8862200d4a0bf15f8f49fd782393b23cf9135351 100644 (file)
--- a/drivers/crypto/bcm/cipher.c
+++ b/drivers/crypto/bcm/cipher.c
@@ -1840,13 +1840,14 @@ static int threedes_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
        struct iproc_ctx_s *ctx = crypto_ablkcipher_ctx(cipher);
 
        if (keylen == (DES_KEY_SIZE * 3)) {
-               const u32 *K = (const u32 *)key;
-               u32 flags = CRYPTO_TFM_RES_BAD_KEY_SCHED;
+               u32 flags;
+               int ret;
 
-               if (!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
-                   !((K[2] ^ K[4]) | (K[3] ^ K[5]))) {
+               flags = crypto_ablkcipher_get_flags(cipher);
+               ret = __des3_verify_key(&flags, key);
+               if (unlikely(ret)) {
                        crypto_ablkcipher_set_flags(cipher, flags);
-                       return -EINVAL;
+                       return ret;
                }
 
                ctx->cipher_type = CIPHER_TYPE_3DES;
@@ -2885,13 +2886,13 @@ static int aead_authenc_setkey(struct crypto_aead *cipher,
                break;
        case CIPHER_ALG_3DES:
                if (ctx->enckeylen == (DES_KEY_SIZE * 3)) {
-                       const u32 *K = (const u32 *)keys.enckey;
-                       u32 flags = CRYPTO_TFM_RES_BAD_KEY_SCHED;
+                       u32 flags;
 
-                       if (!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
-                           !((K[2] ^ K[4]) | (K[3] ^ K[5]))) {
+                       flags = crypto_aead_get_flags(cipher);
+                       ret = __des3_verify_key(&flags, keys.enckey);
+                       if (unlikely(ret)) {
                                crypto_aead_set_flags(cipher, flags);
-                               return -EINVAL;
+                               return ret;
                        }
 
                        ctx->cipher_type = CIPHER_TYPE_3DES;