aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Hartmann <richih.mailinglist@gmail.com>2010-02-16 07:32:31 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2010-02-16 07:32:31 -0500
commita501121e30c4b41dbdae47302c1ebebc7821511a (patch)
tree6db5fdf639a226c8bf08ccca1641c09db838b35f
parent9472d763b3087f2899379a77b39499fcd37d6d2b (diff)
crypto: des_generic - Fix checkpatch errors
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/des_generic.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/des_generic.c b/crypto/des_generic.c
index 5bd3ee345a64..249f903cc453 100644
--- a/crypto/des_generic.c
+++ b/crypto/des_generic.c
@@ -869,8 +869,7 @@ static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key,
869 869
870 if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) || 870 if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
871 !((K[2] ^ K[4]) | (K[3] ^ K[5]))) && 871 !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &&
872 (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) 872 (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
873 {
874 *flags |= CRYPTO_TFM_RES_WEAK_KEY; 873 *flags |= CRYPTO_TFM_RES_WEAK_KEY;
875 return -EINVAL; 874 return -EINVAL;
876 } 875 }