From 249a5ed869c84c9bf20ea7bd45532ec9755d625c Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 31 Jul 2017 18:06:07 -0400 Subject: [PATCH] Consitently use _ARMV8 as Aarch32/Aarch64 function suffix --- sha-simd.cpp | 4 ++-- sha.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sha-simd.cpp b/sha-simd.cpp index 6d0c68bc..a7377bed 100644 --- a/sha-simd.cpp +++ b/sha-simd.cpp @@ -566,7 +566,7 @@ void CRYPTOPP_FASTCALL SHA256_HashBlocks_SHANI(word32 *state, const word32 *data ///////////////////////////////////////////////////////// #if CRYPTOPP_ARM_SHA_AVAILABLE -void SHA1_Transform_ARMV8A(word32 *state, const word32 *data) +void SHA1_Transform_ARMV8(word32 *state, const word32 *data) { uint32x4_t C0, C1, C2, C3; uint32x4_t ABCD, ABCD_SAVED; @@ -735,7 +735,7 @@ void SHA1_Transform_ARMV8A(word32 *state, const word32 *data) state[4] = E0; } -void CRYPTOPP_FASTCALL SHA256_HashBlocks_ARMV8A(word32 *state, const word32 *data, size_t length) +void CRYPTOPP_FASTCALL SHA256_HashBlocks_ARMV8(word32 *state, const word32 *data, size_t length) { uint32x4_t STATE0, STATE1, ABEF_SAVE, CDGH_SAVE; uint32x4_t MSG0, MSG1, MSG2, MSG3; diff --git a/sha.cpp b/sha.cpp index 39c2b5b7..cb20d887 100644 --- a/sha.cpp +++ b/sha.cpp @@ -101,8 +101,8 @@ static void SHA1_Transform_CXX(word32 *state, const word32 *data) extern void SHA1_Transform_SHANI(word32 *state, const word32 *data); extern void CRYPTOPP_FASTCALL SHA256_HashBlocks_SHANI(word32 *state, const word32 *data, size_t length); #elif CRYPTOPP_ARM_SHA_AVAILABLE -extern void SHA1_Transform_ARMV8A(word32 *state, const word32 *data); -extern void CRYPTOPP_FASTCALL SHA256_HashBlocks_ARMV8A(word32 *state, const word32 *data, size_t length); +extern void SHA1_Transform_ARMV8(word32 *state, const word32 *data); +extern void CRYPTOPP_FASTCALL SHA256_HashBlocks_ARMV8(word32 *state, const word32 *data, size_t length); #endif static pfnSHATransform InitializeSHA1Transform() @@ -708,9 +708,9 @@ static void SHA256_Transform_SHANI(word32 *state, const word32 *data) #endif // CRYPTOPP_SHANI_AVAILABLE #if CRYPTOPP_ARM_SHA_AVAILABLE -static void SHA256_Transform_ARMV8A(word32 *state, const word32 *data) +static void SHA256_Transform_ARMV8(word32 *state, const word32 *data) { - return SHA256_HashBlocks_ARMV8A(state, data, SHA256::BLOCKSIZE); + return SHA256_HashBlocks_ARMV8(state, data, SHA256::BLOCKSIZE); } #endif // CRYPTOPP_ARM_SHA_AVAILABLE