summaryrefslogtreecommitdiff
path: root/extra/yassl/taocrypt
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-10-16 18:40:54 +0200
committermsvensson@neptunus.(none) <>2006-10-16 18:40:54 +0200
commitb2a98c531f5ff3d84b8afb0c28eb6f29e50af0ae (patch)
tree3f69318f1ed7da60ca75c5df15afb0c3e017dbf6 /extra/yassl/taocrypt
parent0d9046ca2798f00cd11113d6b4f1b08f4e40987c (diff)
parent85fb3817f74118988c5696c3c0c651ec0b8b65a7 (diff)
downloadmariadb-git-b2a98c531f5ff3d84b8afb0c28eb6f29e50af0ae.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into neptunus.(none):/home/msvensson/mysql/work/my51-work
Diffstat (limited to 'extra/yassl/taocrypt')
-rw-r--r--extra/yassl/taocrypt/include/hmac.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/yassl/taocrypt/include/hmac.hpp b/extra/yassl/taocrypt/include/hmac.hpp
index d46a6d4e7c3..b710c3aa499 100644
--- a/extra/yassl/taocrypt/include/hmac.hpp
+++ b/extra/yassl/taocrypt/include/hmac.hpp
@@ -60,12 +60,12 @@ private:
T mac_;
// MSVC 6 HACK, gives compiler error if calculated in array
- enum { BSIZE = T::BLOCK_SIZE / sizeof(word32),
- DSIZE = T::DIGEST_SIZE / sizeof(word32) };
+ enum { HMAC_BSIZE = T::BLOCK_SIZE / sizeof(word32),
+ HMAC_DSIZE = T::DIGEST_SIZE / sizeof(word32) };
- word32 ip_[BSIZE]; // align ipad_ on word32
- word32 op_[BSIZE]; // align opad_ on word32
- word32 innerH_[DSIZE]; // align innerHash_ on word32
+ word32 ip_[HMAC_BSIZE]; // align ipad_ on word32
+ word32 op_[HMAC_BSIZE]; // align opad_ on word32
+ word32 innerH_[HMAC_DSIZE]; // align innerHash_ on word32
void KeyInnerHash();