Skip to content

Commit bfa1102

Browse files
SpomkySpomky
authored
Features/merge algorithms (#509)
Merge algorithms to jwt-library
1 parent 5e6882f commit bfa1102

File tree

179 files changed

+237
-369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+237
-369
lines changed

‎.gitsplit.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
splits:
2+
- prefix: "src/Deprecated/Signature"
3+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git"
4+
- prefix: "src/JoseFramework"
5+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-bundle.git"
6+
- prefix: "src/Component"
7+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-library.git"
8+
- prefix: "src/Experimental"
9+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-experimental.git"
210
- prefix: "src/Deprecated/Checker"
311
target: "https://${GH_TOKEN}@github.com/web-token/jwt-checker.git"
412
- prefix: "src/Deprecated/Console"
@@ -13,44 +21,36 @@ splits:
1321
target: "https://${GH_TOKEN}@github.com/web-token/jwt-key-mgmt.git"
1422
- prefix: "src/Deprecated/NestedToken"
1523
target: "https://${GH_TOKEN}@github.com/web-token/jwt-nested-token.git"
16-
- prefix: "src/Deprecated/Signature"
17-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git"
18-
- prefix: "src/JoseFramework"
19-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-bundle.git"
20-
- prefix: "src/Component"
21-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-library.git"
22-
- prefix: "src/EncryptionAlgorithm/ContentEncryption/AESCBC"
24+
- prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC"
2325
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aescbc.git"
24-
- prefix: "src/EncryptionAlgorithm/ContentEncryption/AESGCM"
26+
- prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM"
2527
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcm.git"
26-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/AESGCMKW"
28+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW"
2729
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcmkw.git"
28-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/AESKW"
30+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW"
2931
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aeskw.git"
30-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/Direct"
32+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct"
3133
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-dir.git"
32-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/ECDHES"
34+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES"
3335
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-ecdh-es.git"
34-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/PBES2"
36+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2"
3537
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-pbes2.git"
36-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/RSA"
38+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA"
3739
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-rsa.git"
38-
- prefix: "src/SignatureAlgorithm/ECDSA"
40+
- prefix: "src/Deprecated/SignatureAlgorithm/ECDSA"
3941
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-ecdsa.git"
40-
- prefix: "src/SignatureAlgorithm/EdDSA"
42+
- prefix: "src/Deprecated/SignatureAlgorithm/EdDSA"
4143
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-eddsa.git"
42-
- prefix: "src/SignatureAlgorithm/None"
44+
- prefix: "src/Deprecated/SignatureAlgorithm/None"
4345
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-none.git"
44-
- prefix: "src/SignatureAlgorithm/HMAC"
46+
- prefix: "src/Deprecated/SignatureAlgorithm/HMAC"
4547
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-hmac.git"
46-
- prefix: "src/SignatureAlgorithm/RSA"
48+
- prefix: "src/Deprecated/SignatureAlgorithm/RSA"
4749
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-rsa.git"
48-
- prefix: "src/SignatureAlgorithm/Experimental"
50+
- prefix: "src/Deprecated/SignatureAlgorithm/Experimental"
4951
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-experimental.git"
50-
- prefix: "src/EncryptionAlgorithm/Experimental"
52+
- prefix: "src/Deprecated/EncryptionAlgorithm/Experimental"
5153
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-experimental.git"
52-
- prefix: "src/Experimental"
53-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-experimental.git"
5454
- prefix: "packs/encryption"
5555
target: "https://${GH_TOKEN}@github.com/web-token/encryption-pack.git"
5656
- prefix: "packs/signature"

‎composer.json‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,7 @@
3737
"Jose\\": "src/",
3838
"Jose\\Bundle\\JoseFramework\\": "src/JoseFramework/",
3939
"Jose\\Experimental\\": "src/Experimental/",
40-
"Jose\\Component\\": "src/Component/",
41-
"Jose\\Component\\Encryption\\Algorithm\\ContentEncryption\\": [
42-
"src/EncryptionAlgorithm/ContentEncryption/AESCBC",
43-
"src/EncryptionAlgorithm/ContentEncryption/AESGCM"
44-
],
45-
"Jose\\Component\\Encryption\\Algorithm\\KeyEncryption\\": [
46-
"src/EncryptionAlgorithm/KeyEncryption/AESGCMKW",
47-
"src/EncryptionAlgorithm/KeyEncryption/AESKW",
48-
"src/EncryptionAlgorithm/KeyEncryption/Direct",
49-
"src/EncryptionAlgorithm/KeyEncryption/ECDHES",
50-
"src/EncryptionAlgorithm/KeyEncryption/PBES2",
51-
"src/EncryptionAlgorithm/KeyEncryption/RSA"
52-
],
53-
"Jose\\Component\\Signature\\Algorithm\\": [
54-
"src/SignatureAlgorithm/ECDSA",
55-
"src/SignatureAlgorithm/EdDSA",
56-
"src/SignatureAlgorithm/Experimental",
57-
"src/SignatureAlgorithm/HMAC",
58-
"src/SignatureAlgorithm/None",
59-
"src/SignatureAlgorithm/RSA"
60-
]
40+
"Jose\\Component\\": "src/Component/"
6141
}
6242
},
6343
"autoload-dev": {
@@ -71,14 +51,12 @@
7151
"ext-json": "*",
7252
"ext-mbstring": "*",
7353
"ext-openssl": "*",
74-
"ext-sodium": "*",
7554
"brick/math": "^0.9|^0.10|^0.11|^0.12",
7655
"paragonie/constant_time_encoding": "^2.6",
7756
"psr/clock": "^1.0",
7857
"psr/event-dispatcher": "^1.0",
7958
"psr/http-client": "^1.0",
8059
"psr/http-factory": "^1.0",
81-
"spomky-labs/aes-key-wrap": "^7.0",
8260
"spomky-labs/pki-framework": "^1.0",
8361
"symfony/config": "^5.4|^6.0|^7.0",
8462
"symfony/console": "^5.4|^6.0|^7.0",
@@ -107,6 +85,7 @@
10785
"qossmic/deptrac-shim": "^1.0",
10886
"rector/rector": "^0.19",
10987
"roave/security-advisories": "dev-latest",
88+
"spomky-labs/aes-key-wrap": "^7.0",
11089
"symfony/browser-kit": "^6.1|^7.0",
11190
"symfony/finder": "^6.1|^7.0",
11291
"symfony/framework-bundle": "^6.1|^7.0",
@@ -155,7 +134,8 @@
155134
"php-http/httplug-bundle": "To enable JKU/X5U support.",
156135
"php-http/message-factory": "To enable JKU/X5U support.",
157136
"symfony/serializer": "Use the Symfony serializer to serialize/unserialize JWS and JWE tokens.",
158-
"symfony/var-dumper": "Used to show data on the debug toolbar."
137+
"symfony/var-dumper": "Used to show data on the debug toolbar.",
138+
"spomky-labs/aes-key-wrap": "To enable AES Key Wrap algorithm."
159139
},
160140
"conflict": {
161141
"spomky-labs/jose": "*"

‎packs/encryption/composer.json‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,9 @@
22
"name": "web-token/encryption-pack",
33
"type": "symfony-pack",
44
"license": "MIT",
5-
"description": "A pack with all encryption algorithms for the web-token/jwt-encryption package",
5+
"description": "[DEPRECATED] Please use web-token/jwt-library instead.",
66
"require": {
7-
"web-token/jwt-encryption-algorithm-aescbc": "^3.2",
8-
"web-token/jwt-encryption-algorithm-aesgcm": "^3.2",
9-
"web-token/jwt-encryption-algorithm-aesgcmkw": "^3.2",
10-
"web-token/jwt-encryption-algorithm-aeskw": "^3.2",
11-
"web-token/jwt-encryption-algorithm-dir": "^3.2",
12-
"web-token/jwt-encryption-algorithm-ecdh-es": "^3.2",
13-
"web-token/jwt-encryption-algorithm-pbes2": "^3.2",
14-
"web-token/jwt-encryption-algorithm-rsa": "^3.2",
15-
"web-token/jwt-encryption-algorithm-experimental": "^3.2"
7+
"web-token/jwt-library": "^3.3",
8+
"web-token/jwt-experimental": "^3.3"
169
}
1710
}

