Removed CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS. No longer necessary

1 files changed, 9 insertions, 14 deletions

diff --git a/rijndael.cpp b/rijndael.cpp
index 9c30a498..e60822a7 100644
--- a/rijndael.cpp
+++ b/rijndael.cpp
@@ -76,13 +76,8 @@ being unloaded from L1 cache, until that round is finished.
 #include "cpu.h"

 

 NAMESPACE_BEGIN(CryptoPP)

-	

-// Hack for https://github.com/weidai11/cryptopp/issues/42

-#if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

-# define CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS 1

-#endif

 

-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)

+#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

 # if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_RIJNDAEL_ASM)

 namespace rdtable {CRYPTOPP_ALIGN_DATA(16) word64 Te[256+2];}

 using namespace rdtable;

@@ -109,7 +104,7 @@ static volatile bool s_TeFilled = false, s_TdFilled = false;
 	tempBlock[c] = ((byte *)(Te+byte(t)))[1]; t >>= 8;\

 	tempBlock[d] = ((byte *)(Te+t))[1];

 

-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)

+#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

 	#define QUARTER_ROUND_LD(t, a, b, c, d)	\

 		tempBlock[a] = ((byte *)(Td+byte(t)))[GetNativeByteOrder()*7]; t >>= 8;\

 		tempBlock[b] = ((byte *)(Td+byte(t)))[GetNativeByteOrder()*7]; t >>= 8;\

@@ -129,7 +124,7 @@ static volatile bool s_TeFilled = false, s_TdFilled = false;
 #ifdef IS_LITTLE_ENDIAN

 	#define QUARTER_ROUND_FE(t, a, b, c, d)		QUARTER_ROUND(TL_F, Te, t, d, c, b, a)

 	#define QUARTER_ROUND_FD(t, a, b, c, d)		QUARTER_ROUND(TL_F, Td, t, d, c, b, a)

-	#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)

+	#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

 		#define TL_F(T, i, x)	(*(word32 *)(void *)((byte *)T + x*8 + (6-i)%4+1))

 		#define TL_M(T, i, x)	(*(word32 *)(void *)((byte *)T + x*8 + (i+3)%4+1))

 	#else

@@ -139,7 +134,7 @@ static volatile bool s_TeFilled = false, s_TdFilled = false;
 #else

 	#define QUARTER_ROUND_FE(t, a, b, c, d)		QUARTER_ROUND(TL_F, Te, t, a, b, c, d)

 	#define QUARTER_ROUND_FD(t, a, b, c, d)		QUARTER_ROUND(TL_F, Td, t, a, b, c, d)

-	#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)

+	#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

 		#define TL_F(T, i, x)	(*(word32 *)(void *)((byte *)T + x*8 + (4-i)%4))

 		#define TL_M			TL_F

 	#else

@@ -164,7 +159,7 @@ void Rijndael::Base::FillEncTable()
 	for (int i=0; i<256; i++)

 	{

 		byte x = Se[i];

-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)

+#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

 		word32 y = word32(x)<<8 | word32(x)<<16 | word32(f2(x))<<24;

 		Te[i] = word64(y | f3(x))<<32 | y;

 #else

@@ -187,7 +182,7 @@ void Rijndael::Base::FillDecTable()
 	for (int i=0; i<256; i++)

 	{

 		byte x = Sd[i];

-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)

+#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

 		word32 y = word32(fd(x))<<8 | word32(f9(x))<<16 | word32(fe(x))<<24;

 		Td[i] = word64(y | fb(x))<<32 | y | x;

 #else

@@ -386,7 +381,7 @@ void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock
 	const int cacheLineSize = GetCacheLineSize();

 	unsigned int i;

 	word32 u = 0;

-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)

+#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

 	for (i=0; i<2048; i+=cacheLineSize)

 #else

 	for (i=0; i<1024; i+=cacheLineSize)

@@ -462,7 +457,7 @@ void Rijndael::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock
 	const int cacheLineSize = GetCacheLineSize();

 	unsigned int i;

 	word32 u = 0;

-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)

+#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

 	for (i=0; i<2048; i+=cacheLineSize)

 #else

 	for (i=0; i<1024; i+=cacheLineSize)

@@ -497,7 +492,7 @@ void Rijndael::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock
         rk += 8;

     } while (--r);

 

-#if !(defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS))

+#if !defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)

 	// timing attack countermeasure. see comments at top for more details

 	// If CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS is defined, 

 	// QUARTER_ROUND_LD will use Td, which is already preloaded.