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

Merge branch '2.0'

Browse Source
This commit is contained in:
terrafrost 2017-09-29 21:34:51 +01:00
commit fc6a97083c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Net/SSH2.php
View File

@ -1267,7 +1267,7 @@ class SSH2
$identifier = 'SSH-2.0-phpseclib_2.0'; $identifier = 'SSH-2.0-phpseclib_2.0';
$ext = []; $ext = [];
if (extension_loaded('libsodium')) { if (function_exists('\\Sodium\\library_version_major')) {
$ext[] = 'libsodium'; $ext[] = 'libsodium';
} }

2
tests/Unit/Net/SSH2Test.php
View File

@ -41,7 +41,7 @@ class Unit_Net_SSH2Test extends PhpseclibTestCase
$identifier = self::callFunc($this->createSSHMock(), 'generate_identifier'); $identifier = self::callFunc($this->createSSHMock(), 'generate_identifier');
$this->assertStringStartsWith('SSH-2.0-phpseclib_2.0', $identifier); $this->assertStringStartsWith('SSH-2.0-phpseclib_2.0', $identifier);
if (extension_loaded('libsodium')) { if (function_exists('\\Sodium\\library_version_major')) {
$this->assertContains('libsodium', $identifier); $this->assertContains('libsodium', $identifier);
} }