mv Keys/ and Signature/ to Formats/*

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;

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;

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

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;

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;

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;

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;
 

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

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;

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;
 

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

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;
 

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;

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;

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

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;

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;
 

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;
 
 /**

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;

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;
                 }

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;

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;

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;

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

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;

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;

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;

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

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;

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;
 
 /**

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\Formats\Keys\PKCS1;
-use phpseclib\Crypt\ECDSA\Keys\PKCS8;
+use phpseclib\Crypt\ECDSA\Formats\Keys\PKCS8;
 use phpseclib\Crypt\Common;
 
 /**

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.

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;

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

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;
 

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;
 
 /**

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;
 

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

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;
 

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;

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

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

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;
 
 /**

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.

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\Formats\Keys\PKCS1;
-use phpseclib\Crypt\DSA\Keys\PKCS8;
+use phpseclib\Crypt\DSA\Formats\Keys\PKCS8;
-use phpseclib\Crypt\DSA\Keys\PuTTY;
+use phpseclib\Crypt\DSA\Formats\Keys\PuTTY;
 use phpseclib\Math\BigInteger;
 
 class Unit_Crypt_DSA_LoadKeyTest extends PhpseclibTestCase

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);

tests/Unit/Crypt/ECDSA/KeyTest.php

@@ -6,11 +6,11 @@
  */
 
 use phpseclib\Crypt\ECDSA;
-use phpseclib\Crypt\ECDSA\Keys\PKCS1;
+use phpseclib\Crypt\ECDSA\Formats\Keys\PKCS1;
-use phpseclib\Crypt\ECDSA\Keys\PKCS8;
+use phpseclib\Crypt\ECDSA\Formats\Keys\PKCS8;
-use phpseclib\Crypt\ECDSA\Keys\PuTTY;
+use phpseclib\Crypt\ECDSA\Formats\Keys\PuTTY;
-use phpseclib\Crypt\ECDSA\Keys\OpenSSH;
+use phpseclib\Crypt\ECDSA\Formats\Keys\OpenSSH;
-use phpseclib\Crypt\ECDSA\Keys\XML;
+use phpseclib\Crypt\ECDSA\Formats\Keys\XML;
 use phpseclib\Crypt\PublicKeyLoader;
 use phpseclib\Crypt\ECDSA\PrivateKey;
 

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;
 

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\Formats\Keys\PKCS1;
-use phpseclib\Crypt\RSA\Keys\PKCS8;
+use phpseclib\Crypt\RSA\Formats\Keys\PKCS8;
-use phpseclib\Crypt\RSA\Keys\PuTTY;
+use phpseclib\Crypt\RSA\Formats\Keys\PuTTY;
-use phpseclib\Crypt\RSA\Keys\OpenSSH;
+use phpseclib\Crypt\RSA\Formats\Keys\OpenSSH;
-use phpseclib\Crypt\RSA\Keys\PSS;
+use phpseclib\Crypt\RSA\Formats\Keys\PSS;
 use phpseclib\Math\BigInteger;
 
 class Unit_Crypt_RSA_LoadKeyTest extends PhpseclibTestCase

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
 {