Features/merge algorithms

.gitsplit.yml

@@ -1,4 +1,12 @@
 splits:
+  - prefix: "src/Deprecated/Signature"
+    target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git"
+  - prefix: "src/JoseFramework"
+    target: "https://${GH_TOKEN}@github.com/web-token/jwt-bundle.git"
+  - prefix: "src/Component"
+    target: "https://${GH_TOKEN}@github.com/web-token/jwt-library.git"
+  - prefix: "src/Experimental"
+    target: "https://${GH_TOKEN}@github.com/web-token/jwt-experimental.git"
   - prefix: "src/Deprecated/Checker"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-checker.git"
   - prefix: "src/Deprecated/Console"
@@ -13,44 +21,36 @@ splits:
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-key-mgmt.git"
   - prefix: "src/Deprecated/NestedToken"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-nested-token.git"
-  - prefix: "src/Deprecated/Signature"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git"
-  - prefix: "src/JoseFramework"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-bundle.git"
-  - prefix: "src/Component"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-library.git"
-  - prefix: "src/EncryptionAlgorithm/ContentEncryption/AESCBC"
+  - prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aescbc.git"
-  - prefix: "src/EncryptionAlgorithm/ContentEncryption/AESGCM"
+  - prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcm.git"
-  - prefix: "src/EncryptionAlgorithm/KeyEncryption/AESGCMKW"
+  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcmkw.git"
-  - prefix: "src/EncryptionAlgorithm/KeyEncryption/AESKW"
+  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aeskw.git"
-  - prefix: "src/EncryptionAlgorithm/KeyEncryption/Direct"
+  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-dir.git"
-  - prefix: "src/EncryptionAlgorithm/KeyEncryption/ECDHES"
+  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-ecdh-es.git"
-  - prefix: "src/EncryptionAlgorithm/KeyEncryption/PBES2"
+  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-pbes2.git"
-  - prefix: "src/EncryptionAlgorithm/KeyEncryption/RSA"
+  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-rsa.git"
-  - prefix: "src/SignatureAlgorithm/ECDSA"
+  - prefix: "src/Deprecated/SignatureAlgorithm/ECDSA"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-ecdsa.git"
-  - prefix: "src/SignatureAlgorithm/EdDSA"
+  - prefix: "src/Deprecated/SignatureAlgorithm/EdDSA"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-eddsa.git"
-  - prefix: "src/SignatureAlgorithm/None"
+  - prefix: "src/Deprecated/SignatureAlgorithm/None"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-none.git"
-  - prefix: "src/SignatureAlgorithm/HMAC"
+  - prefix: "src/Deprecated/SignatureAlgorithm/HMAC"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-hmac.git"
-  - prefix: "src/SignatureAlgorithm/RSA"
+  - prefix: "src/Deprecated/SignatureAlgorithm/RSA"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-rsa.git"
-  - prefix: "src/SignatureAlgorithm/Experimental"
+  - prefix: "src/Deprecated/SignatureAlgorithm/Experimental"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-experimental.git"
-  - prefix: "src/EncryptionAlgorithm/Experimental"
+  - prefix: "src/Deprecated/EncryptionAlgorithm/Experimental"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-experimental.git"
-  - prefix: "src/Experimental"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-experimental.git"
   - prefix: "packs/encryption"
     target: "https://${GH_TOKEN}@github.com/web-token/encryption-pack.git"
   - prefix: "packs/signature"

composer.json

@@ -37,27 +37,7 @@
             "Jose\\": "src/",
             "Jose\\Bundle\\JoseFramework\\": "src/JoseFramework/",
             "Jose\\Experimental\\": "src/Experimental/",
