diff options
author | lloyd <[email protected]> | 2010-09-14 01:31:38 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-09-14 01:31:38 +0000 |
commit | 59a9b0ef260b010606edc3384035b6aa12dd6415 (patch) | |
tree | 6d643130be0e6eac2d8120da90ad03a3b5cdff4e /src/kdf/kdf2 | |
parent | ae59295ea945fdcc482df2233409a5f878fa20c7 (diff) |
Handle the case that container size() returns something other than u32bit
Diffstat (limited to 'src/kdf/kdf2')
-rw-r--r-- | src/kdf/kdf2/kdf2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kdf/kdf2/kdf2.cpp b/src/kdf/kdf2/kdf2.cpp index 7cc1d7416..b9e785942 100644 --- a/src/kdf/kdf2/kdf2.cpp +++ b/src/kdf/kdf2/kdf2.cpp @@ -28,7 +28,7 @@ SecureVector<byte> KDF2::derive(u32bit out_len, hash->update(P, P_len); SecureVector<byte> hash_result = hash->final(); - u32bit added = std::min(hash_result.size(), out_len); + u32bit added = std::min<u32bit>(hash_result.size(), out_len); output.append(hash_result, added); out_len -= added; |