diff options
| author | sdlyyxy <sdlyyxy@icloud.com> | 2023-07-15 23:26:05 +0800 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-07-21 10:19:19 +1000 |
| commit | ba9472c1c121b13e48f7c198d3fe9871a86e664c (patch) | |
| tree | b4abbca5974d69bd1bfd8c1a43cb02c6f0ed4753 /crypto/armcap.c | |
| parent | 08e6eb216c9d65d502dc136a40e1c0adaefab759 (diff) | |
Update with `ARMV8_HAVE_SHA3_AND_WORTH_USING`
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21398)
Diffstat (limited to 'crypto/armcap.c')
| -rw-r--r-- | crypto/armcap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/armcap.c b/crypto/armcap.c index 8443f8fcbd..3b1447456d 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -300,7 +300,7 @@ void OPENSSL_cpuid_setup(void) ((strncmp(uarch, "Apple M1", 8) == 0) || (strncmp(uarch, "Apple M2", 8) == 0))) { OPENSSL_armcap_P |= ARMV8_UNROLL8_EOR3; - OPENSSL_armcap_P |= ARMV8_WORTH_USING_SHA3; + OPENSSL_armcap_P |= ARMV8_HAVE_SHA3_AND_WORTH_USING; } } } @@ -433,7 +433,7 @@ void OPENSSL_cpuid_setup(void) MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_MAX) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_MAX)) && (OPENSSL_armcap_P & ARMV8_SHA3)) - OPENSSL_armcap_P |= ARMV8_WORTH_USING_SHA3; + OPENSSL_armcap_P |= ARMV8_HAVE_SHA3_AND_WORTH_USING; # endif } #endif /* _WIN32, __ARM_MAX_ARCH__ >= 7 */ |