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

Remove unneeded round parameter on Rijndael_UncheckedSetKey_SSE4_AESNI

pull/594/head
Jeffrey Walton 2018-02-20 13:32:53 -05:00
parent 33c10bc027
commit 244c40ed61
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rijndael-simd.cpp
View File

@ -446,8 +446,9 @@ static inline void AESNI_Dec_4_Blocks(__m128i &block0, __m128i &block1, __m128i
ANONYMOUS_NAMESPACE_END ANONYMOUS_NAMESPACE_END
void Rijndael_UncheckedSetKey_SSE4_AESNI(const byte *userKey, size_t keyLen, word32 *rk, unsigned int rounds) void Rijndael_UncheckedSetKey_SSE4_AESNI(const byte *userKey, size_t keyLen, word32 *rk)
{ {
const size_t rounds = keyLen / 4 + 6;
const word32 *rc = s_rconLE; const word32 *rc = s_rconLE;
__m128i temp = _mm_loadu_si128(M128_CAST(userKey+keyLen-16)); __m128i temp = _mm_loadu_si128(M128_CAST(userKey+keyLen-16));

4
rijndael.cpp
View File

@ -284,7 +284,7 @@ void Rijndael::Base::FillDecTable()
} }
#if (CRYPTOPP_AESNI_AVAILABLE) #if (CRYPTOPP_AESNI_AVAILABLE)
extern void Rijndael_UncheckedSetKey_SSE4_AESNI(const byte *userKey, size_t keyLen, word32* rk, unsigned int rounds); extern void Rijndael_UncheckedSetKey_SSE4_AESNI(const byte *userKey, size_t keyLen, word32* rk);
extern void Rijndael_UncheckedSetKeyRev_AESNI(word32 *key, unsigned int rounds); extern void Rijndael_UncheckedSetKeyRev_AESNI(word32 *key, unsigned int rounds);
extern size_t Rijndael_Enc_AdvancedProcessBlocks_AESNI(const word32 *subkeys, size_t rounds, extern size_t Rijndael_Enc_AdvancedProcessBlocks_AESNI(const word32 *subkeys, size_t rounds,
@ -331,7 +331,7 @@ void Rijndael::Base::UncheckedSetKey(const byte *userKey, unsigned int keyLen, c
{ {
// TODO: Add non-SSE4.1 variant for low-end Atoms. The low-end // TODO: Add non-SSE4.1 variant for low-end Atoms. The low-end
// Atoms have SSE2-SSSE3 and AES-NI, but not SSE4.1 or SSE4.2. // Atoms have SSE2-SSSE3 and AES-NI, but not SSE4.1 or SSE4.2.
Rijndael_UncheckedSetKey_SSE4_AESNI(userKey, keyLen, rk, m_rounds); Rijndael_UncheckedSetKey_SSE4_AESNI(userKey, keyLen, rk);
if (!IsForwardTransformation()) if (!IsForwardTransformation())
Rijndael_UncheckedSetKeyRev_AESNI(m_key, m_rounds); Rijndael_UncheckedSetKeyRev_AESNI(m_key, m_rounds);