octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 02:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0'

Browse Source
This commit is contained in:
terrafrost 2018-05-27 10:54:36 -05:00
commit 03f9a4dc7e
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Net/SSH2.php
View File

@ -4634,7 +4634,7 @@ class SSH2
default: default:
$hash = 'sha1'; $hash = 'sha1';
} }
$hashObj = new Crypt_Hash($hash); $hashObj = new Hash($hash);
switch ($this->signature_format) { switch ($this->signature_format) {
case 'rsa-sha2-512': case 'rsa-sha2-512':
$h = pack('N5a*', 0x00305130, 0x0D060960, 0x86480165, 0x03040203, 0x05000440, $hashObj->hash($this->exchange_hash)); $h = pack('N5a*', 0x00305130, 0x0D060960, 0x86480165, 0x03040203, 0x05000440, $hashObj->hash($this->exchange_hash));

4
phpseclib/System/SSH/Agent.php
View File

@ -323,6 +323,7 @@ class Agent
return pack('Na*', $agent_reply_bytes, $agent_reply_data); return pack('Na*', $agent_reply_bytes, $agent_reply_data);
} }
<<<<<<< HEAD
/** /**
* Forward data to SSH Agent and return data reply * Forward data to SSH Agent and return data reply
@ -338,3 +339,6 @@ class Agent
Objects::setVar($ssh, 'channel_status', $temp); Objects::setVar($ssh, 'channel_status', $temp);
} }
} }
=======
}
>>>>>>> 2.0

12
phpseclib/System/SSH/Agent/Identity.php
View File

@ -132,6 +132,18 @@ class Identity
} }
} }
/**
* Set Hash
*
* ssh-agent doesn't support using hashes for RSA other than SHA1
*
* @param string $hash
* @access public
*/
function setHash($hash)
{
}
/** /**
* Create a signature * Create a signature
* *