diff options
| author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2009-03-02 02:39:17 +0000 |
|---|---|---|
| committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2009-03-02 02:39:17 +0000 |
| commit | caf9e032e6b4ccb114a74a3936c916bcfaba262d (patch) | |
| tree | 0fecaa7a6728d07549a41864ea2cedfb245f0bd3 /iterhash.cpp | |
| parent | 4e4793cc591e26c788b53c487bee7cab2d377f5e (diff) | |
| download | cryptopp-caf9e032e6b4ccb114a74a3936c916bcfaba262d.tar.gz | |
changes for 5.6:
- added AuthenticatedSymmetricCipher interface class and Filter wrappers
- added CCM, GCM (with SSE2 assembly), CMAC, and SEED
- improved AES speed on x86 and x64
- removed WORD64_AVAILABLE; compiler 64-bit int support is now required
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@433 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'iterhash.cpp')
| -rw-r--r-- | iterhash.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/iterhash.cpp b/iterhash.cpp index 44360b1..642a7ca 100644 --- a/iterhash.cpp +++ b/iterhash.cpp @@ -25,13 +25,13 @@ template <class T, class BASE> void IteratedHashBase<T, BASE>::Update(const byte if (num != 0) // process left over data { - if ((num+len) >= blockSize) + if (num+len >= blockSize) { memcpy(data+num, input, blockSize-num); HashBlock(dataBuf); input += (blockSize-num); - len-=(blockSize - num); - num=0; + len -= (blockSize-num); + num = 0; // drop through and do the rest } else @@ -145,10 +145,8 @@ template <class T, class BASE> void IteratedHashBase<T, BASE>::TruncatedFinal(by } #ifdef __GNUC__ - #ifdef WORD64_AVAILABLE template class IteratedHashBase<word64, HashTransformation>; template class IteratedHashBase<word64, MessageAuthenticationCode>; - #endif template class IteratedHashBase<word32, HashTransformation>; template class IteratedHashBase<word32, MessageAuthenticationCode>; |