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

Merge branch '2.0'

Browse Source
This commit is contained in:
terrafrost 2016-03-08 16:58:15 -06:00
commit 54deb16da8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/Net/SSH2.php
View File

@ -1394,7 +1394,7 @@ class SSH2
if ($kex_algorithm === 'curve25519-sha256@libssh.org') { if ($kex_algorithm === 'curve25519-sha256@libssh.org') {
$x = Random::string(32); $x = Random::string(32);
$eBytes = \Sodium::crypto_box_publickey_from_secretkey($x); $eBytes = \Sodium\crypto_box_publickey_from_secretkey($x);
$clientKexInitMessage = NET_SSH2_MSG_KEX_ECDH_INIT; $clientKexInitMessage = NET_SSH2_MSG_KEX_ECDH_INIT;
$serverKexReplyMessage = NET_SSH2_MSG_KEX_ECDH_REPLY; $serverKexReplyMessage = NET_SSH2_MSG_KEX_ECDH_REPLY;
$kexHash = new Hash('sha256'); $kexHash = new Hash('sha256');
@ -1536,8 +1536,8 @@ class SSH2
user_error('Received curve25519 public key of invalid length.'); user_error('Received curve25519 public key of invalid length.');
return false; return false;
} }
$key = new BigInteger(\Sodium::crypto_scalarmult($x, $fBytes), 256); $key = new BigInteger(\Sodium\crypto_scalarmult($x, $fBytes), 256);
\Sodium::sodium_memzero($x); \Sodium\memzero($x);
} else { } else {
$f = new BigInteger($fBytes, -256); $f = new BigInteger($fBytes, -256);
$key = $f->modPow($x, $prime); $key = $f->modPow($x, $prime);