octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0'

This commit is contained in:
terrafrost 2022-02-27 01:40:25 -06:00
parent 120cdfb6e3 574953061a
commit 6a6e80ba8f
64 changed files with 289 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/phpcs_ruleset.xml
View File

@ -15,8 +15,5 @@
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
<exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
<exclude name="PSR2.ControlStructures.SwitchDeclaration.TerminatingComment"/>
<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
<exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses"/>
</rule>
</ruleset>

5
composer.json
View File

@ -71,5 +71,10 @@
"psr-4": {
"phpseclib3\\": "phpseclib/"
}
},
"autoload-dev": {
"psr-4": {
"phpseclib3\\Tests\\": "tests/"
}
}
}

2
phpseclib/Crypt/DH.php
View File

@ -279,6 +279,7 @@ abstract class DH extends AsymmetricKey
return $public->publicKey->powMod($private->privateKey, $private->prime)->toBytes(true);
case is_string($public):
$public = new BigInteger($public, -256);
// fall-through
case $public instanceof BigInteger:
return $public->powMod($private->privateKey, $private->prime)->toBytes(true);
default:
@ -290,6 +291,7 @@ abstract class DH extends AsymmetricKey
switch (true) {
case $public instanceof EC\PublicKey:
$public = $public->getEncodedCoordinates();
// fall-through
case is_string($public):
$point = $private->multiply($public);
switch ($private->getCurve()) {

1
phpseclib/Crypt/Hash.php
View File

@ -340,6 +340,7 @@ class Hash
break;
case 'keccak256':
$this->paddingType = self::PADDING_KECCAK;
// fall-through
case 'sha256':
case 'sha512/256':
case 'sha3-256':

1
phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
View File

@ -143,6 +143,7 @@ abstract class MSBLOB
switch ($magic) {
case self::RSA2:
$components['isPublicKey'] = false;
// fall-through
case self::RSA1:
break;
default:

1
phpseclib/Crypt/TripleDES.php
View File

@ -164,6 +164,7 @@ class TripleDES extends DES
break;
case 'cbc3':
$mode = 'cbc';
// fall-through
// If not 3CBC, we init as usual
default:
parent::__construct($mode);

1
phpseclib/File/ANSI.php
View File

@ -268,6 +268,7 @@ class ANSI
array_shift($this->history);
array_shift($this->history_attrs);
}
// fall-through
case "\x1B[K": // Clear screen from cursor right
$this->screen[$this->y] = substr($this->screen[$this->y], 0, $this->x);

11
phpseclib/File/ASN1.php
View File

@ -787,6 +787,7 @@ abstract class ASN1
}
return $values;
}
// fall-through
case self::TYPE_OCTET_STRING:
return $decoded['content'];
case self::TYPE_NULL:
@ -1065,6 +1066,7 @@ abstract class ASN1
break;
}
// fall-through
case self::TYPE_OCTET_STRING:
/* The initial octet shall encode, as an unsigned binary integer with bit 1 as the least significant bit,
the number of unused bits in the final subsequent octet. The number shall be in the range zero to seven.
@ -1385,8 +1387,10 @@ abstract class ASN1
case $insize == 4:
$c = ($c << 8) | ord($in[$i++]);
$c = ($c << 8) | ord($in[$i++]);
// fall-through
case $insize == 2:
$c = ($c << 8) | ord($in[$i++]);
// fall-through
case $insize == 1:
break;
case ($c & 0x80) == 0x00:
@ -1415,9 +1419,11 @@ abstract class ASN1
$c >>= 8;
$v .= chr($c & 0xFF);
$c >>= 8;
// fall-through
case $outsize == 2:
$v .= chr($c & 0xFF);
$c >>= 8;
// fall-through
case $outsize == 1:
$v .= chr($c & 0xFF);
$c >>= 8;
@ -1430,18 +1436,23 @@ abstract class ASN1
case $c >= 0x04000000:
$v .= chr(0x80 | ($c & 0x3F));
$c = ($c >> 6) | 0x04000000;
// fall-through
case $c >= 0x00200000:
$v .= chr(0x80 | ($c & 0x3F));
$c = ($c >> 6) | 0x00200000;
// fall-through
case $c >= 0x00010000:
$v .= chr(0x80 | ($c & 0x3F));
$c = ($c >> 6) | 0x00010000;
// fall-through
case $c >= 0x00000800:
$v .= chr(0x80 | ($c & 0x3F));
$c = ($c >> 6) | 0x00000800;
// fall-through
case $c >= 0x00000080:
$v .= chr(0x80 | ($c & 0x3F));
$c = ($c >> 6) | 0x000000C0;
// fall-through
default:
$v .= chr($c);
break;

1
phpseclib/File/X509.php
View File

@ -3629,6 +3629,7 @@ class X509
switch ($disposition) {
case self::ATTR_REPLACE:
$disposition = self::ATTR_APPEND;
// fall-through
case self::ATTR_ALL:
$this->removeAttribute($id);
break;

2
phpseclib/Net/SFTP.php
View File

@ -718,6 +718,7 @@ class SFTP extends SSH2
switch ($dir) {
case '..':
array_pop($new);
// fall-through
case '.':
break;
default:
@ -1042,6 +1043,7 @@ class SFTP extends SSH2
case 'mode':
$a[$sort] &= 07777;
$b[$sort] &= 07777;
// fall-through
default:
if ($a[$sort] === $b[$sort]) {
break;

7
phpseclib/Net/SSH2.php
View File

@ -1829,6 +1829,7 @@ class SSH2
$nonce = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id);
$this->encryptFixedPart = substr($nonce, 0, 4);
$this->encryptInvocationCounter = substr($nonce, 4, 8);
// fall-through
case 'chacha20-poly1305@openssh.com':
break;
default:
@ -1874,6 +1875,7 @@ class SSH2
$nonce = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id);
$this->decryptFixedPart = substr($nonce, 0, 4);
$this->decryptInvocationCounter = substr($nonce, 4, 8);
// fall-through
case 'chacha20-poly1305@openssh.com':
break;
default:
@ -2203,6 +2205,7 @@ class SSH2
}
}
}
// fall-through
case 'password':
foreach ($args as $key => $arg) {
$newargs[] = $arg;
@ -2310,6 +2313,7 @@ class SSH2
case MessageType::USERAUTH_FAILURE:
list($auth_methods) = Strings::unpackSSH2('L', $response);
$this->auth_methods_to_continue = $auth_methods;
// fall-through
default:
return false;
}
@ -3463,6 +3467,7 @@ class SSH2
if (!$this->isAuthenticated()) {
break;
}
// fall-through
case self::NET_SSH2_COMPRESSION_ZLIB:
if ($this->regenerate_decompression_context) {
$this->regenerate_decompression_context = false;
@ -4022,6 +4027,7 @@ class SSH2
if ($client_channel == $channel) {
return true;
}
// fall-through
case MessageType::CHANNEL_EOF:
break;
default:
@ -4058,6 +4064,7 @@ class SSH2
if (!$this->isAuthenticated()) {
break;
}
// fall-through
case self::NET_SSH2_COMPRESSION_ZLIB:
if (!$this->regenerate_compression_context) {
$header = '';

4
tests/Functional/Net/SFTPLargeFileTest.php
View File

@ -6,9 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Functional\Net;
use phpseclib3\Net\SFTP;
class Functional_Net_SFTPLargeFileTest extends Functional_Net_SFTPTestCase
class SFTPLargeFileTest extends SFTPTestCase
{
public static function setUpBeforeClass()
{

4
tests/Functional/Net/SFTPStreamTest.php
View File

@ -6,9 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Functional\Net;
use phpseclib3\Net\SFTP\Stream;
class Functional_Net_SFTPStreamTest extends Functional_Net_SFTPTestCase
class SFTPStreamTest extends SFTPTestCase
{
public static function setUpBeforeClass()
{

5
tests/Functional/Net/SFTPTestCase.php
View File

@ -6,12 +6,15 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Functional\Net;
use phpseclib3\Net\SFTP;
use phpseclib3\Tests\PhpseclibFunctionalTestCase;
/**
* This class provides each test method with a new and empty $this->scratchDir.
*/
abstract class Functional_Net_SFTPTestCase extends PhpseclibFunctionalTestCase
abstract class SFTPTestCase extends PhpseclibFunctionalTestCase
{
/**
* @var SFTP

5
tests/Functional/Net/SFTPUserStoryTest.php
View File

@ -6,10 +6,13 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Functional\Net;
use phpseclib3\Net\SFTP;
use phpseclib3\Net\SFTP\FileType;
use phpseclib3\Tests\PhpseclibFunctionalTestCase;
class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
class SFTPUserStoryTest extends PhpseclibFunctionalTestCase
{
protected static $scratchDir;
protected static $exampleData;

2
tests/Functional/Net/SFTPWrongServerTest.php
View File

@ -1,5 +1,7 @@
<?php
namespace phpseclib3\Tests\Functional\Net;
use phpseclib3\Exception\UnableToConnectException;
use phpseclib3\Net\SFTP;
use PHPUnit\Framework\TestCase;

5
tests/Functional/Net/SSH2AgentTest.php
View File

@ -6,10 +6,13 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Functional\Net;
use phpseclib3\Net\SSH2;
use phpseclib3\System\SSH\Agent;
use phpseclib3\Tests\PhpseclibFunctionalTestCase;
class Functional_Net_SSH2AgentTest extends PhpseclibFunctionalTestCase
class SSH2AgentTest extends PhpseclibFunctionalTestCase
{
public static function setUpBeforeClass()
{

7
tests/Functional/Net/SSH2Test.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Net\SSH2;
namespace phpseclib3\Tests\Functional\Net;
class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase
use phpseclib3\Net\SSH2;
use phpseclib3\Tests\PhpseclibFunctionalTestCase;
class SSH2Test extends PhpseclibFunctionalTestCase
{
public function testConstructor()
{

1
tests/PhpseclibFunctionalTestCase.php
View File

@ -6,6 +6,7 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests;
abstract class PhpseclibFunctionalTestCase extends PhpseclibTestCase
{

10
tests/PhpseclibTestCase.php
View File

@ -6,7 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
abstract class PhpseclibTestCase extends PHPUnit\Framework\TestCase
namespace phpseclib3\Tests;
use PHPUnit\Framework\TestCase;
abstract class PhpseclibTestCase extends TestCase
{
protected $tempFilesToUnlinkOnTearDown = [];
@ -105,7 +109,7 @@ abstract class PhpseclibTestCase extends PHPUnit\Framework\TestCase
protected static function getVar($obj, $var)
{
$reflection = new ReflectionClass(get_class($obj));
$reflection = new \ReflectionClass(get_class($obj));
$prop = $reflection->getProperty($var);
$prop->setAccessible(true);
return $prop->getValue($obj);
@ -113,7 +117,7 @@ abstract class PhpseclibTestCase extends PHPUnit\Framework\TestCase
public static function callFunc($obj, $func, $params = [])
{
$reflection = new ReflectionClass(get_class($obj));
$reflection = new \ReflectionClass(get_class($obj));
$method = $reflection->getMethod($func);
$method->setAccessible(true);
return $method->invokeArgs($obj, $params);

3
tests/Unit/Crypt/AES/EvalTest.php
View File

@ -6,8 +6,9 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\AES;
class Unit_Crypt_AES_EvalTest extends Unit_Crypt_AES_TestCase
class EvalTest extends TestCase
{
protected function setUp()
{

3
tests/Unit/Crypt/AES/McryptTest.php
View File

@ -6,8 +6,9 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\AES;
class Unit_Crypt_AES_McryptTest extends Unit_Crypt_AES_TestCase
class McryptTest extends TestCase
{
protected function setUp()
{

3
tests/Unit/Crypt/AES/OpenSSLTest.php
View File

@ -6,8 +6,9 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\AES;
class Unit_Crypt_AES_OpenSSLTest extends Unit_Crypt_AES_TestCase
class OpenSSLTest extends TestCase
{
protected function setUp()
{

3
tests/Unit/Crypt/AES/PurePHPTest.php
View File

@ -6,8 +6,9 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\AES;
class Unit_Crypt_AES_PurePHPTest extends Unit_Crypt_AES_TestCase
class PurePHPTest extends TestCase
{
protected function setUp()
{

5
tests/Unit/Crypt/AES/TestCase.php
View File

@ -6,12 +6,15 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\AES;
use phpseclib3\Crypt\AES;
use phpseclib3\Crypt\Rijndael;
use phpseclib3\Exception\InconsistentSetupException;
use phpseclib3\Exception\InsufficientSetupException;
use phpseclib3\Tests\PhpseclibTestCase;
abstract class Unit_Crypt_AES_TestCase extends PhpseclibTestCase
abstract class TestCase extends PhpseclibTestCase
{
protected $engine;

5
tests/Unit/Crypt/BlowfishTest.php
View File

@ -6,10 +6,13 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt;
use phpseclib3\Crypt\Blowfish;
use phpseclib3\Crypt\Random;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_BlowfishTest extends PhpseclibTestCase
class BlowfishTest extends PhpseclibTestCase
{
public function engineVectors()
{

7
tests/Unit/Crypt/ChaCha20Test.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Crypt\ChaCha20;
namespace phpseclib3\Tests\Unit\Crypt;
class Unit_Crypt_ChaCha20Test extends PhpseclibTestCase
use phpseclib3\Crypt\ChaCha20;
use phpseclib3\Tests\PhpseclibTestCase;
class ChaCha20Test extends PhpseclibTestCase
{
// see https://tools.ietf.org/html/rfc8439#section-2.3.2
public function test232()

5
tests/Unit/Crypt/DHTest.php
View File

@ -6,6 +6,8 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt;
use phpseclib3\Crypt\AES;
use phpseclib3\Crypt\DH;
use phpseclib3\Crypt\DH\Parameters;
@ -13,8 +15,9 @@ use phpseclib3\Crypt\DH\PrivateKey;
use phpseclib3\Crypt\DH\PublicKey;
use phpseclib3\Crypt\EC;
use phpseclib3\Math\BigInteger;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_DHTest extends PhpseclibTestCase
class DHTest extends PhpseclibTestCase
{
public function testParametersWithString()
{

9
tests/Unit/Crypt/DSA/CreateKeyTest.php
View File

@ -6,15 +6,18 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\DSA;
use phpseclib3\Crypt\DSA;
use phpseclib3\Crypt\DSA\Parameters;
use phpseclib3\Crypt\DSA\PrivateKey;
use phpseclib3\Crypt\DSA\PublicKey;
use phpseclib3\Tests\PhpseclibTestCase;
/**
* @requires PHP 7.0
*/
class Unit_Crypt_DSA_CreateKeyTestDSA extends PhpseclibTestCase
class CreateKeyTest extends PhpseclibTestCase
{
public function testCreateParameters()
{
@ -24,8 +27,8 @@ class Unit_Crypt_DSA_CreateKeyTestDSA extends PhpseclibTestCase
try {
$dsa = DSA::createParameters(100, 100);
} catch (Exception $e) {
$this->assertInstanceOf(Exception::class, $e);
} catch (\Exception $e) {
$this->assertInstanceOf(\Exception::class, $e);
}
$dsa = DSA::createParameters(512, 160);

5
tests/Unit/Crypt/DSA/LoadDSAKeyTest.php
View File

@ -6,13 +6,16 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\DSA;
use phpseclib3\Crypt\DSA\Parameters;
use phpseclib3\Crypt\DSA\PrivateKey;
use phpseclib3\Crypt\DSA\PublicKey;
use phpseclib3\Crypt\PublicKeyLoader;
use phpseclib3\Exception\NoKeyLoadedException;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_DSA_LoadDSAKeyTest extends PhpseclibTestCase
class LoadDSAKeyTest extends PhpseclibTestCase
{
public function testBadKey()
{

5
tests/Unit/Crypt/DSA/SignatureTest.php
View File

@ -6,10 +6,13 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\DSA;
use phpseclib3\Crypt\DSA;
use phpseclib3\Crypt\PublicKeyLoader;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_DSA_SignatureTest extends PhpseclibTestCase
class SignatureTest extends PhpseclibTestCase
{
public function testPKCSSignature()
{

45
tests/Unit/Crypt/EC/CurveTest.php
View File

@ -6,46 +6,15 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Common\Functions\Strings;
namespace phpseclib3\Tests\Unit\Crypt\EC;
use phpseclib3\Crypt\EC;
use phpseclib3\Crypt\EC\Curves\Ed448;
use phpseclib3\Crypt\PublicKeyLoader;
use phpseclib3\File\ASN1;
use phpseclib3\Tests\PhpseclibTestCase;
class Ed448PublicKey
{
use phpseclib3\Crypt\EC\Formats\Keys\Common;
public static function load($key, $password = '')
{
if (!Strings::is_stringable($key)) {
throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
}
$components = ['curve' => new Ed448()];
$components['QA'] = self::extractPoint($key, $components['curve']);
return $components;
}
}
class Ed448PrivateKey
{
public static function load($key, $password = '')
{
if (!Strings::is_stringable($key)) {
throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
}
$components = ['curve' => new Ed448()];
$components['dA'] = $components['curve']->extractSecret($key);
$components['QA'] = $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
return $components;
}
}
class Unit_Crypt_EC_CurveTest extends PhpseclibTestCase
class CurveTest extends PhpseclibTestCase
{
public function curves()
{
@ -88,7 +57,7 @@ class Unit_Crypt_EC_CurveTest extends PhpseclibTestCase
public function curvesWithOIDs()
{
$class = new ReflectionClass('phpseclib3\Crypt\EC\Formats\Keys\PKCS8');
$class = new \ReflectionClass('phpseclib3\Crypt\EC\Formats\Keys\PKCS8');
$initialize = $class->getMethod('initialize_static_variables');
$initialize->setAccessible(true);
@ -231,8 +200,8 @@ class Unit_Crypt_EC_CurveTest extends PhpseclibTestCase
*/
public function testEd448TestVectors()
{
EC::addFileFormat('Ed448PublicKey');
EC::addFileFormat('Ed448PrivateKey');
EC::addFileFormat(Ed448PublicKey::class);
EC::addFileFormat(Ed448PrivateKey::class);
$private = pack('H*', '6c82a562cb808d10d632be89c8513ebf6c929f34ddfa8c9f63c9960ef6e348a3528c8a3fcc2f044e39a3fc5b94492f8f032e7549a20098f95b');
$public = pack('H*', '5fd7449b59b461fd2ce787ec616ad46a1da1342485a70e1f8a0ea75d80e96778edf124769b46c7061bd6783df1e50f6cd1fa1abeafe8256180');

22
tests/Unit/Crypt/EC/Ed448PrivateKey.php Normal file
View File

@ -0,0 +1,22 @@
<?php
namespace phpseclib3\Tests\Unit\Crypt\EC;
use phpseclib3\Common\Functions\Strings;
use phpseclib3\Crypt\EC\Curves\Ed448;
class Ed448PrivateKey
{
public static function load($key, $password = '')
{
if (!Strings::is_stringable($key)) {
throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
}
$components = ['curve' => new Ed448()];
$components['dA'] = $components['curve']->extractSecret($key);
$components['QA'] = $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
return $components;
}
}

24
tests/Unit/Crypt/EC/Ed448PublicKey.php Normal file
View File

@ -0,0 +1,24 @@
<?php
namespace phpseclib3\Tests\Unit\Crypt\EC;
use phpseclib3\Common\Functions\Strings;
use phpseclib3\Crypt\EC\Curves\Ed448;
use phpseclib3\Crypt\EC\Formats\Keys\Common;
class Ed448PublicKey
{
use Common;
public static function load($key, $password = '')
{
if (!Strings::is_stringable($key)) {
throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
}
$components = ['curve' => new Ed448()];
$components['QA'] = self::extractPoint($key, $components['curve']);
return $components;
}
}

7
tests/Unit/Crypt/EC/KeyTest.php
View File

@ -6,6 +6,8 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\EC;
use phpseclib3\Crypt\EC;
use phpseclib3\Crypt\EC\Formats\Keys\OpenSSH;
use phpseclib3\Crypt\EC\Formats\Keys\PKCS1;
@ -14,8 +16,9 @@ use phpseclib3\Crypt\EC\Formats\Keys\PuTTY;
use phpseclib3\Crypt\EC\Formats\Keys\XML;
use phpseclib3\Crypt\EC\PrivateKey;
use phpseclib3\Crypt\PublicKeyLoader;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_EC_KeyTest extends PhpseclibTestCase
class KeyTest extends PhpseclibTestCase
{
public function testBinaryPKCS1PrivateParameters()
{
@ -458,7 +461,7 @@ pomV7r6gmoMYteGVABfgAAAAD3ZhZ3JhbnRAdmFncmFudAECAwQFBg==
XML::enableRFC4050Syntax();
$dom = new DOMDocument();
$dom = new \DOMDocument();
$dom->preserveWhiteSpace = false;
$dom->loadXML($orig);
$expected = $dom->C14N();

7
tests/Unit/Crypt/GCMTest.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Crypt\AES;
namespace phpseclib3\Tests\Unit\Crypt;
class Unit_Crypt_GCMTest extends PhpseclibTestCase
use phpseclib3\Crypt\AES;
use phpseclib3\Tests\PhpseclibTestCase;
class GCMTest extends PhpseclibTestCase
{
/**
* Produces all combinations of test values.

5
tests/Unit/Crypt/HashTest.php
View File

@ -6,10 +6,13 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt;
use phpseclib3\Crypt\Hash;
use phpseclib3\Exception\UnsupportedAlgorithmException;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_HashTest extends PhpseclibTestCase
class HashTest extends PhpseclibTestCase
{
protected function assertHashesTo($hash, $message, $expected)
{

7
tests/Unit/Crypt/RC2Test.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Crypt\RC2;
namespace phpseclib3\Tests\Unit\Crypt;
class Unit_Crypt_RC2Test extends PhpseclibTestCase
use phpseclib3\Crypt\RC2;
use phpseclib3\Tests\PhpseclibTestCase;
class RC2Test extends PhpseclibTestCase
{
public $engines = [
'PHP',

5
tests/Unit/Crypt/RC4Test.php
View File

@ -6,10 +6,13 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt;
use phpseclib3\Crypt\Random;
use phpseclib3\Crypt\RC4;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_RC4Test extends PhpseclibTestCase
class RC4Test extends PhpseclibTestCase
{
public function engineVectors()
{

5
tests/Unit/Crypt/RSA/CreateKeyTest.php
View File

@ -6,13 +6,16 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\RSA;
use phpseclib3\Crypt\RSA;
use phpseclib3\Crypt\RSA\Formats\Keys\PKCS1;
use phpseclib3\Crypt\RSA\Formats\Keys\PKCS8;
use phpseclib3\Crypt\RSA\PrivateKey;
use phpseclib3\Crypt\RSA\PublicKey;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_RSA_CreateKeyTestRSA extends PhpseclibTestCase
class CreateKeyTestRSA extends PhpseclibTestCase
{
public function testCreateKey()
{

5
tests/Unit/Crypt/RSA/LoadKeyTest.php
View File

@ -6,6 +6,8 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\RSA;
use phpseclib3\Crypt\PublicKeyLoader;
use phpseclib3\Crypt\RSA;
use phpseclib3\Crypt\RSA\Formats\Keys\OpenSSH;
@ -18,8 +20,9 @@ use phpseclib3\Crypt\RSA\PublicKey;
use phpseclib3\Exception\NoKeyLoadedException;
use phpseclib3\Exception\UnsupportedFormatException;
use phpseclib3\Math\BigInteger;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_RSA_LoadKeyTest extends PhpseclibTestCase
class LoadKeyTest extends PhpseclibTestCase
{
public static function setUpBeforeClass()
{

5
tests/Unit/Crypt/RSA/ModeTest.php
View File

@ -6,12 +6,15 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Crypt\RSA;
use phpseclib3\Crypt\PublicKeyLoader;
use phpseclib3\Crypt\RSA;
use phpseclib3\Crypt\RSA\Formats\Keys\PKCS8;
use phpseclib3\Math\BigInteger;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Crypt_RSA_ModeTest extends PhpseclibTestCase
class ModeTest extends PhpseclibTestCase
{
public function testEncryptionModeNone()
{

7
tests/Unit/Crypt/RandomTest.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Crypt\Random;
namespace phpseclib3\Tests\Unit\Crypt;
class Unit_Crypt_RandomTest extends PhpseclibTestCase
use phpseclib3\Crypt\Random;
use phpseclib3\Tests\PhpseclibTestCase;
class RandomTest extends PhpseclibTestCase
{
public function stringLengthData()
{

7
tests/Unit/Crypt/Salsa20Test.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Crypt\Salsa20;
namespace phpseclib3\Tests\Unit\Crypt;
class Unit_Crypt_Salsa20Test extends PhpseclibTestCase
use phpseclib3\Crypt\Salsa20;
use phpseclib3\Tests\PhpseclibTestCase;
class Salsa20Test extends PhpseclibTestCase
{
public function engineVectors()
{

7
tests/Unit/Crypt/TripleDESTest.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Crypt\TripleDES;
namespace phpseclib3\Tests\Unit\Crypt;
class Unit_Crypt_TripleDESTest extends PhpseclibTestCase
use phpseclib3\Crypt\TripleDES;
use phpseclib3\Tests\PhpseclibTestCase;
class TripleDESTest extends PhpseclibTestCase
{
public $engines = [
'PHP',

7
tests/Unit/Crypt/TwofishTest.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Crypt\Twofish;
namespace phpseclib3\Tests\Unit\Crypt;
class Unit_Crypt_TwofishTest extends PhpseclibTestCase
use phpseclib3\Crypt\Twofish;
use phpseclib3\Tests\PhpseclibTestCase;
class TwofishTest extends PhpseclibTestCase
{
public function testVectors()
{

7
tests/Unit/File/ANSITest.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\File\ANSI;
namespace phpseclib3\Tests\Unit\File;
class Unit_File_ANSITest extends PhpseclibTestCase
use phpseclib3\File\ANSI;
use phpseclib3\Tests\PhpseclibTestCase;
class ANSITest extends PhpseclibTestCase
{
public function testCase1()
{

7
tests/Unit/File/ASN1Test.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\File\ASN1;
namespace phpseclib3\Tests\Unit\File;
class Unit_File_ASN1Test extends PhpseclibTestCase
use phpseclib3\File\ASN1;
use phpseclib3\Tests\PhpseclibTestCase;
class ASN1Test extends PhpseclibTestCase
{
/**
* on older versions of \phpseclib3\File\ASN1 this would yield a PHP Warning

7
tests/Unit/File/X509/CRLTest.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\File\X509;
namespace phpseclib3\Tests\Unit\File\X509;
class Unit_File_X509_CRLTest extends PhpseclibTestCase
use phpseclib3\File\X509;
use phpseclib3\Tests\PhpseclibTestCase;
class CRLTest extends PhpseclibTestCase
{
public function testLoadCRL()
{

5
tests/Unit/File/X509/CSRTest.php
View File

@ -6,11 +6,14 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\File\X509;
use phpseclib3\Crypt\PublicKeyLoader;
use phpseclib3\Crypt\RSA;
use phpseclib3\File\X509;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_File_X509_CSRTest extends PhpseclibTestCase
class CSRTest extends PhpseclibTestCase
{
public function testLoadCSR()
{

5
tests/Unit/File/X509/SPKACTest.php
View File

@ -6,10 +6,13 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\File\X509;
use phpseclib3\Crypt\RSA;
use phpseclib3\File\X509;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_File_X509_SPKACTest extends PhpseclibTestCase
class SPKACTest extends PhpseclibTestCase
{
public function testLoadSPKAC()
{

5
tests/Unit/File/X509/X509ExtensionTest.php
View File

@ -6,12 +6,15 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\File\X509;
use phpseclib3\Crypt\EC;
use phpseclib3\Crypt\RSA;
use phpseclib3\File\ASN1;
use phpseclib3\File\X509;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_File_X509_X509ExtensionTest extends PhpseclibTestCase
class X509ExtensionTest extends PhpseclibTestCase
{
public function testCustomExtension()
{

5
tests/Unit/File/X509/X509Test.php
View File

@ -6,13 +6,16 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\File\X509;
use phpseclib3\Crypt\PublicKeyLoader;
use phpseclib3\Crypt\RSA;
use phpseclib3\File\ASN1;
use phpseclib3\File\ASN1\Element;
use phpseclib3\File\X509;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_File_X509_X509Test extends PhpseclibTestCase
class X509Test extends PhpseclibTestCase
{
public function testExtensionMapping()
{

4
tests/Unit/Math/BigInteger/BCMathTest.php
View File

@ -6,9 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Math\BigInteger;
use phpseclib3\Math\BigInteger\Engines\BCMath;
class Unit_Math_BigInteger_BCMathTest extends Unit_Math_BigInteger_TestCase
class BCMathTest extends TestCase
{
public static function setUpBeforeClass()
{

4
tests/Unit/Math/BigInteger/DefaultTest.php
View File

@ -6,9 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Math\BigInteger;
use phpseclib3\Math\BigInteger;
class Unit_Math_BigInteger_DefaultTest extends Unit_Math_BigInteger_TestCase
class DefaultTest extends TestCase
{
public function getInstance($x = 0, $base = 10)
{

4
tests/Unit/Math/BigInteger/GMPTest.php
View File

@ -6,9 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Math\BigInteger;
use phpseclib3\Math\BigInteger\Engines\GMP;
class Unit_Math_BigInteger_GMPTest extends Unit_Math_BigInteger_TestCase
class GMPTest extends TestCase
{
public static function setUpBeforeClass()
{

4
tests/Unit/Math/BigInteger/PHP32Test.php
View File

@ -6,9 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Math\BigInteger;
use phpseclib3\Math\BigInteger\Engines\PHP32;
class Unit_Math_BigInteger_PHP32Test extends Unit_Math_BigInteger_TestCase
class PHP32Test extends TestCase
{
public static function setUpBeforeClass()
{

5
tests/Unit/Math/BigInteger/PHP64OpenSSLTest.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Math\BigInteger;
use phpseclib3\Exception\BadConfigurationException;
use phpseclib3\Math\BigInteger\Engines\PHP64;
class Unit_Math_BigInteger_PHP64OpenSSLTest extends Unit_Math_BigInteger_TestCase
class PHP64OpenSSLTest extends TestCase
{
public static function setUpBeforeClass()
{

4
tests/Unit/Math/BigInteger/PHP64Test.php
View File

@ -6,9 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
namespace phpseclib3\Tests\Unit\Math\BigInteger;
use phpseclib3\Math\BigInteger\Engines\PHP64;
class Unit_Math_BigInteger_PHP64Test extends Unit_Math_BigInteger_TestCase
class PHP64Test extends TestCase
{
public static function setUpBeforeClass()
{

6
tests/Unit/Math/BigInteger/TestCase.php
View File

@ -6,7 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
abstract class Unit_Math_BigInteger_TestCase extends PhpseclibTestCase
namespace phpseclib3\Tests\Unit\Math\BigInteger;
use phpseclib3\Tests\PhpseclibTestCase;
abstract class TestCase extends PhpseclibTestCase
{
public function testConstructorBase2()
{

5
tests/Unit/Math/BigIntegerTest.php
View File

@ -1,12 +1,15 @@
<?php
namespace phpseclib3\Tests\Unit\Math;
use phpseclib3\Math\BigInteger;
use phpseclib3\Math\BigInteger\Engines\BCMath;
use phpseclib3\Math\BigInteger\Engines\GMP;
use phpseclib3\Math\BigInteger\Engines\PHP32;
use phpseclib3\Math\BigInteger\Engines\PHP64;
use phpseclib3\Tests\PhpseclibTestCase;
class Unit_Math_BigIntegerTest extends PhpseclibTestCase
class BigIntegerTest extends PhpseclibTestCase
{
/**
* @param string $className

7
tests/Unit/Net/SFTPStreamUnitTest.php
View File

@ -6,9 +6,12 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use phpseclib3\Net\SFTP\Stream;
namespace phpseclib3\Tests\Unit\Net;
class Unit_Net_SFTPStreamUnitTest extends PhpseclibTestCase
use phpseclib3\Net\SFTP\Stream;
use phpseclib3\Tests\PhpseclibTestCase;
class SFTPStreamUnitTest extends PhpseclibTestCase
{
public function testRegisterWithoutArgument()
{

6
tests/Unit/Net/SSH2UnitTest.php
View File

@ -6,7 +6,11 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
class Unit_Net_SSH2UnitTest extends PhpseclibTestCase
namespace phpseclib3\Tests\Unit\Net;
use phpseclib3\Tests\PhpseclibTestCase;
class SSH2UnitTest extends PhpseclibTestCase
{
public function formatLogDataProvider()
{

14
tests/bootstrap.php
View File

@ -10,11 +10,13 @@ date_default_timezone_set('UTC');
$loader_path = __DIR__ . '/../vendor/autoload.php';
if (!file_exists($loader_path)) {
echo "Dependencies must be installed using composer:\n\n";
echo "php composer.phar install\n\n";
echo "See http://getcomposer.org for help with installing composer\n";
exit(1);
exit(<<<EOF
Dependencies must be installed using composer:
php composer.phar install
See https://getcomposer.org for help with installing composer.
EOF
);
}
$loader = include $loader_path;
$loader->add('', __DIR__);
require $loader_path;