From b2593839da1e0c5af5fedf3fce3fd43c400199b4 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 11 Oct 2015 00:06:56 +0100 Subject: [PATCH] Typo. PR#4079 Reviewed-by: Tim Hudson (cherry picked from commit c69ce9351336f5b4a8b33890756b3fd185528210) Conflicts: crypto/evp/e_des3.c --- crypto/evp/e_des3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.25.1