Fix iOS simulator build
authorBernd Edlinger <bernd.edlinger@hotmail.de>
Tue, 24 Sep 2019 17:38:18 +0000 (19:38 +0200)
committerBernd Edlinger <bernd.edlinger@hotmail.de>
Thu, 3 Oct 2019 06:48:17 +0000 (08:48 +0200)
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)

crypto/evp/e_aes.c

index 1ca2c312a3c00feb636a1197b3066769d430c17c..4b738b928eae1221566a546b520d2a9fd855c160 100644 (file)
@@ -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__)  || \