mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-12-28 12:10:59 +00:00
Merge branch '1.0' into 2.0
This commit is contained in:
commit
99dcf43a7a
@ -649,10 +649,10 @@ abstract class Base
|
|||||||
case !function_exists('hash_algos'):
|
case !function_exists('hash_algos'):
|
||||||
case !in_array($hash, hash_algos()):
|
case !in_array($hash, hash_algos()):
|
||||||
$i = 1;
|
$i = 1;
|
||||||
while (strlen($key) < $dkLen) {
|
|
||||||
$hmac = new Hash();
|
$hmac = new Hash();
|
||||||
$hmac->setHash($hash);
|
$hmac->setHash($hash);
|
||||||
$hmac->setKey($password);
|
$hmac->setKey($password);
|
||||||
|
while (strlen($key) < $dkLen) {
|
||||||
$f = $u = $hmac->hash($salt . pack('N', $i++));
|
$f = $u = $hmac->hash($salt . pack('N', $i++));
|
||||||
for ($j = 2; $j <= $count; ++$j) {
|
for ($j = 2; $j <= $count; ++$j) {
|
||||||
$u = $hmac->hash($u);
|
$u = $hmac->hash($u);
|
||||||
|
Loading…
Reference in New Issue
Block a user