diff options
| author | Harin Vadodaria <harin.vadodaria@oracle.com> | 2012-11-21 19:12:20 +0530 |
|---|---|---|
| committer | Harin Vadodaria <harin.vadodaria@oracle.com> | 2012-11-21 19:12:20 +0530 |
| commit | 5e5bcd74873694e87f09809812c0f905d4eba91e (patch) | |
| tree | 3d6a5f6ba96eaa5f03b0840b4557c7648b06decd /extra/yassl/taocrypt/include | |
| parent | d820991044b5dcc214d54ee93e78ca98820f6df0 (diff) | |
| download | mariadb-git-5e5bcd74873694e87f09809812c0f905d4eba91e.tar.gz | |
Bug#15883127: PORT FIX FOR BUG #13904906 TO MYSQL 5.1
Description: Updated yassl to version 2.2.2
Diffstat (limited to 'extra/yassl/taocrypt/include')
| -rw-r--r-- | extra/yassl/taocrypt/include/aes.hpp | 1 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/include/pwdbased.hpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/include/aes.hpp b/extra/yassl/taocrypt/include/aes.hpp index dc19c98a83a..e2041fc9350 100644 --- a/extra/yassl/taocrypt/include/aes.hpp +++ b/extra/yassl/taocrypt/include/aes.hpp @@ -92,7 +92,6 @@ typedef BlockCipher<ENCRYPTION, AES, CBC> AES_CBC_Encryption; typedef BlockCipher<DECRYPTION, AES, CBC> AES_CBC_Decryption; - } // naemspace #endif // TAO_CRYPT_AES_HPP diff --git a/extra/yassl/taocrypt/include/pwdbased.hpp b/extra/yassl/taocrypt/include/pwdbased.hpp index f40a336e2c3..d050fd8988b 100644 --- a/extra/yassl/taocrypt/include/pwdbased.hpp +++ b/extra/yassl/taocrypt/include/pwdbased.hpp @@ -48,9 +48,11 @@ word32 PBKDF2_HMAC<T>::DeriveKey(byte* derived, word32 dLen, const byte* pwd, word32 pLen, const byte* salt, word32 sLen, word32 iterations) const { - if (dLen > MaxDerivedKeyLength()) + if (dLen > MaxDerivedKeyLength()) return 0; + if (iterations < 0) + return 0; ByteBlock buffer(T::DIGEST_SIZE); HMAC<T> hmac; |