From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Tue, 24 Sep 2019 17:38:18 +0000 (+0200)
Subject: Fix iOS simulator build
X-Git-Tag: OpenSSL_1_1_1e~202
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6f3ccda84fb0995166252cc0db2ff3df17539b2b;p=oweals%2Fopenssl.git

Fix iOS simulator build

Fixes #9999

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10002)
---

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