From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Sun, 19 Jan 2020 11:23:40 +0000 (+0100)
Subject: Fix TLS not using aes_cbc_hmac_sha ciphers
X-Git-Tag: OpenSSL_1_1_1e~62
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a3998ea8166e557c2dcf18325c8eb5c45109fa50;p=oweals%2Fopenssl.git

Fix TLS not using aes_cbc_hmac_sha ciphers

AES_ASM was repaced by AESNI_ASM, so use that.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10892)
---

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)      ) \
         )