aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/passwords/driver/salted_md5.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/phpbb/passwords/driver/salted_md5.php')
-rw-r--r--phpBB/phpbb/passwords/driver/salted_md5.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php
index 72db8d200f..5c72726422 100644
--- a/phpBB/phpbb/passwords/driver/salted_md5.php
+++ b/phpBB/phpbb/passwords/driver/salted_md5.php
@@ -122,8 +122,11 @@ class salted_md5 extends base
/**
* Get hash settings
*
- * @return array Array containing the count_log2, salt, and full hash
- * settings string
+ * @param string $hash The hash that contains the settings
+ *
+ * @return bool|array Array containing the count_log2, salt, and full
+ * hash settings string or false if supplied hash is empty
+ * or contains incorrect settings
*/
public function get_hash_settings($hash)
{
@@ -131,6 +134,7 @@ class salted_md5 extends base
{
return false;
}
+
$count_log2 = strpos($this->helper->itoa64, $hash[3]);
$salt = substr($hash, 4, 8);