[openssl] OpenSSL_1_1_1-stable update

bernd.edlinger at hotmail.de bernd.edlinger at hotmail.de
Tue Jan 21 12:56:40 UTC 2020


The branch OpenSSL_1_1_1-stable has been updated
       via  a3998ea8166e557c2dcf18325c8eb5c45109fa50 (commit)
      from  d6116a9850f83f02af263ffa850d5510edff516c (commit)


- Log -----------------------------------------------------------------
commit a3998ea8166e557c2dcf18325c8eb5c45109fa50
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Jan 19 12:23:40 2020 +0100

    Fix TLS not using aes_cbc_hmac_sha ciphers
    
    AES_ASM was repaced by AESNI_ASM, so use that.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10892)

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

Summary of changes:
 ssl/record/rec_layer_s3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 76a00fc510..9e23b4fb3b 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -18,7 +18,7 @@
 #include "../packet_local.h"
 
 #if     defined(OPENSSL_SMALL_FOOTPRINT) || \
-        !(      defined(AES_ASM) &&     ( \
+        !(      defined(AESNI_ASM) &&   ( \
                 defined(__x86_64)       || defined(__x86_64__)  || \
                 defined(_M_AMD64)       || defined(_M_X64)      ) \
         )


More information about the openssl-commits mailing list