[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_1-stable has been updated
       via  b2593839da1e0c5af5fedf3fce3fd43c400199b4 (commit)
      from  bfc19297cddd5bc2192c02c7f8896d804b0456cb (commit)


- Log -----------------------------------------------------------------
commit b2593839da1e0c5af5fedf3fce3fd43c400199b4
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Oct 11 00:06:56 2015 +0100

    Typo.
    
    PR#4079
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit c69ce9351336f5b4a8b33890756b3fd185528210)
    
    Conflicts:
    	crypto/evp/e_des3.c

-----------------------------------------------------------------------

Summary of changes:
 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 07a5aca..1272305 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);