Merge branch '2.0'

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

View File

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

View File

@ -41,7 +41,7 @@ class Unit_Net_SSH2Test extends PhpseclibTestCase
$identifier = self::callFunc($this->createSSHMock(), 'generate_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);
}