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

Remove const_cast from CryptogamsArmCaps()

pull/853/head
Jeffrey Walton 2019-05-23 03:17:17 -04:00
parent c5bb85754f
commit 2a09376211
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sha.cpp
View File

@ -179,9 +179,7 @@ inline unsigned int CryptogamsArmCaps()
// CRYPTOGAMS_armcaps, and the Cryptogams modules use our symbol. // CRYPTOGAMS_armcaps, and the Cryptogams modules use our symbol.
// The Cryptogams code defines ARMV7_NEON as 1<<0, so we need to // The Cryptogams code defines ARMV7_NEON as 1<<0, so we need to
// set the bits accordingly in CRYPTOGAMS_armcaps. // set the bits accordingly in CRYPTOGAMS_armcaps.
*const_cast<volatile unsigned int*>(&CRYPTOGAMS_armcaps) = CryptoPP::HasNEON() ? (1<<0) : 0; return CryptoPP::HasNEON() ? (1<<0) : 0;
return CRYPTOGAMS_armcaps;
} }
#endif #endif
@ -313,14 +311,12 @@ void SHA1::Transform(word32 *state, const word32 *data)
#if CRYPTOGAMS_ARM_SHA1 && 0 #if CRYPTOGAMS_ARM_SHA1 && 0
if (HasARMv7()) if (HasARMv7())
{ {
static const unsigned int caps = CryptogamsArmCaps();
# if defined(CRYPTOPP_LITTLE_ENDIAN) # if defined(CRYPTOPP_LITTLE_ENDIAN)
word32 dataBuf[16]; word32 dataBuf[16];
ByteReverse(dataBuf, data, SHA1::BLOCKSIZE); ByteReverse(dataBuf, data, SHA1::BLOCKSIZE);
sha1_block_data_order(state, data, 1, caps); sha1_block_data_order(state, data, 1, CryptogamsArmCaps());
# else # else
sha1_block_data_order(state, data, 1, caps); sha1_block_data_order(state, data, 1, CryptogamsArmCaps());
# endif # endif
return; return;
} }
@ -351,8 +347,7 @@ size_t SHA1::HashMultipleBlocks(const word32 *input, size_t length)
#if CRYPTOGAMS_ARM_SHA1 #if CRYPTOGAMS_ARM_SHA1
if (HasARMv7()) if (HasARMv7())
{ {
const unsigned int caps = CryptogamsArmCaps(); sha1_block_data_order(m_state, input, length / SHA1::BLOCKSIZE, CryptogamsArmCaps());
sha1_block_data_order(m_state, input, length / SHA1::BLOCKSIZE, caps);
return length & (SHA1::BLOCKSIZE - 1); return length & (SHA1::BLOCKSIZE - 1);
} }
#endif #endif
@ -861,14 +856,12 @@ void SHA256::Transform(word32 *state, const word32 *data)
#if CRYPTOGAMS_ARM_SHA256 && 0 #if CRYPTOGAMS_ARM_SHA256 && 0
if (HasARMv7()) if (HasARMv7())
{ {
static const unsigned int caps = CryptogamsArmCaps();
# if defined(CRYPTOPP_LITTLE_ENDIAN) # if defined(CRYPTOPP_LITTLE_ENDIAN)
word32 dataBuf[16]; word32 dataBuf[16];
ByteReverse(dataBuf, data, SHA256::BLOCKSIZE); ByteReverse(dataBuf, data, SHA256::BLOCKSIZE);
sha256_block_data_order(state, data, 1, caps); sha256_block_data_order(state, data, 1, CryptogamsArmCaps());
# else # else
sha256_block_data_order(state, data, 1, caps); sha256_block_data_order(state, data, 1, CryptogamsArmCaps());
# endif # endif
return; return;
} }
@ -914,8 +907,7 @@ size_t SHA256::HashMultipleBlocks(const word32 *input, size_t length)
#if CRYPTOGAMS_ARM_SHA256 #if CRYPTOGAMS_ARM_SHA256
if (HasARMv7()) if (HasARMv7())
{ {
const unsigned int caps = CryptogamsArmCaps(); sha256_block_data_order(m_state, input, length / SHA256::BLOCKSIZE, CryptogamsArmCaps());
sha256_block_data_order(m_state, input, length / SHA256::BLOCKSIZE, caps);
return length & (SHA256::BLOCKSIZE - 1); return length & (SHA256::BLOCKSIZE - 1);
} }
#endif #endif
@ -978,9 +970,7 @@ size_t SHA224::HashMultipleBlocks(const word32 *input, size_t length)
#if CRYPTOGAMS_ARM_SHA256 #if CRYPTOGAMS_ARM_SHA256
if (HasARMv7()) if (HasARMv7())
{ {
static const unsigned int caps = CryptogamsArmCaps(); sha256_block_data_order(m_state, input, length / SHA256::BLOCKSIZE, CryptogamsArmCaps());;
sha256_block_data_order(m_state, input, length / SHA256::BLOCKSIZE, caps);;
return length & (SHA256::BLOCKSIZE - 1); return length & (SHA256::BLOCKSIZE - 1);
} }
#endif #endif
@ -1343,15 +1333,7 @@ void SHA512::Transform(word64 *state, const word64 *data)
#if CRYPTOGAMS_ARM_SHA512 && 0 #if CRYPTOGAMS_ARM_SHA512 && 0
if (HasARMv7()) if (HasARMv7())
{ {
static const unsigned int caps = CryptogamsArmCaps(); sha512_block_data_order(state, data, 1, CryptogamsArmCaps());
# if defined(CRYPTOPP_LITTLE_ENDIAN)
word64 dataBuf[16];
ByteReverse(dataBuf, data, SHA512::BLOCKSIZE);
sha512_block_data_order(state, dataBuf, 1, caps);
# else
sha512_block_data_order(state, data, 1, caps);
# endif
return; return;
} }
#endif #endif