From c4887ee8962b72b9f12a2af7bee612cd6d570c7b Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Wed, 17 Dec 2008 16:51:13 +1100 Subject: [PATCH] --- yaml --- r: 120636 b: refs/heads/master c: ad79cdd77fc1466e45cf923890f66bcfe7c43f12 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/crypto/des_generic.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b20d16413fed..cb461d65a69a 100644 --- 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 index 5d0e4580f998..5bd3ee345a64 100644 --- 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; }