summaryrefslogtreecommitdiffstats
path: root/crypto/evp
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2019-09-24 19:38:18 +0200
committerBernd Edlinger <bernd.edlinger@hotmail.de>2019-10-03 08:48:17 +0200
commit6f3ccda84fb0995166252cc0db2ff3df17539b2b (patch)
treecff8a8aece45310161fa41969adfa3e59a1acff4 /crypto/evp
parent5a604dfd86d0fee4f9abc257b2a81017ecc558d1 (diff)
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)
Diffstat (limited to 'crypto/evp')
-rw-r--r--crypto/evp/e_aes.c2
1 files changed, 1 insertions, 1 deletions
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__) || \