From ab393851ec5ddeddfe500060ec896d9c7b7dd00e Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 7 Apr 2016 19:14:11 -0400 Subject: [PATCH] Revert "Improve performance of fix to Issue 146" This reverts commit 5cce8c33cabd92afecfb0ec31f841d3082d15b3d. It was an incomplete remediation because it was applied to one area of the code, and not both areas of the code. The complete remediation will be checked-in next. --- rijndael.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rijndael.cpp b/rijndael.cpp index 547a1990..92f9dea8 100644 --- a/rijndael.cpp +++ b/rijndael.cpp @@ -391,8 +391,7 @@ void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock // timing attack countermeasure. see comments at top for more details const int cacheLineSize = GetCacheLineSize(); unsigned int i; - volatile word32 _u = 0; - word32 u = _u; + volatile word32 u = 0; #if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS) for (i=0; i<2048; i+=cacheLineSize) #else