aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/passwords/driver/sha1_wcf1.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-10-22 16:58:50 -0400
committerNils Adermann <naderman@naderman.de>2014-10-22 16:58:50 -0400
commitd08a47d8577c33fcd63bb172d16422e3854b26ed (patch)
treead88a54517448eff24749e147bd8cc74d2d53a62 /phpBB/phpbb/passwords/driver/sha1_wcf1.php
parent14bfba5070e42e59376e9cd911652682de055e7d (diff)
parentfad280f94b97799cf12a636b65f7f2288e8b3640 (diff)
downloadforums-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/sha1_wcf1.php')
-rw-r--r--phpBB/phpbb/passwords/driver/sha1_wcf1.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/passwords/driver/sha1_wcf1.php b/phpBB/phpbb/passwords/driver/sha1_wcf1.php
index 919fa2bb71..68006486c4 100644
--- a/phpBB/phpbb/passwords/driver/sha1_wcf1.php
+++ b/phpBB/phpbb/passwords/driver/sha1_wcf1.php
@@ -54,7 +54,7 @@ class sha1_wcf1 extends base
else
{
// Works for standard WCF 1.x, i.e. WBB3 and similar
- return $hash === sha1($user_row['user_passwd_salt'] . sha1($user_row['user_passwd_salt'] . sha1($password)));
+ return $this->helper->string_compare($hash, sha1($user_row['user_passwd_salt'] . sha1($user_row['user_passwd_salt'] . sha1($password))));
}
}
}