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

SSH2: use libsodium PHP 7.2 API

Browse Source
This commit is contained in:
terrafrost 2019-09-07 20:10:15 -05:00
parent 18681de192
commit 7d74163825
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpseclib/Net/SSH2.php
View File

@ -1290,7 +1290,7 @@ class SSH2
$identifier = 'SSH-2.0-phpseclib_2.0'; $identifier = 'SSH-2.0-phpseclib_2.0';
$ext = array(); $ext = array();
if (function_exists('\\Sodium\\library_version_major')) { if (function_exists('sodium_crypto_box_publickey_from_secretkey')) {
$ext[] = 'libsodium'; $ext[] = 'libsodium';
} }
@ -1526,7 +1526,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');
@ -1698,8 +1698,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\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);
@ -4488,7 +4488,7 @@ class SSH2
'diffie-hellman-group1-sha1', // REQUIRED 'diffie-hellman-group1-sha1', // REQUIRED
); );
if (!function_exists('\\Sodium\\library_version_major')) { if (!function_exists('sodium_crypto_box_publickey_from_secretkey')) {
$kex_algorithms = array_diff( $kex_algorithms = array_diff(
$kex_algorithms, $kex_algorithms,
array('curve25519-sha256@libssh.org') array('curve25519-sha256@libssh.org')