[openssl] OpenSSL_1_1_1-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_1-stable has been updated
       via  6f3ccda84fb0995166252cc0db2ff3df17539b2b (commit)
      from  5a604dfd86d0fee4f9abc257b2a81017ecc558d1 (commit)


- Log -----------------------------------------------------------------
commit 6f3ccda84fb0995166252cc0db2ff3df17539b2b
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Tue Sep 24 19:38:18 2019 +0200

    Fix iOS simulator build
    
    Fixes #9999
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10002)

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

Summary of changes:
 crypto/evp/e_aes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 1ca2c312a3..4b738b928e 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -176,7 +176,7 @@ static void ctr64_inc(unsigned char *counter)
 # define HWAES_xts_decrypt aes_p8_xts_decrypt
 #endif
 
-#if     !defined(OPENSSL_NO_ASM) &&                     (  \
+#if     defined(OPENSSL_CPUID_OBJ) &&                   (  \
         ((defined(__i386)       || defined(__i386__)    || \
           defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2))|| \
         defined(__x86_64)       || defined(__x86_64__)  || \