diff options
| author | Jack Lloyd <[email protected]> | 2017-08-31 12:08:03 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-08-31 12:08:03 -0400 |
| commit | 2d6e56947de655fd39bdb2e9ad34eb7822e39f5b (patch) | |
| tree | d5fec51d83361db7fd5a2dbe056a29a9223d46c5 /src/lib/passhash/bcrypt/bcrypt.cpp | |
| parent | 2799c22fd10506a45df7b84a2352def6c31067ee (diff) | |
| parent | 7fecb1254232311d5f2ca62f9cda1e12a4b2558c (diff) | |
Merge GH #1171 Fix various MSVC warnings
Diffstat (limited to 'src/lib/passhash/bcrypt/bcrypt.cpp')
| -rw-r--r-- | src/lib/passhash/bcrypt/bcrypt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/passhash/bcrypt/bcrypt.cpp b/src/lib/passhash/bcrypt/bcrypt.cpp index 8cea34a97..4f3cda2ae 100644 --- a/src/lib/passhash/bcrypt/bcrypt.cpp +++ b/src/lib/passhash/bcrypt/bcrypt.cpp @@ -138,7 +138,7 @@ bool check_bcrypt(const std::string& pass, const std::string& hash) return false; } - const uint16_t workfactor = to_u32bit(hash.substr(4, 2)); + const uint16_t workfactor = to_uint16(hash.substr(4, 2)); const std::vector<uint8_t> salt = bcrypt_base64_decode(hash.substr(7, 22)); if(salt.size() != 16) |