GMP dep modified

Spomky · Spomky · commit fb734ec9d9b8 · 2019-06-22T15:23:12.000+02:00
diff --git a/src/Component/Encryption/composer.json b/src/Component/Encryption/composer.json
@@ -21,7 +21,6 @@
     },
     "require": {
         "lib-openssl": "*",
-        "ext-gmp": "*",
         "web-token/jwt-core": "^2.0"
     },
     "require-dev": {
diff --git a/src/Component/Signature/composer.json b/src/Component/Signature/composer.json
@@ -20,7 +20,6 @@
         }
     },
     "require": {
-        "ext-gmp": "*",
         "web-token/jwt-core": "^2.0"
     },
     "require-dev": {
diff --git a/src/EncryptionAlgorithm/Experimental/KeyEncryption/RSAOAEP384.php b/src/EncryptionAlgorithm/Experimental/KeyEncryption/RSAOAEP384.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 
-use Jose\Component\Encryption\Util\RSACrypt;
+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\RSACrypt;
 
 final class RSAOAEP384 extends RSA
 {
diff --git a/src/EncryptionAlgorithm/Experimental/KeyEncryption/RSAOAEP512.php b/src/EncryptionAlgorithm/Experimental/KeyEncryption/RSAOAEP512.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 
-use Jose\Component\Encryption\Util\RSACrypt;
+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\RSACrypt;
 
 final class RSAOAEP512 extends RSA
 {
diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHES.php b/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHES.php
@@ -22,7 +22,7 @@
 use Jose\Component\Core\Util\Ecc\NistCurve;
 use Jose\Component\Core\Util\Ecc\PrivateKey;
 use Jose\Component\Core\Util\ECKey;
-use Jose\Component\Encryption\Util\ConcatKDF;
+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\ConcatKDF;
 
 final class ECDHES implements KeyAgreement
 {
diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/Util/ConcatKDF.php b/src/EncryptionAlgorithm/KeyEncryption/ECDHES/Util/ConcatKDF.php
@@ -11,7 +11,7 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-namespace Jose\Component\Encryption\Util;
+namespace Jose\Component\Encryption\Algorithm\KeyEncryption\Util;
 
 use Base64Url\Base64Url;
 
diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/RSA.php b/src/EncryptionAlgorithm/KeyEncryption/RSA/RSA.php
@@ -16,7 +16,7 @@
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\RSAKey;
-use Jose\Component\Encryption\Util\RSACrypt;
+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\RSACrypt;
 
 abstract class RSA implements KeyEncryption
 {
diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/RSA15.php b/src/EncryptionAlgorithm/KeyEncryption/RSA/RSA15.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 
-use Jose\Component\Encryption\Util\RSACrypt;
+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\RSACrypt;
 
 final class RSA15 extends RSA
 {
diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/RSAOAEP.php b/src/EncryptionAlgorithm/KeyEncryption/RSA/RSAOAEP.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 
-use Jose\Component\Encryption\Util\RSACrypt;
+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\RSACrypt;
 
 final class RSAOAEP extends RSA
 {
diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/RSAOAEP256.php b/src/EncryptionAlgorithm/KeyEncryption/RSA/RSAOAEP256.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 
-use Jose\Component\Encryption\Util\RSACrypt;
+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\RSACrypt;
 
 final class RSAOAEP256 extends RSA
 {
diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/Util/RSACrypt.php b/src/EncryptionAlgorithm/KeyEncryption/RSA/Util/RSACrypt.php
@@ -11,7 +11,7 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-namespace Jose\Component\Encryption\Util;
+namespace Jose\Component\Encryption\Algorithm\KeyEncryption\Util;
 
 use InvalidArgumentException;
 use Jose\Component\Core\Util\BigInteger;
diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json b/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json
@@ -20,6 +20,7 @@
         }
     },
     "require": {
+        "ext-gmp": "*",
         "web-token/jwt-encryption": "^2.0"
     },
     "require-dev": {
diff --git a/src/SignatureAlgorithm/Experimental/RS1.php b/src/SignatureAlgorithm/Experimental/RS1.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Signature\Algorithm;
 
-use Jose\Component\Signature\Util\RSA as JoseRSA;
+use Jose\Component\Signature\Algorithm\Util\RSA as JoseRSA;
 
 final class RS1 extends RSA
 {
diff --git a/src/SignatureAlgorithm/RSA/PS256.php b/src/SignatureAlgorithm/RSA/PS256.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Signature\Algorithm;
 
-use Jose\Component\Signature\Util\RSA as JoseRSA;
+use Jose\Component\Signature\Algorithm\Util\RSA as JoseRSA;
 
 final class PS256 extends RSA
 {
diff --git a/src/SignatureAlgorithm/RSA/PS384.php b/src/SignatureAlgorithm/RSA/PS384.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Signature\Algorithm;
 
-use Jose\Component\Signature\Util\RSA as JoseRSA;
+use Jose\Component\Signature\Algorithm\Util\RSA as JoseRSA;
 
 final class PS384 extends RSA
 {
diff --git a/src/SignatureAlgorithm/RSA/PS512.php b/src/SignatureAlgorithm/RSA/PS512.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Signature\Algorithm;
 
-use Jose\Component\Signature\Util\RSA as JoseRSA;
+use Jose\Component\Signature\Algorithm\Util\RSA as JoseRSA;
 
 final class PS512 extends RSA
 {
diff --git a/src/SignatureAlgorithm/RSA/RS256.php b/src/SignatureAlgorithm/RSA/RS256.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Signature\Algorithm;
 
-use Jose\Component\Signature\Util\RSA as JoseRSA;
+use Jose\Component\Signature\Algorithm\Util\RSA as JoseRSA;
 
 final class RS256 extends RSA
 {
diff --git a/src/SignatureAlgorithm/RSA/RS384.php b/src/SignatureAlgorithm/RSA/RS384.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Signature\Algorithm;
 
-use Jose\Component\Signature\Util\RSA as JoseRSA;
+use Jose\Component\Signature\Algorithm\Util\RSA as JoseRSA;
 
 final class RS384 extends RSA
 {
diff --git a/src/SignatureAlgorithm/RSA/RS512.php b/src/SignatureAlgorithm/RSA/RS512.php
@@ -13,7 +13,7 @@
 
 namespace Jose\Component\Signature\Algorithm;
 
-use Jose\Component\Signature\Util\RSA as JoseRSA;
+use Jose\Component\Signature\Algorithm\Util\RSA as JoseRSA;
 
 final class RS512 extends RSA
 {
diff --git a/src/SignatureAlgorithm/RSA/RSA.php b/src/SignatureAlgorithm/RSA/RSA.php
@@ -16,7 +16,7 @@
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\RSAKey;
-use Jose\Component\Signature\Util\RSA as JoseRSA;
+use Jose\Component\Signature\Algorithm\Util\RSA as JoseRSA;
 
 abstract class RSA implements SignatureAlgorithm
 {
diff --git a/src/SignatureAlgorithm/RSA/Util/RSA.php b/src/SignatureAlgorithm/RSA/Util/RSA.php
@@ -11,7 +11,7 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-namespace Jose\Component\Signature\Util;
+namespace Jose\Component\Signature\Algorithm\Util;
 
 use InvalidArgumentException;
 use Jose\Component\Core\Util\BigInteger;
diff --git a/src/SignatureAlgorithm/RSA/composer.json b/src/SignatureAlgorithm/RSA/composer.json
@@ -20,6 +20,7 @@
         }
     },
     "require": {
+        "ext-gmp": "*",
         "web-token/jwt-signature": "^2.0"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`}`
`21`	`21`	`},`
`22`	`22`	`"require": {`
`23`		`- "ext-gmp": "*",`
`24`	`23`	`"web-token/jwt-core": "^2.0"`
`25`	`24`	`},`
`26`	`25`	`"require-dev": {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace Jose\Component\Encryption\Algorithm\KeyEncryption;`
`15`	`15`
`16`		`-use Jose\Component\Encryption\Util\RSACrypt;`
	`16`	`+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\RSACrypt;`
`17`	`17`
`18`	`18`	`final class RSAOAEP384 extends RSA`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`use Jose\Component\Core\Util\Ecc\NistCurve;`
`23`	`23`	`use Jose\Component\Core\Util\Ecc\PrivateKey;`
`24`	`24`	`use Jose\Component\Core\Util\ECKey;`
`25`		`-use Jose\Component\Encryption\Util\ConcatKDF;`
	`25`	`+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\ConcatKDF;`
`26`	`26`
`27`	`27`	`final class ECDHES implements KeyAgreement`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use InvalidArgumentException;`
`17`	`17`	`use Jose\Component\Core\JWK;`
`18`	`18`	`use Jose\Component\Core\Util\RSAKey;`
`19`		`-use Jose\Component\Encryption\Util\RSACrypt;`
	`19`	`+use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\RSACrypt;`
`20`	`20`
`21`	`21`	`abstract class RSA implements KeyEncryption`
`22`	`22`	`{`