mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

armcap: fix Mac M1 SHA512 support.

Browse Source 
The SIGILL catch/trap works however disabled purposely for Darwin,
 thus relying on native api instead.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14935)
This commit is contained in:
David CARLIER 2021-04-19 21:26:50 +01:00 committed by Tomas Mraz
parent d29d7a7ff2
commit f1a45f68bc
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crypto/armcap.c
View File

@ -13,6 +13,9 @@
#include <setjmp.h>
#include <signal.h>
#include <openssl/crypto.h>
#ifdef __APPLE__
#include <sys/sysctl.h>
#endif
#include "internal/cryptlib.h"
#include "arm_arch.h"
@ -135,7 +138,8 @@ void OPENSSL_cpuid_setup(void)
return;
}
# if defined(__APPLE__) && !defined(__aarch64__)
# if defined(__APPLE__)
# if !defined(__aarch64__)
/*
* Capability probing by catching SIGILL appears to be problematic
* on iOS. But since Apple universe is "monocultural", it's actually
@ -151,6 +155,15 @@ void OPENSSL_cpuid_setup(void)
* Unified code works because it never triggers SIGILL on Apple
* devices...
*/
# else
{
unsigned int sha512;
size_t len = sizeof(sha512);
if (sysctlbyname("hw.optional.armv8_2_sha512", &sha512, &len, NULL, 0) == 0 && sha512 == 1)
OPENSSL_armcap_P |= ARMV8_SHA512;
}
# endif
# endif
OPENSSL_armcap_P = 0;