From c3c1366863b67cbc1253cd4fe371edc911e33353 Mon Sep 17 00:00:00 2001 From: Richard Hartmann Date: Tue, 16 Feb 2010 20:32:31 +0800 Subject: [PATCH] --- yaml --- r: 181029 b: refs/heads/master c: a501121e30c4b41dbdae47302c1ebebc7821511a h: refs/heads/master i: 181027: e4c08328e753f1b7ea92c48b4620c40881e130e0 v: v3 --- [refs] | 2 +- trunk/crypto/des_generic.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7844b7e7beea..fbe41b27cf6c 100644 --- 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 index 5bd3ee345a64..249f903cc453 100644 --- 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; }