X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=crypto%2Fdes_generic.c;h=5bd3ee345a64d8e60604a32097818a3a3d369a46;hb=8eb2dfac41c71701bb741f496f0cb7b7e4a3c3f6;hp=5d0e4580f998c23650eb24ba73135cd5af68a01e;hpb=3af5b90bde5000abc739996cb03fd718e753d053;p=safe%2Fjmp%2Flinux-2.6

diff --git a/crypto/des_generic.c b/crypto/des_generic.c
index 5d0e458..5bd3ee3 100644
--- a/crypto/des_generic.c
+++ b/crypto/des_generic.c
@@ -868,9 +868,10 @@ static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key,
 	u32 *flags = &tfm->crt_flags;
 
 	if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
-		     !((K[2] ^ K[4]) | (K[3] ^ K[5]))))
+		     !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &&
+		     (*flags & CRYPTO_TFM_REQ_WEAK_KEY))
 	{
-		*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;
+		*flags |= CRYPTO_TFM_RES_WEAK_KEY;
 		return -EINVAL;
 	}