diff options
author | Marc Alexander <admin@m-a-styles.de> | 2013-06-15 12:10:03 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-14 13:51:44 +0200 |
commit | d3d317a2dea4b3c9c7732975d9a41834ef080a49 (patch) | |
tree | c8d10c3c32443efc60ef5a54da3ea45ba52c2571 | |
parent | c9afda5a655f5eec8819c4c090a0b31a73e35b87 (diff) | |
download | forums-d3d317a2dea4b3c9c7732975d9a41834ef080a49.tar forums-d3d317a2dea4b3c9c7732975d9a41834ef080a49.tar.gz forums-d3d317a2dea4b3c9c7732975d9a41834ef080a49.tar.bz2 forums-d3d317a2dea4b3c9c7732975d9a41834ef080a49.tar.xz forums-d3d317a2dea4b3c9c7732975d9a41834ef080a49.zip |
[feature/passwords] Correctly supply hash salt and settings to bcrypt
PHPBB3-11610
-rw-r--r-- | phpBB/includes/crypto/driver/bcrypt.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/crypto/driver/bcrypt.php b/phpBB/includes/crypto/driver/bcrypt.php index 12400cf376..82ff2fb844 100644 --- a/phpBB/includes/crypto/driver/bcrypt.php +++ b/phpBB/includes/crypto/driver/bcrypt.php @@ -61,9 +61,8 @@ class phpbb_crypto_driver_bcrypt extends phpbb_crypto_driver_base */ public function check($password, $hash) { - $salt = substr($hash, strpos($hash, '$', 4) + 1, 22); - var_dump('bcrypt salt: ' . $salt . ' with length ' . strlen($salt)); - if (strlen($salt) != 22) + $salt = substr($hash, 0, 29); + if (strlen($salt) != 29) { return false; } |