danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2025-01-22 14:01:20 +01:00
Code Issues Projects Releases Wiki Activity

Hash: use hash extension for sha512/224 & sha512/256 on PHP 7.1+

Browse Source
This commit is contained in:
terrafrost 2017-06-26 21:45:29 -05:00
parent 5fe629a171
commit 62a8047fa1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpseclib/Crypt/Hash.php
View File

@ -86,7 +86,7 @@ class Hash
* *
* Used only for sha512/* * Used only for sha512/*
* *
* @see self::_sha512() * @see self::sha512()
* @var array * @var array
* @access private * @access private
*/ */
@ -252,8 +252,13 @@ class Hash
switch ($this->hash) { switch ($this->hash) {
case 'sha512/224': case 'sha512/224':
case 'sha512/256': case 'sha512/256':
// PHP 7.1.0 introduced sha512/224 and sha512/256 support:
// http://php.net/ChangeLog-7.php#7.1.0
if (version_compare(PHP_VERSION, '7.1.0') >= 0) {
break;
}
if (empty($this->key) || !is_string($this->key)) { if (empty($this->key) || !is_string($this->key)) {
return substr(self::_sha512($text, $this->initial), 0, $this->length); return substr(self::sha512($text, $this->initial), 0, $this->length);
} }
/* "Applications that use keys longer than B bytes will first hash the key using H and then use the /* "Applications that use keys longer than B bytes will first hash the key using H and then use the
resultant L byte string as the actual key to HMAC." resultant L byte string as the actual key to HMAC."
@ -264,10 +269,10 @@ class Hash
$key = str_pad($this->key, 128, chr(0)); // step 1 $key = str_pad($this->key, 128, chr(0)); // step 1
$temp = $this->ipad ^ $this->key; // step 2 $temp = $this->ipad ^ $this->key; // step 2
$temp .= $text; // step 3 $temp .= $text; // step 3
$temp = self::_sha512($temp, $this->initial); // step 4 $temp = self::sha512($temp, $this->initial); // step 4
$output = $this->opad ^ $this->key; // step 5 $output = $this->opad ^ $this->key; // step 5
$output.= $temp; // step 6 $output.= $temp; // step 6
$output = self::_sha512($output, $this->initial); // step 7 $output = self::sha512($output, $this->initial); // step 7
return substr($output, 0, $this->length); return substr($output, 0, $this->length);
} }
@ -330,7 +335,7 @@ class Hash
* @access private * @access private
* @param string $m * @param string $m
*/ */
private static function _sha512($m, $hash) private static function sha512($m, $hash)
{ {
static $k; static $k;