From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 10 Oct 2015 23:06:56 +0000 (+0100)
Subject: Typo.
X-Git-Tag: OpenSSL_1_0_1q~37
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b2593839da1e0c5af5fedf3fce3fd43c400199b4;p=oweals%2Fopenssl.git

Typo.

PR#4079

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit c69ce9351336f5b4a8b33890756b3fd185528210)

Conflicts:
	crypto/evp/e_des3.c
---

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);