aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/pbkdf/scrypt
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2019-06-29 16:16:21 -0400
committerJack Lloyd <[email protected]>2019-06-29 17:11:19 -0400
commit8b8745236368c70a82db2b19feeed5e9f9b59c5b (patch)
tree1495a04a7e6f117e2cacd69ff0f7b2c4a31ddee9 /src/lib/pbkdf/scrypt
parent5922b1c3abf00c0e22e86498e1ee3a51e5343b0f (diff)
Fix various MSVC warnings
Diffstat (limited to 'src/lib/pbkdf/scrypt')
-rw-r--r--src/lib/pbkdf/scrypt/scrypt.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/pbkdf/scrypt/scrypt.cpp b/src/lib/pbkdf/scrypt/scrypt.cpp
index d493c17e1..8275ac956 100644
--- a/src/lib/pbkdf/scrypt/scrypt.cpp
+++ b/src/lib/pbkdf/scrypt/scrypt.cpp
@@ -97,7 +97,7 @@ std::unique_ptr<PasswordHash> Scrypt_Family::tune(size_t output_length,
// If we have extra runtime budget, increment p
if(target_nsec / est_nsec > 2)
- p *= std::min<uint64_t>(1024, (target_nsec / est_nsec));
+ p *= std::min<size_t>(1024, static_cast<size_t>(target_nsec / est_nsec));
return std::unique_ptr<PasswordHash>(new Scrypt(N, r, p));
}