From 7012e724881ac479866d05e78dbe6fd25fe5a90b Mon Sep 17 00:00:00 2001 From: terrafrost Date: Mon, 24 Jun 2019 22:44:10 -0500 Subject: [PATCH] mv Keys/ and Signature/ to Formats/* --- phpseclib/Crypt/Common/AsymmetricKey.php | 4 ++-- phpseclib/Crypt/Common/{ => Formats}/Keys/OpenSSH.php | 2 +- phpseclib/Crypt/Common/{ => Formats}/Keys/PKCS.php | 2 +- phpseclib/Crypt/Common/{ => Formats}/Keys/PKCS1.php | 2 +- phpseclib/Crypt/Common/{ => Formats}/Keys/PKCS8.php | 2 +- phpseclib/Crypt/Common/{ => Formats}/Keys/PuTTY.php | 2 +- phpseclib/Crypt/Common/{ => Formats}/Signature/Raw.php | 2 +- phpseclib/Crypt/DSA/{ => Formats}/Keys/OpenSSH.php | 4 ++-- phpseclib/Crypt/DSA/{ => Formats}/Keys/PKCS1.php | 4 ++-- phpseclib/Crypt/DSA/{ => Formats}/Keys/PKCS8.php | 4 ++-- phpseclib/Crypt/DSA/{ => Formats}/Keys/PuTTY.php | 6 +++--- phpseclib/Crypt/DSA/{ => Formats}/Keys/Raw.php | 2 +- phpseclib/Crypt/DSA/{ => Formats}/Keys/XML.php | 2 +- phpseclib/Crypt/DSA/{ => Formats}/Signature/ASN1.php | 2 +- phpseclib/Crypt/DSA/{ => Formats}/Signature/Raw.php | 4 ++-- phpseclib/Crypt/DSA/{ => Formats}/Signature/SSH2.php | 2 +- phpseclib/Crypt/DSA/PrivateKey.php | 2 +- phpseclib/Crypt/DSA/PublicKey.php | 2 +- phpseclib/Crypt/ECDSA.php | 2 +- phpseclib/Crypt/ECDSA/{ => Formats}/Keys/Common.php | 4 ++-- phpseclib/Crypt/ECDSA/{ => Formats}/Keys/OpenSSH.php | 4 ++-- phpseclib/Crypt/ECDSA/{ => Formats}/Keys/PKCS1.php | 4 ++-- phpseclib/Crypt/ECDSA/{ => Formats}/Keys/PKCS8.php | 4 ++-- phpseclib/Crypt/ECDSA/{ => Formats}/Keys/PuTTY.php | 6 +++--- phpseclib/Crypt/ECDSA/{ => Formats}/Keys/XML.php | 2 +- phpseclib/Crypt/ECDSA/{ => Formats}/Keys/libsodium.php | 2 +- phpseclib/Crypt/ECDSA/{ => Formats}/Signature/ASN1.php | 2 +- phpseclib/Crypt/ECDSA/{ => Formats}/Signature/Raw.php | 4 ++-- phpseclib/Crypt/ECDSA/{ => Formats}/Signature/SSH2.php | 2 +- phpseclib/Crypt/ECDSA/PrivateKey.php | 4 ++-- phpseclib/Crypt/ECDSA/PublicKey.php | 6 +++--- phpseclib/Crypt/RSA.php | 2 +- phpseclib/Crypt/RSA/{ => Formats}/Keys/MSBLOB.php | 2 +- phpseclib/Crypt/RSA/{ => Formats}/Keys/OpenSSH.php | 4 ++-- phpseclib/Crypt/RSA/{ => Formats}/Keys/PKCS1.php | 4 ++-- phpseclib/Crypt/RSA/{ => Formats}/Keys/PKCS8.php | 4 ++-- phpseclib/Crypt/RSA/{ => Formats}/Keys/PSS.php | 4 ++-- phpseclib/Crypt/RSA/{ => Formats}/Keys/PuTTY.php | 6 +++--- phpseclib/Crypt/RSA/{ => Formats}/Keys/Raw.php | 2 +- phpseclib/Crypt/RSA/{ => Formats}/Keys/XML.php | 2 +- phpseclib/Crypt/RSA/PrivateKey.php | 2 +- phpseclib/Crypt/RSA/PublicKey.php | 2 +- phpseclib/Math/BigInteger/Engines/OpenSSL.php | 2 +- phpseclib/Net/SSH2.php | 1 - tests/Unit/Crypt/DSA/LoadKeyTest.php | 6 +++--- tests/Unit/Crypt/ECDSA/CurveTest.php | 4 ++-- tests/Unit/Crypt/ECDSA/KeyTest.php | 10 +++++----- tests/Unit/Crypt/RSA/CreateKeyTest.php | 2 +- tests/Unit/Crypt/RSA/LoadKeyTest.php | 10 +++++----- tests/Unit/Crypt/RSA/ModeTest.php | 2 +- 50 files changed, 83 insertions(+), 84 deletions(-) rename phpseclib/Crypt/Common/{ => Formats}/Keys/OpenSSH.php (99%) rename phpseclib/Crypt/Common/{ => Formats}/Keys/PKCS.php (96%) rename phpseclib/Crypt/Common/{ => Formats}/Keys/PKCS1.php (99%) rename phpseclib/Crypt/Common/{ => Formats}/Keys/PKCS8.php (99%) rename phpseclib/Crypt/Common/{ => Formats}/Keys/PuTTY.php (99%) rename phpseclib/Crypt/Common/{ => Formats}/Signature/Raw.php (96%) rename phpseclib/Crypt/DSA/{ => Formats}/Keys/OpenSSH.php (97%) rename phpseclib/Crypt/DSA/{ => Formats}/Keys/PKCS1.php (97%) rename phpseclib/Crypt/DSA/{ => Formats}/Keys/PKCS8.php (97%) rename phpseclib/Crypt/DSA/{ => Formats}/Keys/PuTTY.php (95%) rename phpseclib/Crypt/DSA/{ => Formats}/Keys/Raw.php (98%) rename phpseclib/Crypt/DSA/{ => Formats}/Keys/XML.php (99%) rename phpseclib/Crypt/DSA/{ => Formats}/Signature/ASN1.php (96%) rename phpseclib/Crypt/DSA/{ => Formats}/Signature/Raw.php (80%) rename phpseclib/Crypt/DSA/{ => Formats}/Signature/SSH2.php (97%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Keys/Common.php (99%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Keys/OpenSSH.php (98%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Keys/PKCS1.php (97%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Keys/PKCS8.php (98%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Keys/PuTTY.php (96%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Keys/XML.php (99%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Keys/libsodium.php (98%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Signature/ASN1.php (96%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Signature/Raw.php (80%) rename phpseclib/Crypt/ECDSA/{ => Formats}/Signature/SSH2.php (97%) rename phpseclib/Crypt/RSA/{ => Formats}/Keys/MSBLOB.php (99%) rename phpseclib/Crypt/RSA/{ => Formats}/Keys/OpenSSH.php (97%) rename phpseclib/Crypt/RSA/{ => Formats}/Keys/PKCS1.php (97%) rename phpseclib/Crypt/RSA/{ => Formats}/Keys/PKCS8.php (97%) rename phpseclib/Crypt/RSA/{ => Formats}/Keys/PSS.php (98%) rename phpseclib/Crypt/RSA/{ => Formats}/Keys/PuTTY.php (95%) rename phpseclib/Crypt/RSA/{ => Formats}/Keys/Raw.php (98%) rename phpseclib/Crypt/RSA/{ => Formats}/Keys/XML.php (99%) diff --git a/phpseclib/Crypt/Common/AsymmetricKey.php b/phpseclib/Crypt/Common/AsymmetricKey.php index d19d8c06..313cbc10 100644 --- a/phpseclib/Crypt/Common/AsymmetricKey.php +++ b/phpseclib/Crypt/Common/AsymmetricKey.php @@ -224,12 +224,12 @@ abstract class AsymmetricKey { if (!isset(self::$plugins[static::ALGORITHM][$format])) { self::$plugins[static::ALGORITHM][$format] = []; - foreach (new \DirectoryIterator(__DIR__ . '/../' . static::ALGORITHM . '/' . $format . '/') as $file) { + foreach (new \DirectoryIterator(__DIR__ . '/../' . static::ALGORITHM . '/Formats/' . $format . '/') as $file) { if ($file->getExtension() != 'php') { continue; } $name = $file->getBasename('.php'); - $type = 'phpseclib\Crypt\\' . static::ALGORITHM . '\\' . $format . '\\' . $name; + $type = 'phpseclib\Crypt\\' . static::ALGORITHM . '\\Formats\\' . $format . '\\' . $name; $reflect = new \ReflectionClass($type); if ($reflect->isTrait()) { continue; diff --git a/phpseclib/Crypt/Common/Keys/OpenSSH.php b/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php similarity index 99% rename from phpseclib/Crypt/Common/Keys/OpenSSH.php rename to phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php index 5d65dc1a..b56b51f1 100644 --- a/phpseclib/Crypt/Common/Keys/OpenSSH.php +++ b/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php @@ -15,7 +15,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\Common\Keys; +namespace phpseclib\Crypt\Common\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Common\Functions\Strings; diff --git a/phpseclib/Crypt/Common/Keys/PKCS.php b/phpseclib/Crypt/Common/Formats/Keys/PKCS.php similarity index 96% rename from phpseclib/Crypt/Common/Keys/PKCS.php rename to phpseclib/Crypt/Common/Formats/Keys/PKCS.php index 7b54b166..5d87d5d0 100644 --- a/phpseclib/Crypt/Common/Keys/PKCS.php +++ b/phpseclib/Crypt/Common/Formats/Keys/PKCS.php @@ -13,7 +13,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\Common\Keys; +namespace phpseclib\Crypt\Common\Formats\Keys; /** * PKCS1 Formatted Key Handler diff --git a/phpseclib/Crypt/Common/Keys/PKCS1.php b/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php similarity index 99% rename from phpseclib/Crypt/Common/Keys/PKCS1.php rename to phpseclib/Crypt/Common/Formats/Keys/PKCS1.php index 9b964aad..ba8a028c 100644 --- a/phpseclib/Crypt/Common/Keys/PKCS1.php +++ b/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php @@ -13,7 +13,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\Common\Keys; +namespace phpseclib\Crypt\Common\Formats\Keys; use ParagonIE\ConstantTime\Base64; use ParagonIE\ConstantTime\Hex; diff --git a/phpseclib/Crypt/Common/Keys/PKCS8.php b/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php similarity index 99% rename from phpseclib/Crypt/Common/Keys/PKCS8.php rename to phpseclib/Crypt/Common/Formats/Keys/PKCS8.php index 5c968027..4b2c51f8 100644 --- a/phpseclib/Crypt/Common/Keys/PKCS8.php +++ b/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php @@ -25,7 +25,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\Common\Keys; +namespace phpseclib\Crypt\Common\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Crypt\DES; diff --git a/phpseclib/Crypt/Common/Keys/PuTTY.php b/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php similarity index 99% rename from phpseclib/Crypt/Common/Keys/PuTTY.php rename to phpseclib/Crypt/Common/Formats/Keys/PuTTY.php index 87b6f067..553a1ddd 100644 --- a/phpseclib/Crypt/Common/Keys/PuTTY.php +++ b/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php @@ -13,7 +13,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\Common\Keys; +namespace phpseclib\Crypt\Common\Formats\Keys; use ParagonIE\ConstantTime\Base64; use ParagonIE\ConstantTime\Hex; diff --git a/phpseclib/Crypt/Common/Signature/Raw.php b/phpseclib/Crypt/Common/Formats/Signature/Raw.php similarity index 96% rename from phpseclib/Crypt/Common/Signature/Raw.php rename to phpseclib/Crypt/Common/Formats/Signature/Raw.php index 7977417c..9f97e08c 100644 --- a/phpseclib/Crypt/Common/Signature/Raw.php +++ b/phpseclib/Crypt/Common/Formats/Signature/Raw.php @@ -15,7 +15,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\Common\Signature; +namespace phpseclib\Crypt\Common\Formats\Signature; use phpseclib\Math\BigInteger; diff --git a/phpseclib/Crypt/DSA/Keys/OpenSSH.php b/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php similarity index 97% rename from phpseclib/Crypt/DSA/Keys/OpenSSH.php rename to phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php index f5a64833..75c13555 100644 --- a/phpseclib/Crypt/DSA/Keys/OpenSSH.php +++ b/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php @@ -15,12 +15,12 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\DSA\Keys; +namespace phpseclib\Crypt\DSA\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Math\BigInteger; use phpseclib\Common\Functions\Strings; -use phpseclib\Crypt\Common\Keys\OpenSSH as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\OpenSSH as Progenitor; /** * OpenSSH Formatted DSA Key Handler diff --git a/phpseclib/Crypt/DSA/Keys/PKCS1.php b/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php similarity index 97% rename from phpseclib/Crypt/DSA/Keys/PKCS1.php rename to phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php index 2b028156..fd1efcf2 100644 --- a/phpseclib/Crypt/DSA/Keys/PKCS1.php +++ b/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php @@ -27,10 +27,10 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\DSA\Keys; +namespace phpseclib\Crypt\DSA\Formats\Keys; use phpseclib\Math\BigInteger; -use phpseclib\Crypt\Common\Keys\PKCS1 as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PKCS1 as Progenitor; use phpseclib\File\ASN1; use phpseclib\File\ASN1\Maps; use ParagonIE\ConstantTime\Base64; diff --git a/phpseclib/Crypt/DSA/Keys/PKCS8.php b/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php similarity index 97% rename from phpseclib/Crypt/DSA/Keys/PKCS8.php rename to phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php index d4cc8f11..d8e2796a 100644 --- a/phpseclib/Crypt/DSA/Keys/PKCS8.php +++ b/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php @@ -23,10 +23,10 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\DSA\Keys; +namespace phpseclib\Crypt\DSA\Formats\Keys; use phpseclib\Math\BigInteger; -use phpseclib\Crypt\Common\Keys\PKCS8 as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PKCS8 as Progenitor; use phpseclib\File\ASN1; use phpseclib\File\ASN1\Maps; diff --git a/phpseclib/Crypt/DSA/Keys/PuTTY.php b/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php similarity index 95% rename from phpseclib/Crypt/DSA/Keys/PuTTY.php rename to phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php index 8801148b..46a47153 100644 --- a/phpseclib/Crypt/DSA/Keys/PuTTY.php +++ b/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php @@ -18,11 +18,11 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\DSA\Keys; +namespace phpseclib\Crypt\DSA\Formats\Keys; use phpseclib\Math\BigInteger; use phpseclib\Common\Functions\Strings; -use phpseclib\Crypt\Common\Keys\PuTTY as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PuTTY as Progenitor; /** * PuTTY Formatted DSA Key Handler @@ -39,7 +39,7 @@ abstract class PuTTY extends Progenitor * @var string * @access private */ - const PUBLIC_HANDLER = 'phpseclib\Crypt\DSA\Keys\OpenSSH'; + const PUBLIC_HANDLER = 'phpseclib\Crypt\DSA\Formats\Keys\OpenSSH'; /** * Algorithm Identifier diff --git a/phpseclib/Crypt/DSA/Keys/Raw.php b/phpseclib/Crypt/DSA/Formats/Keys/Raw.php similarity index 98% rename from phpseclib/Crypt/DSA/Keys/Raw.php rename to phpseclib/Crypt/DSA/Formats/Keys/Raw.php index 568c1821..d6118c66 100644 --- a/phpseclib/Crypt/DSA/Keys/Raw.php +++ b/phpseclib/Crypt/DSA/Formats/Keys/Raw.php @@ -15,7 +15,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\DSA\Keys; +namespace phpseclib\Crypt\DSA\Formats\Keys; use phpseclib\Math\BigInteger; diff --git a/phpseclib/Crypt/DSA/Keys/XML.php b/phpseclib/Crypt/DSA/Formats/Keys/XML.php similarity index 99% rename from phpseclib/Crypt/DSA/Keys/XML.php rename to phpseclib/Crypt/DSA/Formats/Keys/XML.php index d6a8725b..0b900a7f 100644 --- a/phpseclib/Crypt/DSA/Keys/XML.php +++ b/phpseclib/Crypt/DSA/Formats/Keys/XML.php @@ -19,7 +19,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\DSA\Keys; +namespace phpseclib\Crypt\DSA\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Math\BigInteger; diff --git a/phpseclib/Crypt/DSA/Signature/ASN1.php b/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php similarity index 96% rename from phpseclib/Crypt/DSA/Signature/ASN1.php rename to phpseclib/Crypt/DSA/Formats/Signature/ASN1.php index 009e5c18..701db5ee 100644 --- a/phpseclib/Crypt/DSA/Signature/ASN1.php +++ b/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php @@ -16,7 +16,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\DSA\Signature; +namespace phpseclib\Crypt\DSA\Formats\Signature; use phpseclib\Math\BigInteger; use phpseclib\File\ASN1 as Encoder; diff --git a/phpseclib/Crypt/DSA/Signature/Raw.php b/phpseclib/Crypt/DSA/Formats/Signature/Raw.php similarity index 80% rename from phpseclib/Crypt/DSA/Signature/Raw.php rename to phpseclib/Crypt/DSA/Formats/Signature/Raw.php index 03f20ca4..da589add 100644 --- a/phpseclib/Crypt/DSA/Signature/Raw.php +++ b/phpseclib/Crypt/DSA/Formats/Signature/Raw.php @@ -13,9 +13,9 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\DSA\Signature; +namespace phpseclib\Crypt\DSA\Formats\Signature; -use phpseclib\Crypt\Common\Signature\Raw as Progenitor; +use phpseclib\Crypt\Common\Formats\Signature\Raw as Progenitor; /** * Raw DSA Signature Handler diff --git a/phpseclib/Crypt/DSA/Signature/SSH2.php b/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php similarity index 97% rename from phpseclib/Crypt/DSA/Signature/SSH2.php rename to phpseclib/Crypt/DSA/Formats/Signature/SSH2.php index 2398fc19..5950d863 100644 --- a/phpseclib/Crypt/DSA/Signature/SSH2.php +++ b/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php @@ -15,7 +15,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\DSA\Signature; +namespace phpseclib\Crypt\DSA\Formats\Signature; use phpseclib\Math\BigInteger; use phpseclib\Common\Functions\Strings; diff --git a/phpseclib/Crypt/DSA/PrivateKey.php b/phpseclib/Crypt/DSA/PrivateKey.php index 927fe0d7..a7647ea3 100644 --- a/phpseclib/Crypt/DSA/PrivateKey.php +++ b/phpseclib/Crypt/DSA/PrivateKey.php @@ -14,7 +14,7 @@ namespace phpseclib\Crypt\DSA; use phpseclib\Crypt\DSA; -use phpseclib\Crypt\ECDSA\Signature\ASN1 as ASN1Signature; +use phpseclib\Crypt\ECDSA\Formats\Signature\ASN1 as ASN1Signature; use phpseclib\Math\BigInteger; use phpseclib\Crypt\Common; diff --git a/phpseclib/Crypt/DSA/PublicKey.php b/phpseclib/Crypt/DSA/PublicKey.php index 37c7c649..6a1a2e03 100644 --- a/phpseclib/Crypt/DSA/PublicKey.php +++ b/phpseclib/Crypt/DSA/PublicKey.php @@ -14,7 +14,7 @@ namespace phpseclib\Crypt\DSA; use phpseclib\Crypt\DSA; -use phpseclib\Crypt\ECDSA\Signature\ASN1 as ASN1Signature; +use phpseclib\Crypt\ECDSA\Formats\Signature\ASN1 as ASN1Signature; use phpseclib\Crypt\Common; /** diff --git a/phpseclib/Crypt/ECDSA.php b/phpseclib/Crypt/ECDSA.php index c6f8ec9d..02980471 100644 --- a/phpseclib/Crypt/ECDSA.php +++ b/phpseclib/Crypt/ECDSA.php @@ -38,7 +38,7 @@ use phpseclib\Crypt\ECDSA\Parameters; use phpseclib\Crypt\ECDSA\BaseCurves\TwistedEdwards as TwistedEdwardsCurve; use phpseclib\Crypt\ECDSA\Curves\Ed25519; use phpseclib\Crypt\ECDSA\Curves\Ed448; -use phpseclib\Crypt\ECDSA\Keys\PKCS1; +use phpseclib\Crypt\ECDSA\Formats\Keys\PKCS1; use phpseclib\File\ASN1\Maps\ECParameters; use phpseclib\File\ASN1; use phpseclib\Exception\UnsupportedCurveException; diff --git a/phpseclib/Crypt/ECDSA/Keys/Common.php b/phpseclib/Crypt/ECDSA/Formats/Keys/Common.php similarity index 99% rename from phpseclib/Crypt/ECDSA/Keys/Common.php rename to phpseclib/Crypt/ECDSA/Formats/Keys/Common.php index 1b029032..3efe814a 100644 --- a/phpseclib/Crypt/ECDSA/Keys/Common.php +++ b/phpseclib/Crypt/ECDSA/Formats/Keys/Common.php @@ -13,7 +13,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Keys; +namespace phpseclib\Crypt\ECDSA\Formats\Keys; use ParagonIE\ConstantTime\Hex; use phpseclib\Crypt\ECDSA\BaseCurves\Base as BaseCurve; @@ -362,7 +362,7 @@ trait Common ['namedCurve' => $name] : ASN1::encodeDER(['namedCurve' => $name], Maps\ECParameters::MAP); } - foreach (new \DirectoryIterator(__DIR__ . '/../Curves/') as $file) { + foreach (new \DirectoryIterator(__DIR__ . '/../../Curves/') as $file) { if ($file->getExtension() != 'php') { continue; } diff --git a/phpseclib/Crypt/ECDSA/Keys/OpenSSH.php b/phpseclib/Crypt/ECDSA/Formats/Keys/OpenSSH.php similarity index 98% rename from phpseclib/Crypt/ECDSA/Keys/OpenSSH.php rename to phpseclib/Crypt/ECDSA/Formats/Keys/OpenSSH.php index 3a64f84b..afb8e50c 100644 --- a/phpseclib/Crypt/ECDSA/Keys/OpenSSH.php +++ b/phpseclib/Crypt/ECDSA/Formats/Keys/OpenSSH.php @@ -15,12 +15,12 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Keys; +namespace phpseclib\Crypt\ECDSA\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Math\BigInteger; use phpseclib\Common\Functions\Strings; -use phpseclib\Crypt\Common\Keys\OpenSSH as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\OpenSSH as Progenitor; use phpseclib\Crypt\ECDSA\BaseCurves\Base as BaseCurve; use phpseclib\Exception\UnsupportedCurveException; use phpseclib\Crypt\ECDSA\Curves\Ed25519; diff --git a/phpseclib/Crypt/ECDSA/Keys/PKCS1.php b/phpseclib/Crypt/ECDSA/Formats/Keys/PKCS1.php similarity index 97% rename from phpseclib/Crypt/ECDSA/Keys/PKCS1.php rename to phpseclib/Crypt/ECDSA/Formats/Keys/PKCS1.php index be936934..521894c6 100644 --- a/phpseclib/Crypt/ECDSA/Keys/PKCS1.php +++ b/phpseclib/Crypt/ECDSA/Formats/Keys/PKCS1.php @@ -25,10 +25,10 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Keys; +namespace phpseclib\Crypt\ECDSA\Formats\Keys; use phpseclib\Math\Common\FiniteField\Integer; -use phpseclib\Crypt\Common\Keys\PKCS1 as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PKCS1 as Progenitor; use phpseclib\File\ASN1; use phpseclib\File\ASN1\Maps; use phpseclib\Crypt\ECDSA\BaseCurves\Base as BaseCurve; diff --git a/phpseclib/Crypt/ECDSA/Keys/PKCS8.php b/phpseclib/Crypt/ECDSA/Formats/Keys/PKCS8.php similarity index 98% rename from phpseclib/Crypt/ECDSA/Keys/PKCS8.php rename to phpseclib/Crypt/ECDSA/Formats/Keys/PKCS8.php index fff5223c..be7e3235 100644 --- a/phpseclib/Crypt/ECDSA/Keys/PKCS8.php +++ b/phpseclib/Crypt/ECDSA/Formats/Keys/PKCS8.php @@ -23,10 +23,10 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Keys; +namespace phpseclib\Crypt\ECDSA\Formats\Keys; use phpseclib\Math\BigInteger; -use phpseclib\Crypt\Common\Keys\PKCS8 as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PKCS8 as Progenitor; use phpseclib\File\ASN1; use phpseclib\File\ASN1\Maps; use phpseclib\Crypt\ECDSA\BaseCurves\Base as BaseCurve; diff --git a/phpseclib/Crypt/ECDSA/Keys/PuTTY.php b/phpseclib/Crypt/ECDSA/Formats/Keys/PuTTY.php similarity index 96% rename from phpseclib/Crypt/ECDSA/Keys/PuTTY.php rename to phpseclib/Crypt/ECDSA/Formats/Keys/PuTTY.php index c70a1ce1..25e3fe36 100644 --- a/phpseclib/Crypt/ECDSA/Keys/PuTTY.php +++ b/phpseclib/Crypt/ECDSA/Formats/Keys/PuTTY.php @@ -13,12 +13,12 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Keys; +namespace phpseclib\Crypt\ECDSA\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Math\BigInteger; use phpseclib\Common\Functions\Strings; -use phpseclib\Crypt\Common\Keys\PuTTY as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PuTTY as Progenitor; use phpseclib\Crypt\ECDSA\BaseCurves\Base as BaseCurve; use phpseclib\Math\Common\FiniteField\Integer; use phpseclib\Crypt\ECDSA\BaseCurves\TwistedEdwards as TwistedEdwardsCurve; @@ -40,7 +40,7 @@ abstract class PuTTY extends Progenitor * @var string * @access private */ - const PUBLIC_HANDLER = 'phpseclib\Crypt\ECDSA\Keys\OpenSSH'; + const PUBLIC_HANDLER = 'phpseclib\Crypt\ECDSA\Formats\Keys\OpenSSH'; /** * Supported Key Types diff --git a/phpseclib/Crypt/ECDSA/Keys/XML.php b/phpseclib/Crypt/ECDSA/Formats/Keys/XML.php similarity index 99% rename from phpseclib/Crypt/ECDSA/Keys/XML.php rename to phpseclib/Crypt/ECDSA/Formats/Keys/XML.php index b1ece33f..e033f7a4 100644 --- a/phpseclib/Crypt/ECDSA/Keys/XML.php +++ b/phpseclib/Crypt/ECDSA/Formats/Keys/XML.php @@ -18,7 +18,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Keys; +namespace phpseclib\Crypt\ECDSA\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Math\BigInteger; diff --git a/phpseclib/Crypt/ECDSA/Keys/libsodium.php b/phpseclib/Crypt/ECDSA/Formats/Keys/libsodium.php similarity index 98% rename from phpseclib/Crypt/ECDSA/Keys/libsodium.php rename to phpseclib/Crypt/ECDSA/Formats/Keys/libsodium.php index bf091bc9..f0710bb5 100644 --- a/phpseclib/Crypt/ECDSA/Keys/libsodium.php +++ b/phpseclib/Crypt/ECDSA/Formats/Keys/libsodium.php @@ -17,7 +17,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Keys; +namespace phpseclib\Crypt\ECDSA\Formats\Keys; use phpseclib\Crypt\ECDSA\Curves\Ed25519; use phpseclib\Math\Common\FiniteField\Integer; diff --git a/phpseclib/Crypt/ECDSA/Signature/ASN1.php b/phpseclib/Crypt/ECDSA/Formats/Signature/ASN1.php similarity index 96% rename from phpseclib/Crypt/ECDSA/Signature/ASN1.php rename to phpseclib/Crypt/ECDSA/Formats/Signature/ASN1.php index 9baa9fd9..42a9bbe9 100644 --- a/phpseclib/Crypt/ECDSA/Signature/ASN1.php +++ b/phpseclib/Crypt/ECDSA/Formats/Signature/ASN1.php @@ -16,7 +16,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Signature; +namespace phpseclib\Crypt\ECDSA\Formats\Signature; use phpseclib\Math\BigInteger; use phpseclib\File\ASN1 as Encoder; diff --git a/phpseclib/Crypt/ECDSA/Signature/Raw.php b/phpseclib/Crypt/ECDSA/Formats/Signature/Raw.php similarity index 80% rename from phpseclib/Crypt/ECDSA/Signature/Raw.php rename to phpseclib/Crypt/ECDSA/Formats/Signature/Raw.php index 99e03533..6e180ca4 100644 --- a/phpseclib/Crypt/ECDSA/Signature/Raw.php +++ b/phpseclib/Crypt/ECDSA/Formats/Signature/Raw.php @@ -13,9 +13,9 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Signature; +namespace phpseclib\Crypt\ECDSA\Formats\Signature; -use phpseclib\Crypt\Common\Signature\Raw as Progenitor; +use phpseclib\Crypt\Common\Formats\Signature\Raw as Progenitor; /** * Raw DSA Signature Handler diff --git a/phpseclib/Crypt/ECDSA/Signature/SSH2.php b/phpseclib/Crypt/ECDSA/Formats/Signature/SSH2.php similarity index 97% rename from phpseclib/Crypt/ECDSA/Signature/SSH2.php rename to phpseclib/Crypt/ECDSA/Formats/Signature/SSH2.php index 2ce21be6..0ab6461b 100644 --- a/phpseclib/Crypt/ECDSA/Signature/SSH2.php +++ b/phpseclib/Crypt/ECDSA/Formats/Signature/SSH2.php @@ -15,7 +15,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\ECDSA\Signature; +namespace phpseclib\Crypt\ECDSA\Formats\Signature; use phpseclib\Math\BigInteger; use phpseclib\Common\Functions\Strings; diff --git a/phpseclib/Crypt/ECDSA/PrivateKey.php b/phpseclib/Crypt/ECDSA/PrivateKey.php index 18e97e72..819a1f40 100644 --- a/phpseclib/Crypt/ECDSA/PrivateKey.php +++ b/phpseclib/Crypt/ECDSA/PrivateKey.php @@ -14,12 +14,12 @@ namespace phpseclib\Crypt\ECDSA; use phpseclib\Crypt\ECDSA; -use phpseclib\Crypt\ECDSA\Signature\ASN1 as ASN1Signature; +use phpseclib\Crypt\ECDSA\Formats\Signature\ASN1 as ASN1Signature; use phpseclib\Math\BigInteger; use phpseclib\Crypt\ECDSA\BaseCurves\TwistedEdwards as TwistedEdwardsCurve; use phpseclib\Crypt\Hash; use phpseclib\Crypt\ECDSA\Curves\Ed25519; -use phpseclib\Crypt\ECDSA\Keys\PKCS8; +use phpseclib\Crypt\ECDSA\Formats\Keys\PKCS8; use phpseclib\Crypt\Common; /** diff --git a/phpseclib/Crypt/ECDSA/PublicKey.php b/phpseclib/Crypt/ECDSA/PublicKey.php index 74941a86..0ba169c9 100644 --- a/phpseclib/Crypt/ECDSA/PublicKey.php +++ b/phpseclib/Crypt/ECDSA/PublicKey.php @@ -16,11 +16,11 @@ namespace phpseclib\Crypt\ECDSA; use phpseclib\Crypt\ECDSA; use phpseclib\Crypt\Hash; use phpseclib\Math\BigInteger; -use phpseclib\Crypt\ECDSA\Signature\ASN1 as ASN1Signature; +use phpseclib\Crypt\ECDSA\Formats\Signature\ASN1 as ASN1Signature; use phpseclib\Crypt\ECDSA\BaseCurves\TwistedEdwards as TwistedEdwardsCurve; use phpseclib\Crypt\ECDSA\Curves\Ed25519; -use phpseclib\Crypt\ECDSA\Keys\PKCS1; -use phpseclib\Crypt\ECDSA\Keys\PKCS8; +use phpseclib\Crypt\ECDSA\Formats\Keys\PKCS1; +use phpseclib\Crypt\ECDSA\Formats\Keys\PKCS8; use phpseclib\Crypt\Common; /** diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php index 441663ce..9e5191f2 100644 --- a/phpseclib/Crypt/RSA.php +++ b/phpseclib/Crypt/RSA.php @@ -53,7 +53,7 @@ use phpseclib\Crypt\RSA\PublicKey; use phpseclib\Math\BigInteger; use phpseclib\Exception\UnsupportedAlgorithmException; use phpseclib\Exception\InconsistentSetupException; -use phpseclib\Crypt\RSA\Keys\PSS; +use phpseclib\Crypt\RSA\Formats\Keys\PSS; /** * Pure-PHP PKCS#1 compliant implementation of RSA. diff --git a/phpseclib/Crypt/RSA/Keys/MSBLOB.php b/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php similarity index 99% rename from phpseclib/Crypt/RSA/Keys/MSBLOB.php rename to phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php index 268c2440..96a25cc6 100644 --- a/phpseclib/Crypt/RSA/Keys/MSBLOB.php +++ b/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php @@ -17,7 +17,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\RSA\Keys; +namespace phpseclib\Crypt\RSA\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Math\BigInteger; diff --git a/phpseclib/Crypt/RSA/Keys/OpenSSH.php b/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php similarity index 97% rename from phpseclib/Crypt/RSA/Keys/OpenSSH.php rename to phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php index 360ec98d..3e0161a6 100644 --- a/phpseclib/Crypt/RSA/Keys/OpenSSH.php +++ b/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php @@ -15,12 +15,12 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\RSA\Keys; +namespace phpseclib\Crypt\RSA\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Math\BigInteger; use phpseclib\Common\Functions\Strings; -use phpseclib\Crypt\Common\Keys\OpenSSH as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\OpenSSH as Progenitor; /** * OpenSSH Formatted RSA Key Handler diff --git a/phpseclib/Crypt/RSA/Keys/PKCS1.php b/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php similarity index 97% rename from phpseclib/Crypt/RSA/Keys/PKCS1.php rename to phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php index 959bb7dd..5d44a67b 100644 --- a/phpseclib/Crypt/RSA/Keys/PKCS1.php +++ b/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php @@ -22,10 +22,10 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\RSA\Keys; +namespace phpseclib\Crypt\RSA\Formats\Keys; use phpseclib\Math\BigInteger; -use phpseclib\Crypt\Common\Keys\PKCS1 as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PKCS1 as Progenitor; use phpseclib\File\ASN1; use phpseclib\File\ASN1\Maps; diff --git a/phpseclib/Crypt/RSA/Keys/PKCS8.php b/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php similarity index 97% rename from phpseclib/Crypt/RSA/Keys/PKCS8.php rename to phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php index 5dcbb110..f1488f58 100644 --- a/phpseclib/Crypt/RSA/Keys/PKCS8.php +++ b/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php @@ -25,10 +25,10 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\RSA\Keys; +namespace phpseclib\Crypt\RSA\Formats\Keys; use phpseclib\Math\BigInteger; -use phpseclib\Crypt\Common\Keys\PKCS8 as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PKCS8 as Progenitor; use phpseclib\File\ASN1; /** diff --git a/phpseclib/Crypt/RSA/Keys/PSS.php b/phpseclib/Crypt/RSA/Formats/Keys/PSS.php similarity index 98% rename from phpseclib/Crypt/RSA/Keys/PSS.php rename to phpseclib/Crypt/RSA/Formats/Keys/PSS.php index dbc82100..80a045d8 100644 --- a/phpseclib/Crypt/RSA/Keys/PSS.php +++ b/phpseclib/Crypt/RSA/Formats/Keys/PSS.php @@ -23,10 +23,10 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\RSA\Keys; +namespace phpseclib\Crypt\RSA\Formats\Keys; use phpseclib\Math\BigInteger; -use phpseclib\Crypt\Common\Keys\PKCS8 as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PKCS8 as Progenitor; use phpseclib\File\ASN1; use phpseclib\File\ASN1\Maps; diff --git a/phpseclib/Crypt/RSA/Keys/PuTTY.php b/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php similarity index 95% rename from phpseclib/Crypt/RSA/Keys/PuTTY.php rename to phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php index aaef1f98..c80af466 100644 --- a/phpseclib/Crypt/RSA/Keys/PuTTY.php +++ b/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php @@ -13,11 +13,11 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\RSA\Keys; +namespace phpseclib\Crypt\RSA\Formats\Keys; use phpseclib\Math\BigInteger; use phpseclib\Common\Functions\Strings; -use phpseclib\Crypt\Common\Keys\PuTTY as Progenitor; +use phpseclib\Crypt\Common\Formats\Keys\PuTTY as Progenitor; /** * PuTTY Formatted RSA Key Handler @@ -34,7 +34,7 @@ abstract class PuTTY extends Progenitor * @var string * @access private */ - const PUBLIC_HANDLER = 'phpseclib\Crypt\RSA\Keys\OpenSSH'; + const PUBLIC_HANDLER = 'phpseclib\Crypt\RSA\Formats\Keys\OpenSSH'; /** * Algorithm Identifier diff --git a/phpseclib/Crypt/RSA/Keys/Raw.php b/phpseclib/Crypt/RSA/Formats/Keys/Raw.php similarity index 98% rename from phpseclib/Crypt/RSA/Keys/Raw.php rename to phpseclib/Crypt/RSA/Formats/Keys/Raw.php index 28a58cb5..689372bd 100644 --- a/phpseclib/Crypt/RSA/Keys/Raw.php +++ b/phpseclib/Crypt/RSA/Formats/Keys/Raw.php @@ -23,7 +23,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\RSA\Keys; +namespace phpseclib\Crypt\RSA\Formats\Keys; use phpseclib\Math\BigInteger; diff --git a/phpseclib/Crypt/RSA/Keys/XML.php b/phpseclib/Crypt/RSA/Formats/Keys/XML.php similarity index 99% rename from phpseclib/Crypt/RSA/Keys/XML.php rename to phpseclib/Crypt/RSA/Formats/Keys/XML.php index 06950cc9..ba4bbace 100644 --- a/phpseclib/Crypt/RSA/Keys/XML.php +++ b/phpseclib/Crypt/RSA/Formats/Keys/XML.php @@ -20,7 +20,7 @@ * @link http://phpseclib.sourceforge.net */ -namespace phpseclib\Crypt\RSA\Keys; +namespace phpseclib\Crypt\RSA\Formats\Keys; use ParagonIE\ConstantTime\Base64; use phpseclib\Math\BigInteger; diff --git a/phpseclib/Crypt/RSA/PrivateKey.php b/phpseclib/Crypt/RSA/PrivateKey.php index 8810dbdd..5e770b40 100644 --- a/phpseclib/Crypt/RSA/PrivateKey.php +++ b/phpseclib/Crypt/RSA/PrivateKey.php @@ -22,7 +22,7 @@ use phpseclib\Exceptions\NoKeyLoadedException; use phpseclib\Exception\UnsupportedFormatException; use phpseclib\Crypt\Random; use phpseclib\Crypt\Common; -use phpseclib\Crypt\RSA\Keys\PSS; +use phpseclib\Crypt\RSA\Formats\Keys\PSS; /** * Raw RSA Key Handler diff --git a/phpseclib/Crypt/RSA/PublicKey.php b/phpseclib/Crypt/RSA/PublicKey.php index e019f521..34a0f96b 100644 --- a/phpseclib/Crypt/RSA/PublicKey.php +++ b/phpseclib/Crypt/RSA/PublicKey.php @@ -23,7 +23,7 @@ use phpseclib\Exception\UnsupportedFormatException; use phpseclib\Crypt\Random; use phpseclib\Crypt\Common; use phpseclib\File\ASN1\Maps\DigestInfo; -use phpseclib\Crypt\RSA\Keys\PSS; +use phpseclib\Crypt\RSA\Formats\Keys\PSS; /** * Raw RSA Key Handler diff --git a/phpseclib/Math/BigInteger/Engines/OpenSSL.php b/phpseclib/Math/BigInteger/Engines/OpenSSL.php index 0d7af804..a9b5785c 100644 --- a/phpseclib/Math/BigInteger/Engines/OpenSSL.php +++ b/phpseclib/Math/BigInteger/Engines/OpenSSL.php @@ -16,7 +16,7 @@ namespace phpseclib\Math\BigInteger\Engines; use phpseclib\Crypt\RSA; -use phpseclib\Crypt\RSA\Keys\PKCS8; +use phpseclib\Crypt\RSA\Formats\Keys\PKCS8; use phpseclib\Math\BigInteger; /** diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index 9d1ba87d..b6e88de4 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -68,7 +68,6 @@ use phpseclib\Exception\NoSupportedAlgorithmsException; use phpseclib\Exception\UnsupportedAlgorithmException; use phpseclib\Exception\UnsupportedCurveException; use phpseclib\Common\Functions\Strings; -use phpseclib\Crypt\Common\Keys\OpenSSH; /** * Pure-PHP implementation of SSHv2. diff --git a/tests/Unit/Crypt/DSA/LoadKeyTest.php b/tests/Unit/Crypt/DSA/LoadKeyTest.php index 0e078a8e..df896012 100644 --- a/tests/Unit/Crypt/DSA/LoadKeyTest.php +++ b/tests/Unit/Crypt/DSA/LoadKeyTest.php @@ -9,9 +9,9 @@ use phpseclib\Crypt\PublicKeyLoader; use phpseclib\Crypt\DSA\PrivateKey; use phpseclib\Crypt\DSA\PublicKey; use phpseclib\Crypt\DSA\Parameters; -use phpseclib\Crypt\DSA\Keys\PKCS1; -use phpseclib\Crypt\DSA\Keys\PKCS8; -use phpseclib\Crypt\DSA\Keys\PuTTY; +use phpseclib\Crypt\DSA\Formats\Keys\PKCS1; +use phpseclib\Crypt\DSA\Formats\Keys\PKCS8; +use phpseclib\Crypt\DSA\Formats\Keys\PuTTY; use phpseclib\Math\BigInteger; class Unit_Crypt_DSA_LoadKeyTest extends PhpseclibTestCase diff --git a/tests/Unit/Crypt/ECDSA/CurveTest.php b/tests/Unit/Crypt/ECDSA/CurveTest.php index b9be6a25..972913bb 100644 --- a/tests/Unit/Crypt/ECDSA/CurveTest.php +++ b/tests/Unit/Crypt/ECDSA/CurveTest.php @@ -14,7 +14,7 @@ use phpseclib\Crypt\PublicKeyLoader; class Ed448PublicKey { - use phpseclib\Crypt\ECDSA\Keys\Common; + use phpseclib\Crypt\ECDSA\Formats\Keys\Common; public static function load($key, $password = '') { @@ -74,7 +74,7 @@ class Unit_Crypt_ECDSA_CurveTest extends PhpseclibTestCase public function curvesWithOIDs() { - $class = new ReflectionClass('phpseclib\Crypt\ECDSA\Keys\PKCS8'); + $class = new ReflectionClass('phpseclib\Crypt\ECDSA\Formats\Keys\PKCS8'); $initialize = $class->getMethod('initialize_static_variables'); $initialize->setAccessible(true); diff --git a/tests/Unit/Crypt/ECDSA/KeyTest.php b/tests/Unit/Crypt/ECDSA/KeyTest.php index 353e52ea..9c35ca07 100644 --- a/tests/Unit/Crypt/ECDSA/KeyTest.php +++ b/tests/Unit/Crypt/ECDSA/KeyTest.php @@ -6,11 +6,11 @@ */ use phpseclib\Crypt\ECDSA; -use phpseclib\Crypt\ECDSA\Keys\PKCS1; -use phpseclib\Crypt\ECDSA\Keys\PKCS8; -use phpseclib\Crypt\ECDSA\Keys\PuTTY; -use phpseclib\Crypt\ECDSA\Keys\OpenSSH; -use phpseclib\Crypt\ECDSA\Keys\XML; +use phpseclib\Crypt\ECDSA\Formats\Keys\PKCS1; +use phpseclib\Crypt\ECDSA\Formats\Keys\PKCS8; +use phpseclib\Crypt\ECDSA\Formats\Keys\PuTTY; +use phpseclib\Crypt\ECDSA\Formats\Keys\OpenSSH; +use phpseclib\Crypt\ECDSA\Formats\Keys\XML; use phpseclib\Crypt\PublicKeyLoader; use phpseclib\Crypt\ECDSA\PrivateKey; diff --git a/tests/Unit/Crypt/RSA/CreateKeyTest.php b/tests/Unit/Crypt/RSA/CreateKeyTest.php index c9e8009c..433d23a7 100644 --- a/tests/Unit/Crypt/RSA/CreateKeyTest.php +++ b/tests/Unit/Crypt/RSA/CreateKeyTest.php @@ -7,7 +7,7 @@ */ use phpseclib\Crypt\RSA; -use phpseclib\Crypt\RSA\Keys\PKCS1; +use phpseclib\Crypt\RSA\Formats\Keys\PKCS1; use phpseclib\Crypt\RSA\PrivateKey; use phpseclib\Crypt\RSA\PublicKey; diff --git a/tests/Unit/Crypt/RSA/LoadKeyTest.php b/tests/Unit/Crypt/RSA/LoadKeyTest.php index d11772e1..48ddab5c 100644 --- a/tests/Unit/Crypt/RSA/LoadKeyTest.php +++ b/tests/Unit/Crypt/RSA/LoadKeyTest.php @@ -9,11 +9,11 @@ use phpseclib\Crypt\RSA; use phpseclib\Crypt\PublicKeyLoader; use phpseclib\Crypt\RSA\PrivateKey; use phpseclib\Crypt\RSA\PublicKey; -use phpseclib\Crypt\RSA\Keys\PKCS1; -use phpseclib\Crypt\RSA\Keys\PKCS8; -use phpseclib\Crypt\RSA\Keys\PuTTY; -use phpseclib\Crypt\RSA\Keys\OpenSSH; -use phpseclib\Crypt\RSA\Keys\PSS; +use phpseclib\Crypt\RSA\Formats\Keys\PKCS1; +use phpseclib\Crypt\RSA\Formats\Keys\PKCS8; +use phpseclib\Crypt\RSA\Formats\Keys\PuTTY; +use phpseclib\Crypt\RSA\Formats\Keys\OpenSSH; +use phpseclib\Crypt\RSA\Formats\Keys\PSS; use phpseclib\Math\BigInteger; class Unit_Crypt_RSA_LoadKeyTest extends PhpseclibTestCase diff --git a/tests/Unit/Crypt/RSA/ModeTest.php b/tests/Unit/Crypt/RSA/ModeTest.php index 17ff7d8d..e4bc304a 100644 --- a/tests/Unit/Crypt/RSA/ModeTest.php +++ b/tests/Unit/Crypt/RSA/ModeTest.php @@ -8,7 +8,7 @@ use phpseclib\Crypt\RSA; use phpseclib\Math\BigInteger; use phpseclib\Crypt\PublicKeyLoader; -use phpseclib\Crypt\RSA\Keys\PKCS8; +use phpseclib\Crypt\RSA\Formats\Keys\PKCS8; class Unit_Crypt_RSA_ModeTest extends PhpseclibTestCase {