From 0b8d6465bdd20b128af9129807f8cd14153a95c4 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 8 Aug 2017 19:10:56 -0400 Subject: [PATCH] Use consistent naming of ___ --- rijndael-simd.cpp | 6 +++--- rijndael.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rijndael-simd.cpp b/rijndael-simd.cpp index ca4a25db..45e135ef 100644 --- a/rijndael-simd.cpp +++ b/rijndael-simd.cpp @@ -189,7 +189,7 @@ void Rijndael_Enc_ProcessAndXorBlock_ARMV8(const byte *inBlock, const byte *xorB data = vaesmcq_u8(data); } - // One round of encryption: AES, no Mix + // AES single round encryption data = vaeseq_u8(data, vld1q_u8(keys+i*16)); // Final Add (bitwise Xor) @@ -435,7 +435,7 @@ inline size_t Rijndael_AdvancedProcessBlocks_AESNI(F1 func1, F4 func4, return length; } -size_t Rijndael_AdvancedProcessBlocks_Enc_AESNI(MAYBE_CONST word32 *subkeys, size_t rounds, +size_t Rijndael_Enc_AdvancedProcessBlocks_AESNI(MAYBE_CONST word32 *subkeys, size_t rounds, const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) { MAYBE_CONST __m128i* keys = reinterpret_cast(subkeys); @@ -443,7 +443,7 @@ size_t Rijndael_AdvancedProcessBlocks_Enc_AESNI(MAYBE_CONST word32 *subkeys, siz keys, rounds, inBlocks, xorBlocks, outBlocks, length, flags); } -size_t Rijndael_AdvancedProcessBlocks_Dec_AESNI(MAYBE_CONST word32 *subkeys, size_t rounds, +size_t Rijndael_Dec_AdvancedProcessBlocks_AESNI(MAYBE_CONST word32 *subkeys, size_t rounds, const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) { MAYBE_CONST __m128i* keys = reinterpret_cast(subkeys); diff --git a/rijndael.cpp b/rijndael.cpp index 4ace9a59..256630c9 100644 --- a/rijndael.cpp +++ b/rijndael.cpp @@ -218,9 +218,9 @@ void Rijndael::Base::FillDecTable() extern void Rijndael_UncheckedSetKey_SSE4_AESNI(const byte *userKey, size_t keyLen, word32* rk); extern void Rijndael_UncheckedSetKeyRev_SSE4_AESNI(word32 *key, unsigned int rounds); -extern size_t Rijndael_AdvancedProcessBlocks_Enc_AESNI(const word32 *subkeys, size_t rounds, +extern size_t Rijndael_Enc_AdvancedProcessBlocks_AESNI(const word32 *subkeys, size_t rounds, const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags); -extern size_t Rijndael_AdvancedProcessBlocks_Dec_AESNI(const word32 *subkeys, size_t rounds, +extern size_t Rijndael_Dec_AdvancedProcessBlocks_AESNI(const word32 *subkeys, size_t rounds, const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags); #endif @@ -1069,7 +1069,7 @@ size_t Rijndael::Enc::AdvancedProcessBlocks(const byte *inBlocks, const byte *xo { #if CRYPTOPP_AESNI_AVAILABLE if (HasAESNI()) - return Rijndael_AdvancedProcessBlocks_Enc_AESNI(m_key.begin(), m_rounds, inBlocks, xorBlocks, outBlocks, length, flags); + return Rijndael_Enc_AdvancedProcessBlocks_AESNI(m_key.begin(), m_rounds, inBlocks, xorBlocks, outBlocks, length, flags); #endif #if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_RIJNDAEL_ASM) @@ -1131,7 +1131,7 @@ size_t Rijndael::Dec::AdvancedProcessBlocks(const byte *inBlocks, const byte *xo { #if CRYPTOPP_AESNI_AVAILABLE if (HasAESNI()) - return Rijndael_AdvancedProcessBlocks_Dec_AESNI(m_key.begin(), m_rounds, inBlocks, xorBlocks, outBlocks, length, flags); + return Rijndael_Dec_AdvancedProcessBlocks_AESNI(m_key.begin(), m_rounds, inBlocks, xorBlocks, outBlocks, length, flags); #endif return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks, outBlocks, length, flags);