---

yaml --- r: 120636 b: refs/heads/master c: ad79cdd h: refs/heads/master v: v3
git-mirror · Dec 25, 2008 · c4887ee · c4887ee
1 parent e465c57
commit c4887ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd9d20dba182ce4541b16b083eccd30fb252b9f4
+refs/heads/master: ad79cdd77fc1466e45cf923890f66bcfe7c43f12
diff --git a/trunk/crypto/des_generic.c b/trunk/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;
 	}