makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/passwords] Add missing function documentation

Browse source 
Additionally, a new line has been added to make the code look nicer.

PHPBB3-11610
This commit is contained in:
Marc Alexander 2013-09-14 14:17:14 +02:00
parent 19512b2595
commit beafef0000
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/phpbb/passwords/manager.php
View file

@ -140,6 +140,7 @@ class phpbb_passwords_manager
} }
return $return_ary; return $return_ary;
} }
if (isset($this->type_map[$match[0]])) if (isset($this->type_map[$match[0]]))
{ {
return $this->type_map[$match[0]]; return $this->type_map[$match[0]];
@ -169,7 +170,9 @@ class phpbb_passwords_manager
} }
$hashing_algorithm = $this->container->get($type); $hashing_algorithm = $this->container->get($type);
// Do not support 8-bit characters with $2a$ bcrypt // Do not support 8-bit characters with $2a$ bcrypt
// Also see http://www.php.net/security/crypt_blowfish.php
if ($type === 'passwords.driver.bcrypt' || ($type === 'passwords.driver.bcrypt_2y' && !$hashing_algorithm->is_supported())) if ($type === 'passwords.driver.bcrypt' || ($type === 'passwords.driver.bcrypt_2y' && !$hashing_algorithm->is_supported()))
{ {
if (ord($password[strlen($password)-1]) & 128) if (ord($password[strlen($password)-1]) & 128)
@ -181,6 +184,14 @@ class phpbb_passwords_manager
return $this->container->get($type)->hash($password); return $this->container->get($type)->hash($password);
} }
/**
* Check supplied password against hash and set convert_flag if password
* needs to be converted to different format (preferrably newer one)
*
* @param string $password Password that should be checked
* @param string $hash Stored hash
* @return string|bool True if password is correct, false if not
*/
public function check_hash($password, $hash) public function check_hash($password, $hash)
{ {
// First find out what kind of hash we're dealing with // First find out what kind of hash we're dealing with