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

Return CRYPTOGAMS_armcaps in CryptogamsArmCaps

pull/853/head
Jeffrey Walton 2019-05-19 16:51:40 -04:00
parent 62d53e6c44
commit e19a6152b5
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sha.cpp
View File

@ -170,7 +170,7 @@ const word32 SHA256_K[64] = {
ANONYMOUS_NAMESPACE_BEGIN ANONYMOUS_NAMESPACE_BEGIN
#if CRYPTOGAMS_ARM_SHA1 || CRYPTOGAMS_ARM_SHA256 || CRYPTOGAMS_ARM_SHA512 #if CRYPTOGAMS_ARM_SHA1 || CRYPTOGAMS_ARM_SHA256 || CRYPTOGAMS_ARM_SHA512
inline bool CryptogamsArmCaps() inline unsigned int CryptogamsArmCaps()
{ {
// The Cryptogams code uses a global variable named CRYPTOGAMS_armcaps // The Cryptogams code uses a global variable named CRYPTOGAMS_armcaps
// for capabilities like ARMv7 and NEON. Storage is allocated in the // for capabilities like ARMv7 and NEON. Storage is allocated in the
@ -178,7 +178,7 @@ inline bool CryptogamsArmCaps()
// The Cryptogams code defines NEON as 1<<0; see ARMV7_NEON. // The Cryptogams code defines NEON as 1<<0; see ARMV7_NEON.
*const_cast<volatile unsigned int*>(&CRYPTOGAMS_armcaps) = CryptoPP::HasNEON() ? (1<<0) : 0; *const_cast<volatile unsigned int*>(&CRYPTOGAMS_armcaps) = CryptoPP::HasNEON() ? (1<<0) : 0;
return true; return CRYPTOGAMS_armcaps;
} }
#endif #endif
@ -310,8 +310,8 @@ void SHA1::Transform(word32 *state, const word32 *data)
#if CRYPTOGAMS_ARM_SHA1 && 0 #if CRYPTOGAMS_ARM_SHA1 && 0
if (HasARMv7()) if (HasARMv7())
{ {
static const bool unused = CryptogamsArmCaps(); static const unsigned int caps = CryptogamsArmCaps();
CRYPTOPP_UNUSED(unused); CRYPTOPP_UNUSED(caps);
# if defined(CRYPTOPP_LITTLE_ENDIAN) # if defined(CRYPTOPP_LITTLE_ENDIAN)
word32 dataBuf[16]; word32 dataBuf[16];
@ -349,8 +349,8 @@ size_t SHA1::HashMultipleBlocks(const word32 *input, size_t length)
#if CRYPTOGAMS_ARM_SHA1 #if CRYPTOGAMS_ARM_SHA1
if (HasARMv7()) if (HasARMv7())
{ {
static const bool unused = CryptogamsArmCaps(); static const unsigned int caps = CryptogamsArmCaps();
CRYPTOPP_UNUSED(unused); CRYPTOPP_UNUSED(caps);
sha1_block_data_order(m_state, input, length / SHA1::BLOCKSIZE); sha1_block_data_order(m_state, input, length / SHA1::BLOCKSIZE);
return length & (SHA1::BLOCKSIZE - 1); return length & (SHA1::BLOCKSIZE - 1);
@ -861,8 +861,8 @@ void SHA256::Transform(word32 *state, const word32 *data)
#if CRYPTOGAMS_ARM_SHA256 && 0 #if CRYPTOGAMS_ARM_SHA256 && 0
if (HasARMv7()) if (HasARMv7())
{ {
static const bool unused = CryptogamsArmCaps(); static const unsigned int caps = CryptogamsArmCaps();
CRYPTOPP_UNUSED(unused); CRYPTOPP_UNUSED(caps);
# if defined(CRYPTOPP_LITTLE_ENDIAN) # if defined(CRYPTOPP_LITTLE_ENDIAN)
word32 dataBuf[16]; word32 dataBuf[16];
@ -915,8 +915,8 @@ size_t SHA256::HashMultipleBlocks(const word32 *input, size_t length)
#if CRYPTOGAMS_ARM_SHA256 #if CRYPTOGAMS_ARM_SHA256
if (HasARMv7()) if (HasARMv7())
{ {
static const bool unused = CryptogamsArmCaps(); static const unsigned int caps = CryptogamsArmCaps();
CRYPTOPP_UNUSED(unused); CRYPTOPP_UNUSED(caps);
sha256_block_data_order(m_state, input, length / SHA256::BLOCKSIZE); sha256_block_data_order(m_state, input, length / SHA256::BLOCKSIZE);
return length & (SHA256::BLOCKSIZE - 1); return length & (SHA256::BLOCKSIZE - 1);
@ -981,8 +981,8 @@ size_t SHA224::HashMultipleBlocks(const word32 *input, size_t length)
#if CRYPTOGAMS_ARM_SHA256 #if CRYPTOGAMS_ARM_SHA256
if (HasARMv7()) if (HasARMv7())
{ {
static const bool unused = CryptogamsArmCaps(); static const unsigned int caps = CryptogamsArmCaps();
CRYPTOPP_UNUSED(unused); CRYPTOPP_UNUSED(caps);
sha256_block_data_order(m_state, input, length / SHA256::BLOCKSIZE); sha256_block_data_order(m_state, input, length / SHA256::BLOCKSIZE);
return length & (SHA256::BLOCKSIZE - 1); return length & (SHA256::BLOCKSIZE - 1);
@ -1347,8 +1347,8 @@ void SHA512::Transform(word64 *state, const word64 *data)
#if CRYPTOGAMS_ARM_SHA512 && 0 #if CRYPTOGAMS_ARM_SHA512 && 0
if (HasARMv7()) if (HasARMv7())
{ {
static const bool unused = CryptogamsArmCaps(); static const unsigned int caps = CryptogamsArmCaps();
CRYPTOPP_UNUSED(unused); CRYPTOPP_UNUSED(caps);
# if defined(CRYPTOPP_LITTLE_ENDIAN) # if defined(CRYPTOPP_LITTLE_ENDIAN)
word64 dataBuf[16]; word64 dataBuf[16];