From 40e5891635af1bc8e70e2e171451d338e4ecf14b Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 8 May 2019 19:31:31 -0400 Subject: [PATCH] Use CPU_QuerySHA256 for ARM --- cpu.cpp | 6 +++--- sha_simd.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpu.cpp b/cpu.cpp index 9a61d0b9..a843d2d8 100644 --- a/cpu.cpp +++ b/cpu.cpp @@ -502,7 +502,7 @@ extern bool CPU_ProbeNEON(); extern bool CPU_ProbeCRC32(); extern bool CPU_ProbeAES(); extern bool CPU_ProbeSHA1(); -extern bool CPU_ProbeSHA2(); +extern bool CPU_ProbeSHA256(); extern bool CPU_ProbeSHA512(); extern bool CPU_ProbeSHA3(); extern bool CPU_ProbeSM3(); @@ -701,7 +701,7 @@ inline bool CPU_QuerySHA1() return false; } -inline bool CPU_QuerySHA2() +inline bool CPU_QuerySHA256() { #if defined(__ANDROID__) && defined(__aarch64__) if (((android_getCpuFamily() & ANDROID_CPU_FAMILY_ARM64) != 0) && @@ -835,7 +835,7 @@ void DetectArmFeatures() g_hasPMULL = CPU_QueryPMULL() || CPU_ProbePMULL(); g_hasAES = CPU_QueryAES() || CPU_ProbeAES(); g_hasSHA1 = CPU_QuerySHA1() || CPU_ProbeSHA1(); - g_hasSHA2 = CPU_QuerySHA2() || CPU_ProbeSHA2(); + g_hasSHA2 = CPU_QuerySHA256() || CPU_ProbeSHA256(); g_hasSHA512 = CPU_QuerySHA512(); // || CPU_ProbeSHA512(); g_hasSHA3 = CPU_QuerySHA3(); // || CPU_ProbeSHA3(); g_hasSM3 = CPU_QuerySM3(); // || CPU_ProbeSM3(); diff --git a/sha_simd.cpp b/sha_simd.cpp index 0b31ea37..0739d634 100644 --- a/sha_simd.cpp +++ b/sha_simd.cpp @@ -143,7 +143,7 @@ bool CPU_ProbeSHA1() #endif // CRYPTOPP_ARM_SHA1_AVAILABLE } -bool CPU_ProbeSHA2() +bool CPU_ProbeSHA256() { #if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) return false;