arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Consitently use _ARMV8 as Aarch32/Aarch64 function suffix

pull/461/head
Jeffrey Walton 2017-07-31 18:06:07 -04:00
parent e06c1561de
commit 249a5ed869
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sha-simd.cpp
View File

@ -566,7 +566,7 @@ void CRYPTOPP_FASTCALL SHA256_HashBlocks_SHANI(word32 *state, const word32 *data
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
#if CRYPTOPP_ARM_SHA_AVAILABLE #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 C0, C1, C2, C3;
uint32x4_t ABCD, ABCD_SAVED; uint32x4_t ABCD, ABCD_SAVED;
@ -735,7 +735,7 @@ void SHA1_Transform_ARMV8A(word32 *state, const word32 *data)
state[4] = E0; 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 STATE0, STATE1, ABEF_SAVE, CDGH_SAVE;
uint32x4_t MSG0, MSG1, MSG2, MSG3; uint32x4_t MSG0, MSG1, MSG2, MSG3;

8
sha.cpp
View File

@ -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 SHA1_Transform_SHANI(word32 *state, const word32 *data);
extern void CRYPTOPP_FASTCALL SHA256_HashBlocks_SHANI(word32 *state, const word32 *data, size_t length); extern void CRYPTOPP_FASTCALL SHA256_HashBlocks_SHANI(word32 *state, const word32 *data, size_t length);
#elif CRYPTOPP_ARM_SHA_AVAILABLE #elif CRYPTOPP_ARM_SHA_AVAILABLE
extern void SHA1_Transform_ARMV8A(word32 *state, const word32 *data); extern void SHA1_Transform_ARMV8(word32 *state, const word32 *data);
extern void CRYPTOPP_FASTCALL SHA256_HashBlocks_ARMV8A(word32 *state, const word32 *data, size_t length); extern void CRYPTOPP_FASTCALL SHA256_HashBlocks_ARMV8(word32 *state, const word32 *data, size_t length);
#endif #endif
static pfnSHATransform InitializeSHA1Transform() static pfnSHATransform InitializeSHA1Transform()
@ -708,9 +708,9 @@ static void SHA256_Transform_SHANI(word32 *state, const word32 *data)
#endif // CRYPTOPP_SHANI_AVAILABLE #endif // CRYPTOPP_SHANI_AVAILABLE
#if CRYPTOPP_ARM_SHA_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 #endif // CRYPTOPP_ARM_SHA_AVAILABLE