summaryrefslogtreecommitdiff
path: root/rijndael.cpp
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2016-04-07 19:14:11 -0400
committerJeffrey Walton <noloader@gmail.com>2016-04-07 19:14:11 -0400
commitab393851ec5ddeddfe500060ec896d9c7b7dd00e (patch)
treea18bd16c499688854b7d321f78ef9ba837ea5e17 /rijndael.cpp
parent5cce8c33cabd92afecfb0ec31f841d3082d15b3d (diff)
downloadcryptopp-git-ab393851ec5ddeddfe500060ec896d9c7b7dd00e.tar.gz
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.
Diffstat (limited to 'rijndael.cpp')
-rw-r--r--rijndael.cpp3
1 files changed, 1 insertions, 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