fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-05 03:22:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Improve error handling in PBKDF2 hashing routine

Browse source
This commit is contained in:
Kijin Sung 2016-03-20 00:52:17 +09:00
parent 770644d114
commit 787bcd658b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/framework/password.php
View file

@ -218,7 +218,7 @@ class Password
{
$salt = Security::getRandom(12, 'alnum');
$hash_algorithm = 'sha512';
$iterations = pow(2, self::getWorkFactor() + 5);
$iterations = intval(pow(2, self::getWorkFactor() + 5)) ?: 16384;
$key_length = 24;
}
else
@ -226,7 +226,7 @@ class Password
$parts = explode(':', $salt);
$salt = $parts[2];
$hash_algorithm = $parts[0];
$iterations = $parts[1];
$iterations = intval($parts[1], 10);
$key_length = strlen(base64_decode($parts[3]));
}
return self::pbkdf2($hashchain, $salt, $hash_algorithm, $iterations, $key_length);