-            "Jose\\Component\\": "src/Component/",
-            "Jose\\Component\\Encryption\\Algorithm\\ContentEncryption\\": [
-                "src/EncryptionAlgorithm/ContentEncryption/AESCBC",
-                "src/EncryptionAlgorithm/ContentEncryption/AESGCM"
-            ],
-            "Jose\\Component\\Encryption\\Algorithm\\KeyEncryption\\": [
-                "src/EncryptionAlgorithm/KeyEncryption/AESGCMKW",
-                "src/EncryptionAlgorithm/KeyEncryption/AESKW",
-                "src/EncryptionAlgorithm/KeyEncryption/Direct",
-                "src/EncryptionAlgorithm/KeyEncryption/ECDHES",
-                "src/EncryptionAlgorithm/KeyEncryption/PBES2",
-                "src/EncryptionAlgorithm/KeyEncryption/RSA"
-            ],
-            "Jose\\Component\\Signature\\Algorithm\\": [
-                "src/SignatureAlgorithm/ECDSA",
-                "src/SignatureAlgorithm/EdDSA",
-                "src/SignatureAlgorithm/Experimental",
-                "src/SignatureAlgorithm/HMAC",
-                "src/SignatureAlgorithm/None",
-                "src/SignatureAlgorithm/RSA"
-            ]
+            "Jose\\Component\\": "src/Component/"
         }
     },
     "autoload-dev": {
@@ -71,14 +51,12 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "ext-sodium": "*",
         "brick/math": "^0.9|^0.10|^0.11|^0.12",
         "paragonie/constant_time_encoding": "^2.6",
         "psr/clock": "^1.0",
         "psr/event-dispatcher": "^1.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
-        "spomky-labs/aes-key-wrap": "^7.0",
         "spomky-labs/pki-framework": "^1.0",
         "symfony/config": "^5.4|^6.0|^7.0",
         "symfony/console": "^5.4|^6.0|^7.0",
@@ -107,6 +85,7 @@
         "qossmic/deptrac-shim": "^1.0",
         "rector/rector": "^0.19",
         "roave/security-advisories": "dev-latest",
+        "spomky-labs/aes-key-wrap": "^7.0",
         "symfony/browser-kit": "^6.1|^7.0",
         "symfony/finder": "^6.1|^7.0",
         "symfony/framework-bundle": "^6.1|^7.0",
@@ -155,7 +134,8 @@
         "php-http/httplug-bundle": "To enable JKU/X5U support.",
         "php-http/message-factory": "To enable JKU/X5U support.",
         "symfony/serializer": "Use the Symfony serializer to serialize/unserialize JWS and JWE tokens.",
-        "symfony/var-dumper": "Used to show data on the debug toolbar."
+        "symfony/var-dumper": "Used to show data on the debug toolbar.",
+        "spomky-labs/aes-key-wrap": "To enable AES Key Wrap algorithm."
     },
     "conflict": {
         "spomky-labs/jose": "*"

packs/encryption/composer.json

@@ -2,16 +2,9 @@
     "name": "web-token/encryption-pack",
     "type": "symfony-pack",
     "license": "MIT",
-    "description": "A pack with all encryption algorithms for the web-token/jwt-encryption package",
+    "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
     "require": {
-        "web-token/jwt-encryption-algorithm-aescbc": "^3.2",
-        "web-token/jwt-encryption-algorithm-aesgcm": "^3.2",
-        "web-token/jwt-encryption-algorithm-aesgcmkw": "^3.2",
-        "web-token/jwt-encryption-algorithm-aeskw": "^3.2",
-        "web-token/jwt-encryption-algorithm-dir": "^3.2",
-        "web-token/jwt-encryption-algorithm-ecdh-es": "^3.2",
-        "web-token/jwt-encryption-algorithm-pbes2": "^3.2",
-        "web-token/jwt-encryption-algorithm-rsa": "^3.2",
-        "web-token/jwt-encryption-algorithm-experimental": "^3.2"
+        "web-token/jwt-library": "^3.3",
+        "web-token/jwt-experimental": "^3.3"
     }
 }

packs/signature/composer.json

@@ -2,13 +2,9 @@
     "name": "web-token/signature-pack",
     "type": "symfony-pack",
     "license": "MIT",
-    "description": "A pack with all signature algorithms for the web-token/jwt-signature package",
+    "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
     "require": {
-        "web-token/jwt-signature-algorithm-ecdsa": "^3.2",
-        "web-token/jwt-signature-algorithm-eddsa": "^3.2",
-        "web-token/jwt-signature-algorithm-none": "^3.2",
-        "web-token/jwt-signature-algorithm-hmac": "^3.2",
-        "web-token/jwt-signature-algorithm-rsa": "^3.2",
-        "web-token/jwt-signature-algorithm-experimental": "^3.2"
+        "web-token/jwt-library": "^3.3",
+        "web-token/jwt-experimental": "^3.3"
     }
 }

src/Component/composer.json

@@ -47,17 +47,19 @@
         "psr/http-factory": "^1.0",
         "psr/http-client": "^1.0",
         "spomky-labs/pki-framework": "^1.0",
-        "symfony/console": "^5.4|^6.0|^7.0"
+        "symfony/console": "^5.4|^6.0|^7.0",
+        "symfony/polyfill-mbstring": "^1.12"
     },
     "conflict": {
         "spomky-labs/jose": "*"
     },
     "suggest": {
-        "ext-openssl": "For key management (creation, optimization, etc.)",
+        "ext-openssl": "For key management (creation, optimization, etc.) and some algorithms (AES, RSA, ECDSA, etc.)",
         "ext-gmp": "GMP or BCMath is highly recommended to improve the library performance",
         "ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance",
         "ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys",
         "php-http/message-factory": "To enable JKU/X5U support.",
-        "php-http/httplug": "To enable JKU/X5U support."
+        "php-http/httplug": "To enable JKU/X5U support.",
+        "spomky-labs/aes-key-wrap": "For all Key Wrapping algorithms (A128KW, A192KW, A256KW, A128GCMKW, A192GCMKW, A256GCMKW, PBES2-HS256+A128KW, PBES2-HS384+A192KW, PBES2-HS512+A256KW...)"
     }
 }