‎packs/signature/composer.json‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
"name": "web-token/signature-pack",
33
"type": "symfony-pack",
44
"license": "MIT",
5-
"description": "A pack with all signature algorithms for the web-token/jwt-signature package",
5+
"description": "[DEPRECATED] Please use web-token/jwt-library instead.",
66
"require": {
7-
"web-token/jwt-signature-algorithm-ecdsa": "^3.2",
8-
"web-token/jwt-signature-algorithm-eddsa": "^3.2",
9-
"web-token/jwt-signature-algorithm-none": "^3.2",
10-
"web-token/jwt-signature-algorithm-hmac": "^3.2",
11-
"web-token/jwt-signature-algorithm-rsa": "^3.2",
12-
"web-token/jwt-signature-algorithm-experimental": "^3.2"
7+
"web-token/jwt-library": "^3.3",
8+
"web-token/jwt-experimental": "^3.3"
139
}
1410
}

‎src/EncryptionAlgorithm/ContentEncryption/AESCBC/A128CBCHS256.php‎ renamed to ‎src/Component/Encryption/Algorithm/ContentEncryption/A128CBCHS256.php‎

File renamed without changes.

‎src/EncryptionAlgorithm/ContentEncryption/AESGCM/A128GCM.php‎ renamed to ‎src/Component/Encryption/Algorithm/ContentEncryption/A128GCM.php‎

File renamed without changes.

‎src/EncryptionAlgorithm/ContentEncryption/AESCBC/A192CBCHS384.php‎ renamed to ‎src/Component/Encryption/Algorithm/ContentEncryption/A192CBCHS384.php‎

File renamed without changes.

‎src/EncryptionAlgorithm/ContentEncryption/AESGCM/A192GCM.php‎ renamed to ‎src/Component/Encryption/Algorithm/ContentEncryption/A192GCM.php‎

File renamed without changes.

‎src/EncryptionAlgorithm/ContentEncryption/AESCBC/A256CBCHS512.php‎ renamed to ‎src/Component/Encryption/Algorithm/ContentEncryption/A256CBCHS512.php‎

File renamed without changes.

‎src/EncryptionAlgorithm/ContentEncryption/AESGCM/A256GCM.php‎ renamed to ‎src/Component/Encryption/Algorithm/ContentEncryption/A256GCM.php‎

File renamed without changes.

0 commit comments

Comments
 (0)