From: Andy Polyakov <appro@openssl.org>
Date: Mon, 5 Mar 2018 16:10:03 +0000 (+0100)
Subject: crypto/armcap.c: mask SHA512 hardware detection on iOS.
X-Git-Tag: OpenSSL_1_1_1-pre3~175
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=72983c0eab750dfc1b6298c516df7afb1a73ba54;p=oweals%2Fopenssl.git

crypto/armcap.c: mask SHA512 hardware detection on iOS.

When running iOS application from command line it's impossible to
get past the failing capability detection. This is because it's
executed under debugger and iOS debugger is impossible to deal with.
[If Apple implements SHA512 in silicon, it would have to be detected
with sysctlbyname.]

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/armcap.c b/crypto/armcap.c
index d67073302a..1b3c2722d1 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -191,7 +191,7 @@ void OPENSSL_cpuid_setup(void)
             _armv8_sha256_probe();
             OPENSSL_armcap_P |= ARMV8_SHA256;
         }
-# ifdef __aarch64__
+# if defined(__aarch64__) && !defined(__APPLE__)
         if (sigsetjmp(ill_jmp, 1) == 0) {
             _armv8_sha512_probe();
             OPENSSL_armcap_P |= ARMV8_SHA512;