summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-10-11 00:06:56 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-10-11 00:45:18 +0100
commitb2593839da1e0c5af5fedf3fce3fd43c400199b4 (patch)
treea26cbd4b5b20451aa0cb9d0ff4da1417f79bedda /crypto
parentbfc19297cddd5bc2192c02c7f8896d804b0456cb (diff)
Typo.
PR#4079 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit c69ce9351336f5b4a8b33890756b3fd185528210) Conflicts: crypto/evp/e_des3.c
Diffstat (limited to 'crypto')
-rw-r--r--crypto/evp/e_des3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index 07a5aca606..1272305799 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -241,7 +241,7 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
DES_cblock *deskey = (DES_cblock *)key;
# ifdef EVP_CHECK_DES_KEY
if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1)
- ! !DES_set_key_checked(&deskey[1], &data(ctx)->ks2))
+ || DES_set_key_checked(&deskey[1], &data(ctx)->ks2))
return 0;
# else
DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);