crypto: sparc - 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/arch/sparc/crypto/des_glue.c b/arch/sparc/crypto/des_glue.c
index 4884315..453a4cf 100644 (file)
--- a/arch/sparc/crypto/des_glue.c
+++ b/arch/sparc/crypto/des_glue.c
@@ -201,18 +201,15 @@ static int des3_ede_set_key(struct crypto_tfm *tfm, const u8 *key,
                            unsigned int keylen)
 {
        struct des3_ede_sparc64_ctx *dctx = crypto_tfm_ctx(tfm);
-       const u32 *K = (const u32 *)key;
        u32 *flags = &tfm->crt_flags;
        u64 k1[DES_EXPKEY_WORDS / 2];
        u64 k2[DES_EXPKEY_WORDS / 2];
        u64 k3[DES_EXPKEY_WORDS / 2];
+       int err;
 
-       if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
-                    !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &&
-                    (*flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
-               *flags |= CRYPTO_TFM_RES_WEAK_KEY;
-               return -EINVAL;
-       }
+       err = __des3_verify_key(flags, key);
+       if (unlikely(err))
+               return err;
 
        des_sparc64_key_expand((const u32 *)key, k1);
        key += DES_KEY_SIZE;