aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-05-29 12:13:02 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-06-01 21:31:05 +0200
commit252a061864b631ac2536f589d9c7da3810d82357 (patch)
treeeafd3d1589e01ae1997dc90c9ed20fb6e869fdb9 /phpBB
parentaf25aef04ca3ee39cd1597b356638e883ccf72fa (diff)
downloadforums-252a061864b631ac2536f589d9c7da3810d82357.tar
forums-252a061864b631ac2536f589d9c7da3810d82357.tar.gz
forums-252a061864b631ac2536f589d9c7da3810d82357.tar.bz2
forums-252a061864b631ac2536f589d9c7da3810d82357.tar.xz
forums-252a061864b631ac2536f589d9c7da3810d82357.zip
[ticket/12352] Use correct hashing method in md5_mybb driver
PHPBB3-12352
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/passwords/driver/md5_mybb.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/phpbb/passwords/driver/md5_mybb.php b/phpBB/phpbb/passwords/driver/md5_mybb.php
index 9406546798..ca416c4401 100644
--- a/phpBB/phpbb/passwords/driver/md5_mybb.php
+++ b/phpBB/phpbb/passwords/driver/md5_mybb.php
@@ -46,7 +46,15 @@ class md5_mybb extends base
*/
public function check($password, $hash, $user_row = array())
{
- return (!empty($hash) && isset($user_row['user_passwd_salt'])) ? $hash === md5($user_row['user_passwd_salt'] . md5($password)) : false;
+ if (empty(hash) || !isset($user_row['user_passwd_salt']))
+ {
+ return false;
+ }
+ else
+ {
+ // Works for myBB 1.1.x, 1.2.x, 1.4.x, 1.6.x
+ return $hash === md5(md5($user_row['user_passwd_salt']) . md5($password));
+ }
}
/**