diff --git a/.gitsplit.yml b/.gitsplit.yml index 092064044..b795feaf5 100644 --- a/.gitsplit.yml +++ b/.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" diff --git a/composer.json b/composer.json index 62b569e41..21c123042 100644 --- a/composer.json +++ b/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": "*" diff --git a/packs/encryption/composer.json b/packs/encryption/composer.json index af6e3e9ff..4fc593eb3 100644 --- a/packs/encryption/composer.json +++ b/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" } } diff --git a/packs/signature/composer.json b/packs/signature/composer.json index 235ea268f..a18afc6f1 100644 --- a/packs/signature/composer.json +++ b/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" } } diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/A128CBCHS256.php b/src/Component/Encryption/Algorithm/ContentEncryption/A128CBCHS256.php similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/A128CBCHS256.php rename to src/Component/Encryption/Algorithm/ContentEncryption/A128CBCHS256.php diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/A128GCM.php b/src/Component/Encryption/Algorithm/ContentEncryption/A128GCM.php similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/A128GCM.php rename to src/Component/Encryption/Algorithm/ContentEncryption/A128GCM.php diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/A192CBCHS384.php b/src/Component/Encryption/Algorithm/ContentEncryption/A192CBCHS384.php similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/A192CBCHS384.php rename to src/Component/Encryption/Algorithm/ContentEncryption/A192CBCHS384.php diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/A192GCM.php b/src/Component/Encryption/Algorithm/ContentEncryption/A192GCM.php similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/A192GCM.php rename to src/Component/Encryption/Algorithm/ContentEncryption/A192GCM.php diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/A256CBCHS512.php b/src/Component/Encryption/Algorithm/ContentEncryption/A256CBCHS512.php similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/A256CBCHS512.php rename to src/Component/Encryption/Algorithm/ContentEncryption/A256CBCHS512.php diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/A256GCM.php b/src/Component/Encryption/Algorithm/ContentEncryption/A256GCM.php similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/A256GCM.php rename to src/Component/Encryption/Algorithm/ContentEncryption/A256GCM.php diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/AESCBCHS.php b/src/Component/Encryption/Algorithm/ContentEncryption/AESCBCHS.php similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/AESCBCHS.php rename to src/Component/Encryption/Algorithm/ContentEncryption/AESCBCHS.php diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/AESGCM.php b/src/Component/Encryption/Algorithm/ContentEncryption/AESGCM.php similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/AESGCM.php rename to src/Component/Encryption/Algorithm/ContentEncryption/AESGCM.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/A128GCMKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/A128GCMKW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/A128GCMKW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/A128GCMKW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/A128KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/A128KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/A128KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/A128KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/A192GCMKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/A192GCMKW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/A192GCMKW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/A192GCMKW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/A192KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/A192KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/A192KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/A192KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/A256GCMKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/A256GCMKW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/A256GCMKW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/A256GCMKW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/A256KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/A256KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/A256KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/A256KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/AESGCMKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/AESGCMKW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/AESGCMKW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/AESGCMKW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/AESKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/AESKW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/AESKW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/AESKW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/AbstractECDH.php b/src/Component/Encryption/Algorithm/KeyEncryption/AbstractECDH.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/AbstractECDH.php rename to src/Component/Encryption/Algorithm/KeyEncryption/AbstractECDH.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/AbstractECDHAESKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/AbstractECDHAESKW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/AbstractECDHAESKW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/AbstractECDHAESKW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/Dir.php b/src/Component/Encryption/Algorithm/KeyEncryption/Dir.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/Direct/Dir.php rename to src/Component/Encryption/Algorithm/KeyEncryption/Dir.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHES.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHES.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHES.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHES.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESA128KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHESA128KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESA128KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHESA128KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESA192KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHESA192KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESA192KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHESA192KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESA256KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHESA256KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESA256KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHESA256KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESAESKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHESAESKW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESAESKW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHESAESKW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSS.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHSS.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSS.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHSS.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSSA128KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHSSA128KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSSA128KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHSSA128KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSSA192KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHSSA192KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSSA192KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHSSA192KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSSA256KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHSSA256KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSSA256KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHSSA256KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSSAESKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/ECDHSSAESKW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHSSAESKW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/ECDHSSAESKW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2AESKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/PBES2AESKW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2AESKW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/PBES2AESKW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2HS256A128KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/PBES2HS256A128KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2HS256A128KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/PBES2HS256A128KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2HS384A192KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/PBES2HS384A192KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2HS384A192KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/PBES2HS384A192KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2HS512A256KW.php b/src/Component/Encryption/Algorithm/KeyEncryption/PBES2HS512A256KW.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2HS512A256KW.php rename to src/Component/Encryption/Algorithm/KeyEncryption/PBES2HS512A256KW.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/RSA.php b/src/Component/Encryption/Algorithm/KeyEncryption/RSA.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/RSA.php rename to src/Component/Encryption/Algorithm/KeyEncryption/RSA.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/RSA15.php b/src/Component/Encryption/Algorithm/KeyEncryption/RSA15.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/RSA15.php rename to src/Component/Encryption/Algorithm/KeyEncryption/RSA15.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/RSAOAEP.php b/src/Component/Encryption/Algorithm/KeyEncryption/RSAOAEP.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/RSAOAEP.php rename to src/Component/Encryption/Algorithm/KeyEncryption/RSAOAEP.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/RSAOAEP256.php b/src/Component/Encryption/Algorithm/KeyEncryption/RSAOAEP256.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/RSAOAEP256.php rename to src/Component/Encryption/Algorithm/KeyEncryption/RSAOAEP256.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/Util/ConcatKDF.php b/src/Component/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/Util/ConcatKDF.php rename to src/Component/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/Util/RSACrypt.php b/src/Component/Encryption/Algorithm/KeyEncryption/Util/RSACrypt.php similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/Util/RSACrypt.php rename to src/Component/Encryption/Algorithm/KeyEncryption/Util/RSACrypt.php diff --git a/src/SignatureAlgorithm/ECDSA/ECDSA.php b/src/Component/Signature/Algorithm/ECDSA.php similarity index 100% rename from src/SignatureAlgorithm/ECDSA/ECDSA.php rename to src/Component/Signature/Algorithm/ECDSA.php diff --git a/src/SignatureAlgorithm/ECDSA/ES256.php b/src/Component/Signature/Algorithm/ES256.php similarity index 100% rename from src/SignatureAlgorithm/ECDSA/ES256.php rename to src/Component/Signature/Algorithm/ES256.php diff --git a/src/SignatureAlgorithm/ECDSA/ES384.php b/src/Component/Signature/Algorithm/ES384.php similarity index 100% rename from src/SignatureAlgorithm/ECDSA/ES384.php rename to src/Component/Signature/Algorithm/ES384.php diff --git a/src/SignatureAlgorithm/ECDSA/ES512.php b/src/Component/Signature/Algorithm/ES512.php similarity index 100% rename from src/SignatureAlgorithm/ECDSA/ES512.php rename to src/Component/Signature/Algorithm/ES512.php diff --git a/src/SignatureAlgorithm/EdDSA/EdDSA.php b/src/Component/Signature/Algorithm/EdDSA.php similarity index 100% rename from src/SignatureAlgorithm/EdDSA/EdDSA.php rename to src/Component/Signature/Algorithm/EdDSA.php diff --git a/src/SignatureAlgorithm/HMAC/HMAC.php b/src/Component/Signature/Algorithm/HMAC.php similarity index 100% rename from src/SignatureAlgorithm/HMAC/HMAC.php rename to src/Component/Signature/Algorithm/HMAC.php diff --git a/src/SignatureAlgorithm/HMAC/HS256.php b/src/Component/Signature/Algorithm/HS256.php similarity index 100% rename from src/SignatureAlgorithm/HMAC/HS256.php rename to src/Component/Signature/Algorithm/HS256.php diff --git a/src/SignatureAlgorithm/HMAC/HS384.php b/src/Component/Signature/Algorithm/HS384.php similarity index 100% rename from src/SignatureAlgorithm/HMAC/HS384.php rename to src/Component/Signature/Algorithm/HS384.php diff --git a/src/SignatureAlgorithm/HMAC/HS512.php b/src/Component/Signature/Algorithm/HS512.php similarity index 100% rename from src/SignatureAlgorithm/HMAC/HS512.php rename to src/Component/Signature/Algorithm/HS512.php diff --git a/src/SignatureAlgorithm/None/None.php b/src/Component/Signature/Algorithm/None.php similarity index 100% rename from src/SignatureAlgorithm/None/None.php rename to src/Component/Signature/Algorithm/None.php diff --git a/src/SignatureAlgorithm/RSA/PS256.php b/src/Component/Signature/Algorithm/PS256.php similarity index 100% rename from src/SignatureAlgorithm/RSA/PS256.php rename to src/Component/Signature/Algorithm/PS256.php diff --git a/src/SignatureAlgorithm/RSA/PS384.php b/src/Component/Signature/Algorithm/PS384.php similarity index 100% rename from src/SignatureAlgorithm/RSA/PS384.php rename to src/Component/Signature/Algorithm/PS384.php diff --git a/src/SignatureAlgorithm/RSA/PS512.php b/src/Component/Signature/Algorithm/PS512.php similarity index 100% rename from src/SignatureAlgorithm/RSA/PS512.php rename to src/Component/Signature/Algorithm/PS512.php diff --git a/src/SignatureAlgorithm/RSA/RS256.php b/src/Component/Signature/Algorithm/RS256.php similarity index 100% rename from src/SignatureAlgorithm/RSA/RS256.php rename to src/Component/Signature/Algorithm/RS256.php diff --git a/src/SignatureAlgorithm/RSA/RS384.php b/src/Component/Signature/Algorithm/RS384.php similarity index 100% rename from src/SignatureAlgorithm/RSA/RS384.php rename to src/Component/Signature/Algorithm/RS384.php diff --git a/src/SignatureAlgorithm/RSA/RS512.php b/src/Component/Signature/Algorithm/RS512.php similarity index 100% rename from src/SignatureAlgorithm/RSA/RS512.php rename to src/Component/Signature/Algorithm/RS512.php diff --git a/src/SignatureAlgorithm/RSA/RSAPKCS1.php b/src/Component/Signature/Algorithm/RSAPKCS1.php similarity index 100% rename from src/SignatureAlgorithm/RSA/RSAPKCS1.php rename to src/Component/Signature/Algorithm/RSAPKCS1.php diff --git a/src/SignatureAlgorithm/RSA/RSAPSS.php b/src/Component/Signature/Algorithm/RSAPSS.php similarity index 100% rename from src/SignatureAlgorithm/RSA/RSAPSS.php rename to src/Component/Signature/Algorithm/RSAPSS.php diff --git a/src/SignatureAlgorithm/RSA/Util/RSA.php b/src/Component/Signature/Algorithm/Util/RSA.php similarity index 100% rename from src/SignatureAlgorithm/RSA/Util/RSA.php rename to src/Component/Signature/Algorithm/Util/RSA.php diff --git a/src/Component/composer.json b/src/Component/composer.json index dab14d23e..909b60889 100644 --- a/src/Component/composer.json +++ b/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...)" } } diff --git a/src/Component/Encryption/.github/CONTRIBUTING.md b/src/Deprecated/Ecc/.github/CONTRIBUTING.md similarity index 100% rename from src/Component/Encryption/.github/CONTRIBUTING.md rename to src/Deprecated/Ecc/.github/CONTRIBUTING.md diff --git a/src/Component/Encryption/.github/FUNDING.yml b/src/Deprecated/Ecc/.github/FUNDING.yml similarity index 100% rename from src/Component/Encryption/.github/FUNDING.yml rename to src/Deprecated/Ecc/.github/FUNDING.yml diff --git a/src/Component/Encryption/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Ecc/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/Component/Encryption/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/Ecc/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/Component/Encryption/.github/stale.yml b/src/Deprecated/Ecc/.github/stale.yml similarity index 100% rename from src/Component/Encryption/.github/stale.yml rename to src/Deprecated/Ecc/.github/stale.yml diff --git a/src/Component/KeyManagement/LICENSE b/src/Deprecated/Ecc/LICENSE similarity index 100% rename from src/Component/KeyManagement/LICENSE rename to src/Deprecated/Ecc/LICENSE diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/CONTRIBUTING.md similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/CONTRIBUTING.md rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/CONTRIBUTING.md diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/FUNDING.yml similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/FUNDING.yml rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/FUNDING.yml diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/stale.yml similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/stale.yml rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/stale.yml diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/README.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/README.md similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/README.md rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/README.md diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json similarity index 74% rename from src/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json index a2778f45b..d0eb733a4 100644 --- a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json +++ b/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" } } diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/CONTRIBUTING.md similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/CONTRIBUTING.md rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/CONTRIBUTING.md diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/FUNDING.yml similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/FUNDING.yml rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/FUNDING.yml diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/stale.yml similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/stale.yml rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/stale.yml diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/README.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/README.md similarity index 100% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/README.md rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/README.md diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json similarity index 74% rename from src/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json rename to src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json index 8fbcc0ea9..96532284c 100644 --- a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json +++ b/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" } } diff --git a/src/EncryptionAlgorithm/Experimental/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/Experimental/.github/CONTRIBUTING.md similarity index 100% rename from src/EncryptionAlgorithm/Experimental/.github/CONTRIBUTING.md rename to src/Deprecated/EncryptionAlgorithm/Experimental/.github/CONTRIBUTING.md diff --git a/src/EncryptionAlgorithm/Experimental/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/Experimental/.github/FUNDING.yml similarity index 100% rename from src/EncryptionAlgorithm/Experimental/.github/FUNDING.yml rename to src/Deprecated/EncryptionAlgorithm/Experimental/.github/FUNDING.yml diff --git a/src/EncryptionAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/EncryptionAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/EncryptionAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/EncryptionAlgorithm/Experimental/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/Experimental/.github/stale.yml similarity index 100% rename from src/EncryptionAlgorithm/Experimental/.github/stale.yml rename to src/Deprecated/EncryptionAlgorithm/Experimental/.github/stale.yml diff --git a/src/EncryptionAlgorithm/Experimental/LICENSE b/src/Deprecated/EncryptionAlgorithm/Experimental/LICENSE similarity index 100% rename from src/EncryptionAlgorithm/Experimental/LICENSE rename to src/Deprecated/EncryptionAlgorithm/Experimental/LICENSE diff --git a/src/EncryptionAlgorithm/Experimental/README.md b/src/Deprecated/EncryptionAlgorithm/Experimental/README.md similarity index 100% rename from src/EncryptionAlgorithm/Experimental/README.md rename to src/Deprecated/EncryptionAlgorithm/Experimental/README.md diff --git a/src/EncryptionAlgorithm/Experimental/composer.json b/src/Deprecated/EncryptionAlgorithm/Experimental/composer.json similarity index 100% rename from src/EncryptionAlgorithm/Experimental/composer.json rename to src/Deprecated/EncryptionAlgorithm/Experimental/composer.json diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/CONTRIBUTING.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/CONTRIBUTING.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/CONTRIBUTING.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/FUNDING.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/FUNDING.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/FUNDING.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/stale.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/stale.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/stale.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/README.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/README.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/README.md diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json new file mode 100644 index 000000000..3a851333b --- /dev/null +++ b/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" + } +} diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/CONTRIBUTING.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/.github/CONTRIBUTING.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/CONTRIBUTING.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/FUNDING.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/.github/FUNDING.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/FUNDING.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/stale.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/.github/stale.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/stale.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/README.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/AESKW/README.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/README.md diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json new file mode 100644 index 000000000..fd7b4776c --- /dev/null +++ b/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" + } +} diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/CONTRIBUTING.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/Direct/.github/CONTRIBUTING.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/CONTRIBUTING.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/FUNDING.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/Direct/.github/FUNDING.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/FUNDING.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/Direct/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/stale.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/Direct/.github/stale.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/stale.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/README.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/Direct/README.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/README.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/composer.json similarity index 77% rename from src/EncryptionAlgorithm/KeyEncryption/Direct/composer.json rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/composer.json index 6b040ece0..21ee9b678 100644 --- a/src/EncryptionAlgorithm/KeyEncryption/Direct/composer.json +++ b/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" } } diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/CONTRIBUTING.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/CONTRIBUTING.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/CONTRIBUTING.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/FUNDING.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/FUNDING.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/FUNDING.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/stale.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/stale.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/stale.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/README.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/ECDHES/README.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/README.md diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json new file mode 100644 index 000000000..dea0db381 --- /dev/null +++ b/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" + } +} diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/CONTRIBUTING.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/.github/CONTRIBUTING.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/CONTRIBUTING.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/FUNDING.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/.github/FUNDING.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/FUNDING.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/stale.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/.github/stale.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/stale.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/README.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/README.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/README.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json similarity index 77% rename from src/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json index 0c358e585..4b9d88868 100644 --- a/src/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json +++ b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json @@ -1,6 +1,6 @@ { "name": "web-token/jwt-encryption-algorithm-pbes2", - "description": "PBES2* Based Key Encryption Algorithms 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" } } diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/CONTRIBUTING.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/.github/CONTRIBUTING.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/CONTRIBUTING.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/FUNDING.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/.github/FUNDING.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/FUNDING.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/stale.yml similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/.github/stale.yml rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/stale.yml diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/README.md similarity index 100% rename from src/EncryptionAlgorithm/KeyEncryption/RSA/README.md rename to src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/README.md diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/composer.json new file mode 100644 index 000000000..d28aa14a2 --- /dev/null +++ b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/composer.json @@ -0,0 +1,38 @@ +{ + "name": "web-token/jwt-encryption-algorithm-rsa", + "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" + } +} diff --git a/src/SignatureAlgorithm/ECDSA/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/ECDSA/.github/CONTRIBUTING.md similarity index 100% rename from src/SignatureAlgorithm/ECDSA/.github/CONTRIBUTING.md rename to src/Deprecated/SignatureAlgorithm/ECDSA/.github/CONTRIBUTING.md diff --git a/src/SignatureAlgorithm/ECDSA/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/ECDSA/.github/FUNDING.yml similarity index 100% rename from src/SignatureAlgorithm/ECDSA/.github/FUNDING.yml rename to src/Deprecated/SignatureAlgorithm/ECDSA/.github/FUNDING.yml diff --git a/src/SignatureAlgorithm/ECDSA/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/ECDSA/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/SignatureAlgorithm/ECDSA/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/SignatureAlgorithm/ECDSA/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/SignatureAlgorithm/ECDSA/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/ECDSA/.github/stale.yml similarity index 100% rename from src/SignatureAlgorithm/ECDSA/.github/stale.yml rename to src/Deprecated/SignatureAlgorithm/ECDSA/.github/stale.yml diff --git a/src/SignatureAlgorithm/ECDSA/LICENSE b/src/Deprecated/SignatureAlgorithm/ECDSA/LICENSE similarity index 100% rename from src/SignatureAlgorithm/ECDSA/LICENSE rename to src/Deprecated/SignatureAlgorithm/ECDSA/LICENSE diff --git a/src/SignatureAlgorithm/ECDSA/README.md b/src/Deprecated/SignatureAlgorithm/ECDSA/README.md similarity index 100% rename from src/SignatureAlgorithm/ECDSA/README.md rename to src/Deprecated/SignatureAlgorithm/ECDSA/README.md diff --git a/src/SignatureAlgorithm/ECDSA/composer.json b/src/Deprecated/SignatureAlgorithm/ECDSA/composer.json similarity index 76% rename from src/SignatureAlgorithm/ECDSA/composer.json rename to src/Deprecated/SignatureAlgorithm/ECDSA/composer.json index 8774244d6..77f6634ce 100644 --- a/src/SignatureAlgorithm/ECDSA/composer.json +++ b/src/Deprecated/SignatureAlgorithm/ECDSA/composer.json @@ -1,6 +1,6 @@ { "name": "web-token/jwt-signature-algorithm-ecdsa", - "description": "ECDSA Based Signature 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\\Signature\\Algorithm\\": "" - } - }, "require": { - "php": ">=8.1", - "ext-openssl": "*", "web-token/jwt-library": "^3.3" } } diff --git a/src/SignatureAlgorithm/EdDSA/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/EdDSA/.github/CONTRIBUTING.md similarity index 100% rename from src/SignatureAlgorithm/EdDSA/.github/CONTRIBUTING.md rename to src/Deprecated/SignatureAlgorithm/EdDSA/.github/CONTRIBUTING.md diff --git a/src/SignatureAlgorithm/EdDSA/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/EdDSA/.github/FUNDING.yml similarity index 100% rename from src/SignatureAlgorithm/EdDSA/.github/FUNDING.yml rename to src/Deprecated/SignatureAlgorithm/EdDSA/.github/FUNDING.yml diff --git a/src/SignatureAlgorithm/EdDSA/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/EdDSA/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/SignatureAlgorithm/EdDSA/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/SignatureAlgorithm/EdDSA/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/SignatureAlgorithm/EdDSA/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/EdDSA/.github/stale.yml similarity index 100% rename from src/SignatureAlgorithm/EdDSA/.github/stale.yml rename to src/Deprecated/SignatureAlgorithm/EdDSA/.github/stale.yml diff --git a/src/SignatureAlgorithm/EdDSA/LICENSE b/src/Deprecated/SignatureAlgorithm/EdDSA/LICENSE similarity index 100% rename from src/SignatureAlgorithm/EdDSA/LICENSE rename to src/Deprecated/SignatureAlgorithm/EdDSA/LICENSE diff --git a/src/SignatureAlgorithm/EdDSA/README.md b/src/Deprecated/SignatureAlgorithm/EdDSA/README.md similarity index 100% rename from src/SignatureAlgorithm/EdDSA/README.md rename to src/Deprecated/SignatureAlgorithm/EdDSA/README.md diff --git a/src/SignatureAlgorithm/EdDSA/composer.json b/src/Deprecated/SignatureAlgorithm/EdDSA/composer.json similarity index 77% rename from src/SignatureAlgorithm/EdDSA/composer.json rename to src/Deprecated/SignatureAlgorithm/EdDSA/composer.json index 9854987a7..a6d0b1ae0 100644 --- a/src/SignatureAlgorithm/EdDSA/composer.json +++ b/src/Deprecated/SignatureAlgorithm/EdDSA/composer.json @@ -1,6 +1,6 @@ { "name": "web-token/jwt-signature-algorithm-eddsa", - "description": "EdDSA Signature Algorithm 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\\Signature\\Algorithm\\": "" - } - }, "require": { - "php": ">=8.1", - "ext-sodium": "*", "web-token/jwt-library": "^3.3" } } diff --git a/src/SignatureAlgorithm/Experimental/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/Experimental/.github/CONTRIBUTING.md similarity index 100% rename from src/SignatureAlgorithm/Experimental/.github/CONTRIBUTING.md rename to src/Deprecated/SignatureAlgorithm/Experimental/.github/CONTRIBUTING.md diff --git a/src/SignatureAlgorithm/Experimental/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/Experimental/.github/FUNDING.yml similarity index 100% rename from src/SignatureAlgorithm/Experimental/.github/FUNDING.yml rename to src/Deprecated/SignatureAlgorithm/Experimental/.github/FUNDING.yml diff --git a/src/SignatureAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/SignatureAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/SignatureAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/SignatureAlgorithm/Experimental/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/Experimental/.github/stale.yml similarity index 100% rename from src/SignatureAlgorithm/Experimental/.github/stale.yml rename to src/Deprecated/SignatureAlgorithm/Experimental/.github/stale.yml diff --git a/src/SignatureAlgorithm/Experimental/LICENSE b/src/Deprecated/SignatureAlgorithm/Experimental/LICENSE similarity index 100% rename from src/SignatureAlgorithm/Experimental/LICENSE rename to src/Deprecated/SignatureAlgorithm/Experimental/LICENSE diff --git a/src/SignatureAlgorithm/Experimental/README.md b/src/Deprecated/SignatureAlgorithm/Experimental/README.md similarity index 100% rename from src/SignatureAlgorithm/Experimental/README.md rename to src/Deprecated/SignatureAlgorithm/Experimental/README.md diff --git a/src/SignatureAlgorithm/Experimental/composer.json b/src/Deprecated/SignatureAlgorithm/Experimental/composer.json similarity index 100% rename from src/SignatureAlgorithm/Experimental/composer.json rename to src/Deprecated/SignatureAlgorithm/Experimental/composer.json diff --git a/src/SignatureAlgorithm/HMAC/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/HMAC/.github/CONTRIBUTING.md similarity index 100% rename from src/SignatureAlgorithm/HMAC/.github/CONTRIBUTING.md rename to src/Deprecated/SignatureAlgorithm/HMAC/.github/CONTRIBUTING.md diff --git a/src/SignatureAlgorithm/HMAC/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/HMAC/.github/FUNDING.yml similarity index 100% rename from src/SignatureAlgorithm/HMAC/.github/FUNDING.yml rename to src/Deprecated/SignatureAlgorithm/HMAC/.github/FUNDING.yml diff --git a/src/SignatureAlgorithm/HMAC/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/HMAC/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/SignatureAlgorithm/HMAC/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/SignatureAlgorithm/HMAC/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/SignatureAlgorithm/HMAC/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/HMAC/.github/stale.yml similarity index 100% rename from src/SignatureAlgorithm/HMAC/.github/stale.yml rename to src/Deprecated/SignatureAlgorithm/HMAC/.github/stale.yml diff --git a/src/SignatureAlgorithm/HMAC/LICENSE b/src/Deprecated/SignatureAlgorithm/HMAC/LICENSE similarity index 100% rename from src/SignatureAlgorithm/HMAC/LICENSE rename to src/Deprecated/SignatureAlgorithm/HMAC/LICENSE diff --git a/src/SignatureAlgorithm/HMAC/README.md b/src/Deprecated/SignatureAlgorithm/HMAC/README.md similarity index 100% rename from src/SignatureAlgorithm/HMAC/README.md rename to src/Deprecated/SignatureAlgorithm/HMAC/README.md diff --git a/src/SignatureAlgorithm/HMAC/composer.json b/src/Deprecated/SignatureAlgorithm/HMAC/composer.json similarity index 79% rename from src/SignatureAlgorithm/HMAC/composer.json rename to src/Deprecated/SignatureAlgorithm/HMAC/composer.json index ee4609f6d..24f673cf2 100644 --- a/src/SignatureAlgorithm/HMAC/composer.json +++ b/src/Deprecated/SignatureAlgorithm/HMAC/composer.json @@ -1,6 +1,6 @@ { "name": "web-token/jwt-signature-algorithm-hmac", - "description": "HMAC Based Signature Algorithms 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\\Signature\\Algorithm\\": "" - } - }, "require": { - "php": ">=8.1", "web-token/jwt-library": "^3.3" } } diff --git a/src/SignatureAlgorithm/None/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/None/.github/CONTRIBUTING.md similarity index 100% rename from src/SignatureAlgorithm/None/.github/CONTRIBUTING.md rename to src/Deprecated/SignatureAlgorithm/None/.github/CONTRIBUTING.md diff --git a/src/SignatureAlgorithm/None/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/None/.github/FUNDING.yml similarity index 100% rename from src/SignatureAlgorithm/None/.github/FUNDING.yml rename to src/Deprecated/SignatureAlgorithm/None/.github/FUNDING.yml diff --git a/src/SignatureAlgorithm/None/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/None/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/SignatureAlgorithm/None/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/SignatureAlgorithm/None/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/SignatureAlgorithm/None/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/None/.github/stale.yml similarity index 100% rename from src/SignatureAlgorithm/None/.github/stale.yml rename to src/Deprecated/SignatureAlgorithm/None/.github/stale.yml diff --git a/src/SignatureAlgorithm/None/LICENSE b/src/Deprecated/SignatureAlgorithm/None/LICENSE similarity index 100% rename from src/SignatureAlgorithm/None/LICENSE rename to src/Deprecated/SignatureAlgorithm/None/LICENSE diff --git a/src/SignatureAlgorithm/None/README.md b/src/Deprecated/SignatureAlgorithm/None/README.md similarity index 100% rename from src/SignatureAlgorithm/None/README.md rename to src/Deprecated/SignatureAlgorithm/None/README.md diff --git a/src/SignatureAlgorithm/None/composer.json b/src/Deprecated/SignatureAlgorithm/None/composer.json similarity index 79% rename from src/SignatureAlgorithm/None/composer.json rename to src/Deprecated/SignatureAlgorithm/None/composer.json index 4ee78c492..32857fce6 100644 --- a/src/SignatureAlgorithm/None/composer.json +++ b/src/Deprecated/SignatureAlgorithm/None/composer.json @@ -1,6 +1,6 @@ { "name": "web-token/jwt-signature-algorithm-none", - "description": "None Signature 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\\Signature\\Algorithm\\": "" - } - }, "require": { - "php": ">=8.1", "web-token/jwt-library": "^3.3" } } diff --git a/src/SignatureAlgorithm/RSA/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/RSA/.github/CONTRIBUTING.md similarity index 100% rename from src/SignatureAlgorithm/RSA/.github/CONTRIBUTING.md rename to src/Deprecated/SignatureAlgorithm/RSA/.github/CONTRIBUTING.md diff --git a/src/SignatureAlgorithm/RSA/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/RSA/.github/FUNDING.yml similarity index 100% rename from src/SignatureAlgorithm/RSA/.github/FUNDING.yml rename to src/Deprecated/SignatureAlgorithm/RSA/.github/FUNDING.yml diff --git a/src/SignatureAlgorithm/RSA/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/RSA/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/SignatureAlgorithm/RSA/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/SignatureAlgorithm/RSA/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/SignatureAlgorithm/RSA/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/RSA/.github/stale.yml similarity index 100% rename from src/SignatureAlgorithm/RSA/.github/stale.yml rename to src/Deprecated/SignatureAlgorithm/RSA/.github/stale.yml diff --git a/src/SignatureAlgorithm/RSA/LICENSE b/src/Deprecated/SignatureAlgorithm/RSA/LICENSE similarity index 100% rename from src/SignatureAlgorithm/RSA/LICENSE rename to src/Deprecated/SignatureAlgorithm/RSA/LICENSE diff --git a/src/SignatureAlgorithm/RSA/README.md b/src/Deprecated/SignatureAlgorithm/RSA/README.md similarity index 100% rename from src/SignatureAlgorithm/RSA/README.md rename to src/Deprecated/SignatureAlgorithm/RSA/README.md diff --git a/src/Deprecated/SignatureAlgorithm/RSA/composer.json b/src/Deprecated/SignatureAlgorithm/RSA/composer.json new file mode 100644 index 000000000..f6f1ba764 --- /dev/null +++ b/src/Deprecated/SignatureAlgorithm/RSA/composer.json @@ -0,0 +1,38 @@ +{ + "name": "web-token/jwt-signature-algorithm-rsa", + "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" + } +} diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json b/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json deleted file mode 100644 index 1aefb30da..000000000 --- a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-aesgcmkw", - "description": "AES GCM Key Wrapping Based Key Encryption Algorithms the JWT Framework.", - "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" - } - ], - "autoload": { - "psr-4": { - "Jose\\Component\\Encryption\\Algorithm\\KeyEncryption\\": "" - } - }, - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "spomky-labs/aes-key-wrap": "^7.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json b/src/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json deleted file mode 100644 index 3d6bae716..000000000 --- a/src/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-aeskw", - "description": "AES Key Wrapping Based Key Encryption Algorithms the JWT Framework.", - "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" - } - ], - "autoload": { - "psr-4": { - "Jose\\Component\\Encryption\\Algorithm\\KeyEncryption\\": "" - } - }, - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "spomky-labs/aes-key-wrap": "^7.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json b/src/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json deleted file mode 100644 index 0fd80c99a..000000000 --- a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-ecdh-es", - "description": "ECDH-ES Based Key Encryption Algorithms the JWT Framework.", - "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" - } - ], - "autoload": { - "psr-4": { - "Jose\\Component\\Encryption\\Algorithm\\KeyEncryption\\": "" - } - }, - "suggest": { - "ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys" - }, - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "spomky-labs/aes-key-wrap": "^7.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json b/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json deleted file mode 100644 index 7d5077915..000000000 --- a/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-rsa", - "description": "RSA Based Key Encryption Algorithms the JWT Framework.", - "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" - } - ], - "autoload": { - "psr-4": { - "Jose\\Component\\Encryption\\Algorithm\\KeyEncryption\\": "" - } - }, - "require": { - "php": ">=8.1", - "brick/math": "^0.9|^0.10|^0.11|^0.12", - "ext-openssl": "*", - "symfony/polyfill-mbstring": "^1.12", - "web-token/jwt-library": "^3.3" - }, - "suggest": { - "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" - } -} diff --git a/src/SignatureAlgorithm/RSA/composer.json b/src/SignatureAlgorithm/RSA/composer.json deleted file mode 100644 index b6fa8c311..000000000 --- a/src/SignatureAlgorithm/RSA/composer.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "web-token/jwt-signature-algorithm-rsa", - "description": "RSA Based Signature Algorithms the JWT Framework.", - "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" - } - ], - "autoload": { - "psr-4": { - "Jose\\Component\\Signature\\Algorithm\\": "" - } - }, - "require": { - "php": ">=8.1", - "brick/math": "^0.9|^0.10|^0.11|^0.12", - "ext-openssl": "*", - "web-token/jwt-library": "^3.3" - }, - "suggest": { - "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" - } -} diff --git a/tests/ComposerJsonTest.php b/tests/ComposerJsonTest.php index 124ccfdc0..8b7962a1d 100644 --- a/tests/ComposerJsonTest.php +++ b/tests/ComposerJsonTest.php @@ -28,6 +28,7 @@ public function packageDependenciesEqualRootDependencies(): void $rootDependencies = $this->getComposerDependencies(__DIR__ . '/../composer.json'); foreach ($this->listSubPackages() as $package) { + dump($package); $packageDependencies = $this->getComposerDependencies($package . '/composer.json'); foreach ($packageDependencies as $dependency => $version) { // Skip web-auth/* dependencies