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

Fold shuffles after loads for SHACAL2

pull/461/head
Jeffrey Walton 2017-08-16 10:40:00 -04:00
parent 1ab1e08ac5
commit b0b749f392
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.h
View File

@ -530,11 +530,6 @@ NAMESPACE_END
#endif #endif
// How to declare class constants // How to declare class constants
//#if (_MSC_VER == 1300) || defined(__INTEL_COMPILER) || defined(__BORLANDC__)
//# define CRYPTOPP_CONSTANT(x) enum {x};
//#else
//# define CRYPTOPP_CONSTANT(x) static const int x;
//#endif
#if defined(CRYPTOPP_DOXYGEN_PROCESSING) #if defined(CRYPTOPP_DOXYGEN_PROCESSING)
# define CRYPTOPP_CONSTANT(x) static const int x; # define CRYPTOPP_CONSTANT(x) static const int x;
#else #else

21
shacal2.cpp
View File

@ -36,17 +36,15 @@ void SHACAL2_Enc_ProcessAndXorBlock_SHANI(const word32* subKeys, const byte *inB
CRYPTOPP_ASSERT(inBlock); CRYPTOPP_ASSERT(inBlock);
CRYPTOPP_ASSERT(outBlock); CRYPTOPP_ASSERT(outBlock);
__m128i MASK = _mm_set_epi64x(0x0C0D0E0F08090A0B, 0x0405060700010203); // MASK1 produces the CDAB arrangement
__m128i B0 = _mm_loadu_si128(CONST_M128_CAST(inBlock + 0)); const __m128i MASK1 = _mm_set_epi8(8,9,10,11, 12,13,14,15, 0,1,2,3, 4,5,6,7);
__m128i B1 = _mm_loadu_si128(CONST_M128_CAST(inBlock + 16)); __m128i B0 = _mm_shuffle_epi8(_mm_loadu_si128(CONST_M128_CAST(inBlock + 0)), MASK1);
B0 = _mm_shuffle_epi8(B0, MASK); // MASK2 produces the EFGH arrangement
B1 = _mm_shuffle_epi8(B1, MASK); const __m128i MASK2 = _mm_set_epi8(0,1,2,3, 4,5,6,7, 8,9,10,11, 12,13,14,15);
__m128i B1 = _mm_shuffle_epi8(_mm_loadu_si128(CONST_M128_CAST(inBlock + 16)), MASK2);
B0 = _mm_shuffle_epi32(B0, 0xB1); // CDAB __m128i TMP = _mm_alignr_epi8(B0, B1, 8); // ABEF
B1 = _mm_shuffle_epi32(B1, 0x1B); // EFGH
__m128i TMP = _mm_alignr_epi8(B0, B1, 8); // ABEF
B1 = _mm_blend_epi16(B1, B0, 0xF0); // CDGH B1 = _mm_blend_epi16(B1, B0, 0xF0); // CDGH
B0 = TMP; B0 = TMP;
@ -63,8 +61,9 @@ void SHACAL2_Enc_ProcessAndXorBlock_SHANI(const word32* subKeys, const byte *inB
B0 = _mm_blend_epi16(TMP, B1, 0xF0); // DCBA B0 = _mm_blend_epi16(TMP, B1, 0xF0); // DCBA
B1 = _mm_alignr_epi8(B1, TMP, 8); // ABEF B1 = _mm_alignr_epi8(B1, TMP, 8); // ABEF
B0 = _mm_shuffle_epi8(B0, MASK); const __m128i MASK3 = _mm_set_epi8(12,13,14,15, 8,9,10,11, 4,5,6,7, 0,1,2,3);
B1 = _mm_shuffle_epi8(B1, MASK); B0 = _mm_shuffle_epi8(B0, MASK3);
B1 = _mm_shuffle_epi8(B1, MASK3);
if (xorBlock) if (xorBlock)
{ {