[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  c69ce9351336f5b4a8b33890756b3fd185528210 (commit)
      from  310115448188415e270bb0bef958c7c130939838 (commit)


- Log -----------------------------------------------------------------
commit c69ce9351336f5b4a8b33890756b3fd185528210
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>

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

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 7156863..db36634 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -271,7 +271,7 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 # endif
 # ifdef EVP_CHECK_DES_KEY
     if (DES_set_key_checked(&deskey[0], &dat->ks1)
-        ! !DES_set_key_checked(&deskey[1], &dat->ks2))
+        || DES_set_key_checked(&deskey[1], &dat->ks2))
         return 0;
 # else
     DES_set_key_unchecked(&deskey[0], &dat->ks1);