diff options
| author | lloyd <[email protected]> | 2010-10-12 23:29:55 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-10-12 23:29:55 +0000 |
| commit | 2af9ba577730f071eef44b3ba492c3bfad0a8ec6 (patch) | |
| tree | 92a4c4e973756225d42bb99a99110b2669be7299 /src/pbkdf/pbkdf2 | |
| parent | 97e8d6086171772cd5e45bcf2f5b1ea1e38e6bf5 (diff) | |
Use size_t for BufferedComputation::add_data
Diffstat (limited to 'src/pbkdf/pbkdf2')
| -rw-r--r-- | src/pbkdf/pbkdf2/pbkdf2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pbkdf/pbkdf2/pbkdf2.cpp b/src/pbkdf/pbkdf2/pbkdf2.cpp index b1c7b2e07..88131da01 100644 --- a/src/pbkdf/pbkdf2/pbkdf2.cpp +++ b/src/pbkdf/pbkdf2/pbkdf2.cpp @@ -42,7 +42,7 @@ OctetString PKCS5_PBKDF2::derive_key(u32bit key_len, u32bit counter = 1; while(key_len) { - u32bit T_size = std::min(mac->OUTPUT_LENGTH, key_len); + u32bit T_size = std::min<u32bit>(mac->OUTPUT_LENGTH, key_len); mac->update(salt, salt_size); for(u32bit j = 0; j != 4; ++j) |