diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2017-05-25 06:46:40 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2017-05-25 06:46:40 -0400 |
| commit | bd7aa155a6c78e6e4381b883ccfca7c6ad1ad983 (patch) | |
| tree | 6bfb541187ef245d9c2bcbbf66d27880f94b3970 /iterhash.cpp | |
| parent | b447a7bf1561c222fa1d299adfaf2510a5ad3203 (diff) | |
| download | cryptopp-git-bd7aa155a6c78e6e4381b883ccfca7c6ad1ad983.tar.gz | |
Revert "Avoid extra ByteReverse"
This reverts commit 3b56ba118f34. It broke Tiger and SEAL. Arg...
Diffstat (limited to 'iterhash.cpp')
| -rw-r--r-- | iterhash.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/iterhash.cpp b/iterhash.cpp index f8be97d9..bdc99ec5 100644 --- a/iterhash.cpp +++ b/iterhash.cpp @@ -83,14 +83,11 @@ template <class T, class BASE> byte * IteratedHashBase<T, BASE>::CreateUpdateSpa template <class T, class BASE> size_t IteratedHashBase<T, BASE>::HashMultipleBlocks(const T *input, size_t length)
{
-#if CRYPTOPP_BOOL_SSE_SHA_INTRINSICS_AVAILABLE
- // SHA-1 and SHA-256 only
- static const bool noReverse = HasSHA() && this->BlockSize() <= 64;
-#else
- const bool noReverse = NativeByteOrderIs(this->GetByteOrder());
-#endif
-
+ // Hardware based SHA1 and SHA256 correct blocks themselves due to hardware requirements.
+ // For Intel, SHA1 will effectively call ByteReverse(). SHA256 formats data to Intel
+ // requirements, which means eight words ABCD EFGH are transformed to ABEF CDGH.
unsigned int blockSize = this->BlockSize();
+ bool noReverse = NativeByteOrderIs(this->GetByteOrder());
T* dataBuf = this->DataBuf();
do
{
|