1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-04 15:57:45 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10101] Add test case for native phpass hashes
  [ticket/10101] Add support for native phpass hashes
This commit is contained in:
Oleg Pudeyev
2011-03-22 21:25:14 -04:00
2 changed files with 22 additions and 1 deletions

View File

@@ -458,7 +458,7 @@ function _hash_crypt_private($password, $setting, &$itoa64)
$output = '*';
// Check for correct hash
if (substr($setting, 0, 3) != '$H$')
if (substr($setting, 0, 3) != '$H$' && substr($setting, 0, 3) != '$P$')
{
return $output;
}