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/pbkdf | |
| parent | ae59295ea945fdcc482df2233409a5f878fa20c7 (diff) | |
Handle the case that container size() returns something other than u32bit
Diffstat (limited to 'src/pbkdf')
| -rw-r--r-- | src/pbkdf/pbkdf1/pbkdf1.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pbkdf/pbkdf1/pbkdf1.cpp b/src/pbkdf/pbkdf1/pbkdf1.cpp index 02d2c6cc0..d9bdf1b1f 100644 --- a/src/pbkdf/pbkdf1/pbkdf1.cpp +++ b/src/pbkdf/pbkdf1/pbkdf1.cpp @@ -34,7 +34,7 @@ OctetString PKCS5_PBKDF1::derive_key(u32bit key_len, hash->final(key); } - return OctetString(key, std::min(key_len, key.size())); + return OctetString(key, std::min<u32bit>(key_len, key.size())); } } |