---

yaml --- r: 181029 b: refs/heads/master c: a501121 h: refs/heads/master i: 181027: e4c0832 v: v3
git-mirror · Feb 16, 2010 · c3c1366 · c3c1366
1 parent a46a9c6
commit c3c1366
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9472d763b3087f2899379a77b39499fcd37d6d2b
+refs/heads/master: a501121e30c4b41dbdae47302c1ebebc7821511a
diff --git a/trunk/crypto/des_generic.c b/trunk/crypto/des_generic.c
@@ -869,8 +869,7 @@ static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key,
 
 	if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
 		     !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &&
-		     (*flags & CRYPTO_TFM_REQ_WEAK_KEY))
-	{
+		     (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
 		*flags |= CRYPTO_TFM_RES_WEAK_KEY;
 		return -EINVAL;
 	}