Typo.
authorDr. Stephen Henson <steve@openssl.org>
Sat, 10 Oct 2015 23:06:56 +0000 (00:06 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 10 Oct 2015 23:45:18 +0000 (00:45 +0100)
PR#4079

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

Conflicts:
crypto/evp/e_des3.c

crypto/evp/e_des3.c

index 07a5aca..1272305 100644 (file)
@@ -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);