[openssl-commits] [openssl] OpenSSL_0_9_8-stable update

[Dr. Stephen Henson]

The branch OpenSSL_0_9_8-stable has been updated
       via  31172717e8324fbb01e1b3e65db6f5d48d7e352e (commit)
      from  cc21b51add2415cc63113b71b34bc1c7b588e67d (commit)


- Log -----------------------------------------------------------------
commit 31172717e8324fbb01e1b3e65db6f5d48d7e352e
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 b80348b..63b60b4 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -196,7 +196,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);