diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-08 19:34:33 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-08 19:34:33 -0800 |
| commit | f853333e09b222f6d6d76d9343b6202b4769ffab (patch) | |
| tree | ccbd97f5dbba13aa19469b61108bdc6e10c3a255 /extra | |
| parent | 88b59efef6ae869bac9d14cefe2982a1061d3c93 (diff) | |
| parent | 7d9df8075e4c9392f4352e6ccd86921994f264bc (diff) | |
| download | mariadb-git-f853333e09b222f6d6d76d9343b6202b4769ffab.tar.gz | |
Merge 5.5-mwl248 -> 10.0-base
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/include/pwdbased.hpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/extra/yassl/taocrypt/include/pwdbased.hpp b/extra/yassl/taocrypt/include/pwdbased.hpp index d050fd8988b..58bd5902a58 100644 --- a/extra/yassl/taocrypt/include/pwdbased.hpp +++ b/extra/yassl/taocrypt/include/pwdbased.hpp @@ -51,9 +51,6 @@ word32 PBKDF2_HMAC<T>::DeriveKey(byte* derived, word32 dLen, const byte* pwd, if (dLen > MaxDerivedKeyLength()) return 0; - if (iterations < 0) - return 0; - ByteBlock buffer(T::DIGEST_SIZE); HMAC<T> hmac; |