diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-22 16:58:50 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-22 16:58:50 -0400 |
| commit | d08a47d8577c33fcd63bb172d16422e3854b26ed (patch) | |
| tree | ad88a54517448eff24749e147bd8cc74d2d53a62 /phpBB/phpbb/passwords/driver/bcrypt.php | |
| parent | 14bfba5070e42e59376e9cd911652682de055e7d (diff) | |
| parent | fad280f94b97799cf12a636b65f7f2288e8b3640 (diff) | |
| download | forums-d08a47d8577c33fcd63bb172d16422e3854b26ed.tar forums-d08a47d8577c33fcd63bb172d16422e3854b26ed.tar.gz forums-d08a47d8577c33fcd63bb172d16422e3854b26ed.tar.bz2 forums-d08a47d8577c33fcd63bb172d16422e3854b26ed.tar.xz forums-d08a47d8577c33fcd63bb172d16422e3854b26ed.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13203] Fix passwords manager tests
[ticket/13203] Use string_compare method in passwords drivers
[ticket/13203] Add method for byte by byte comparison to drivers helper
Diffstat (limited to 'phpBB/phpbb/passwords/driver/bcrypt.php')
| -rw-r--r-- | phpBB/phpbb/passwords/driver/bcrypt.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/passwords/driver/bcrypt.php b/phpBB/phpbb/passwords/driver/bcrypt.php index 23add37a56..eab1c3d569 100644 --- a/phpBB/phpbb/passwords/driver/bcrypt.php +++ b/phpBB/phpbb/passwords/driver/bcrypt.php @@ -68,7 +68,7 @@ class bcrypt extends base return false; } - if ($hash == $this->hash($password, $salt)) + if ($this->helper->string_compare($hash, $this->hash($password, $salt))) { return true; } |