0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow all official forms of bcrypt supported by PHP

Browse source 
Tested with $2a$, $2b$, $2x$ and $2y$. Also tested $2a$ converted to $2x$, and $2b$ converted to $2y$.

In addition, tested handling of short salt values (terminated with $), as supported by PHP as a hack (including PHP's bugs, as embodied in crypt_blowfish.c).
This commit is contained in:
Gregory A Lundberg 2018-02-27 08:42:24 -06:00 • committed by Gregory A Lundberg
parent a3c46d3639
commit 0407ee40ac
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/hash.cpp
View file

@ -181,7 +181,10 @@ bcrypt bcrypt::hash_pw(const std::string& password, bcrypt& salt)
}
bool bcrypt::is_valid_prefix(const std::string& hash) {
return hash.compare(0, 4, "$2y$") == 0;
return ((hash.compare(0, 4, "$2a$") == 0)
|| (hash.compare(0, 4, "$2b$") == 0)
|| (hash.compare(0, 4, "$2x$") == 0)
|| (hash.compare(0, 4, "$2y$") == 0));
}
std::string bcrypt::get_salt() const