diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-26 12:25:08 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-26 12:25:08 +0200 |
| commit | 2376631c59d9a3c248c754c6819a3c033dd0cb9a (patch) | |
| tree | 74fa879419aee74ac9d7c62fc2cca1ada76a2e08 /extra/yassl | |
| parent | dd37fca2693b2a8230a3aaf8be6be6480c0722ed (diff) | |
| download | mariadb-git-2376631c59d9a3c248c754c6819a3c033dd0cb9a.tar.gz | |
Bug #13476 yassl: openserv compile failure
extra/yassl/taocrypt/include/hmac.hpp:
Rename BSIZE to HMAC_BSIZE to avoid conflict with BSIZE on "openserv 3.2 5.0.7"
Diffstat (limited to 'extra/yassl')
| -rw-r--r-- | extra/yassl/taocrypt/include/hmac.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/yassl/taocrypt/include/hmac.hpp b/extra/yassl/taocrypt/include/hmac.hpp index 543366afc3a..cf029812ce2 100644 --- a/extra/yassl/taocrypt/include/hmac.hpp +++ b/extra/yassl/taocrypt/include/hmac.hpp @@ -56,12 +56,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(); |