octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 11:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2019-03-08 08:34:58 -06:00
commit 07ffe647f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpseclib/Crypt/Hash.php
View File

@ -190,7 +190,7 @@ class Hash
*
* @access private
*/
function _computeKey()
function _computeKey($mode)
{
if ($this->key === false) {
$this->computedKey = false;
@ -306,7 +306,7 @@ class Hash
default:
$this->hash = MHASH_SHA1;
}
$this->_computeKey();
$this->_computeKey(CRYPT_HASH_MODE_MHASH);
return;
case self::MODE_HASH:
switch ($hash) {
@ -323,7 +323,7 @@ class Hash
default:
$this->hash = 'sha1';
}
$this->_computeKey();
$this->_computeKey(CRYPT_HASH_MODE_HASH);
return;
}
@ -349,7 +349,7 @@ class Hash
$this->ipad = str_repeat(chr(0x36), $this->b);
$this->opad = str_repeat(chr(0x5C), $this->b);
$this->_computeKey();
$this->_computeKey(CRYPT_HASH_MODE_INTERNAL);
}
/**