From 77f3612e2bd930b27dcab63fdcca1d7091cb948d Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 11 Feb 2018 12:29:06 +0100 Subject: crypto/armcap.c: detect hardware-assisted SHA512 support. Reviewed-by: Rich Salz --- crypto/armcap.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'crypto/armcap.c') diff --git a/crypto/armcap.c b/crypto/armcap.c index a1f77fa2fc..deffd93cc6 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -46,6 +46,9 @@ void _armv8_aes_probe(void); void _armv8_sha1_probe(void); void _armv8_sha256_probe(void); void _armv8_pmull_probe(void); +# ifdef __aarch64__ +void _armv8_sha512_probe(void); +# endif uint32_t _armv7_tick(void); uint32_t OPENSSL_rdtsc(void) @@ -94,6 +97,7 @@ static unsigned long (*getauxval) (unsigned long) = NULL; # define HWCAP_CE_PMULL (1 << 4) # define HWCAP_CE_SHA1 (1 << 5) # define HWCAP_CE_SHA256 (1 << 6) +# define HWCAP_CE_SHA512 (1 << 21) # endif void OPENSSL_cpuid_setup(void) @@ -163,6 +167,11 @@ void OPENSSL_cpuid_setup(void) if (hwcap & HWCAP_CE_SHA256) OPENSSL_armcap_P |= ARMV8_SHA256; + +# ifdef __aarch64__ + if (hwcap & HWCAP_CE_SHA512) + OPENSSL_armcap_P |= ARMV8_SHA512; +# endif } } else if (sigsetjmp(ill_jmp, 1) == 0) { _armv7_neon_probe(); @@ -182,6 +191,12 @@ void OPENSSL_cpuid_setup(void) _armv8_sha256_probe(); OPENSSL_armcap_P |= ARMV8_SHA256; } +# ifdef __aarch64__ + if (sigsetjmp(ill_jmp, 1) == 0) { + _armv8_sha512_probe(); + OPENSSL_armcap_P |= ARMV8_SHA512; + } +# endif } if (sigsetjmp(ill_jmp, 1) == 0) { _armv7_tick(); -- cgit v1.2.1