src/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json → src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "web-token/jwt-encryption-algorithm-aescbc",
-    "description": "AES CBC Based Content Encryption Algorithms the JWT Framework.",
+    "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
     "type": "library",
     "license": "MIT",
     "keywords": [
@@ -32,14 +32,7 @@
             "homepage": "https://github.com/web-token/jwt-framework/contributors"
         }
     ],
-    "autoload": {
-        "psr-4": {
-            "Jose\\Component\\Encryption\\Algorithm\\ContentEncryption\\": ""
-        }
-    },
     "require": {
-        "php": ">=8.1",
-        "ext-openssl": "*",
         "web-token/jwt-library": "^3.3"
     }
 }

src/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json → src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "web-token/jwt-encryption-algorithm-aesgcm",
-    "description": "AES GCM Based Content Encryption Algorithms the JWT Framework.",
+    "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
     "type": "library",
     "license": "MIT",
     "keywords": [
@@ -32,14 +32,7 @@
             "homepage": "https://github.com/web-token/jwt-framework/contributors"
         }
     ],
-    "autoload": {
-        "psr-4": {
-            "Jose\\Component\\Encryption\\Algorithm\\ContentEncryption\\": ""
-        }
-    },
     "require": {
-        "php": ">=8.1",
-        "ext-openssl": "*",
         "web-token/jwt-library": "^3.3"
     }
 }

src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json

@@ -0,0 +1,38 @@
+{
+    "name": "web-token/jwt-encryption-algorithm-aesgcmkw",
+    "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
+    "type": "library",
+    "license": "MIT",
+    "keywords": [
+        "JWS",
+        "JWT",
+        "JWE",
+        "JWA",
+        "JWK",
+        "JWKSet",
+        "Jot",
+        "Jose",
+        "RFC7515",
+        "RFC7516",
+        "RFC7517",
+        "RFC7518",
+        "RFC7519",
+        "RFC7520",
+        "Bundle",
+        "Symfony"
+    ],
+    "homepage": "https://github.com/web-token",
+    "authors": [
+        {
+            "name": "Florent Morselli",
+            "homepage": "https://github.com/Spomky"
+        },
+        {
+            "name": "All contributors",
+            "homepage": "https://github.com/web-token/jwt-framework/contributors"
+        }
+    ],
+    "require": {
+        "web-token/jwt-library": "^3.3"
+    }
+}

src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json

@@ -0,0 +1,38 @@
+{
+    "name": "web-token/jwt-encryption-algorithm-aeskw",
+    "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
+    "type": "library",
+    "license": "MIT",
+    "keywords": [
+        "JWS",
+        "JWT",
+        "JWE",
+        "JWA",
+        "JWK",
+        "JWKSet",
+        "Jot",
+        "Jose",
+        "RFC7515",
+        "RFC7516",
+        "RFC7517",
+        "RFC7518",
+        "RFC7519",
+        "RFC7520",
+        "Bundle",
+        "Symfony"
+    ],
+    "homepage": "https://github.com/web-token",
+    "authors": [
+        {
+            "name": "Florent Morselli",
+            "homepage": "https://github.com/Spomky"
+        },
+        {
+            "name": "All contributors",
+            "homepage": "https://github.com/web-token/jwt-framework/contributors"
+        }
+    ],
+    "require": {
+        "web-token/jwt-library": "^3.3"
+    }
+}

src/EncryptionAlgorithm/KeyEncryption/Direct/composer.json → src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "web-token/jwt-encryption-algorithm-dir",
-    "description": "Direct Key Encryption Algorithm the JWT Framework.",
+    "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
     "type": "library",
     "license": "MIT",
     "keywords": [
@@ -32,13 +32,7 @@
             "homepage": "https://github.com/web-token/jwt-framework/contributors"
         }
     ],
-    "autoload": {
-        "psr-4": {
-            "Jose\\Component\\Encryption\\Algorithm\\KeyEncryption\\": ""
-        }
-    },
     "require": {
-        "php": ">=8.1",
         "web-token/jwt-library": "^3.3"
     }
 }

src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json

@@ -0,0 +1,38 @@
+{
+    "name": "web-token/jwt-encryption-algorithm-ecdh-es",
+    "description": "[DEPRECATED] Please use web-token/jwt-library instead.",
+    "type": "library",
+    "license": "MIT",
+    "keywords": [
+        "JWS",
+        "JWT",
+        "JWE",
+        "JWA",
+        "JWK",
+        "JWKSet",
+        "Jot",
+        "Jose",
+        "RFC7515",
+        "RFC7516",
+        "RFC7517",
+        "RFC7518",
+        "RFC7519",
+        "RFC7520",
+        "Bundle",
+        "Symfony"
+    ],
+    "homepage": "https://github.com/web-token",
+    "authors": [
+        {
+            "name": "Florent Morselli",
+            "homepage": "https://github.com/Spomky"
+        },
+        {
+            "name": "All contributors",
+            "homepage": "https://github.com/web-token/jwt-framework/contributors"
+        }
+    ],
+    "require": {
+        "web-token/jwt-library": "^3.3"
+    }
+}