Merge ECC to jwt-core (#507)

Merge ECC to jwt-core
web-token · Jan 30, 2024 · 4eb3429 · 4eb3429
1 parent 1e1ab7a
commit 4eb3429
Show file tree

Hide file tree

Showing 74 changed files with 882 additions and 1,319 deletions.
diff --git a/composer.json b/composer.json
@@ -40,15 +40,7 @@
             "Jose\\Component\\Checker\\": "src/Component/Checker/",
             "Jose\\Component\\Console\\": "src/Component/Console/",
             "Jose\\Component\\Core\\": "src/Component/Core/",
-            "Jose\\Component\\Core\\Util\\Ecc\\": [
-                "src/Ecc",
-                "src/Ecc/"
-            ],
             "Jose\\Component\\Encryption\\": "src/Component/Encryption/",
-            "Jose\\Component\\Encryption\\Algorithm\\": [
-                "src/EncryptionAlgorithm/Experimental",
-                "src/EncryptionAlgorithm/Experimental/"
-            ],
             "Jose\\Component\\Encryption\\Algorithm\\ContentEncryption\\": [
                 "src/EncryptionAlgorithm/ContentEncryption/AESCBC",
                 "src/EncryptionAlgorithm/ContentEncryption/AESCBC/",
@@ -119,7 +111,6 @@
         "ext-curl": "*",
         "ext-gmp": "*",
         "bjeavons/zxcvbn-php": "^1.3",
-        "blackfire/php-sdk": "^2.0",
         "ekino/phpstan-banned-code": "^1.0",
         "infection/infection": "^0.27",
         "matthiasnoback/symfony-config-test": "^5.0",
@@ -134,7 +125,7 @@
         "phpstan/phpstan-strict-rules": "^1.4",
         "phpunit/phpunit": "^10.1",
         "qossmic/deptrac-shim": "^1.0",
-        "rector/rector": "^0.18",
+        "rector/rector": "^0.19",
         "roave/security-advisories": "dev-latest",
         "symfony/browser-kit": "^6.1|^7.0",
         "symfony/finder": "^6.1|^7.0",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/rector.php b/rector.php
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\Core\ValueObject\PhpVersion;
 use Rector\Doctrine\Set\DoctrineSetList;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
 use Rector\PHPUnit\Set\PHPUnitLevelSetList;
@@ -12,6 +11,7 @@
 use Rector\Set\ValueObject\SetList;
 use Rector\Symfony\Set\SymfonyLevelSetList;
 use Rector\Symfony\Set\SymfonySetList;
+use Rector\ValueObject\PhpVersion;
 
 return static function (RectorConfig $config): void {
     $config->import(SetList::DEAD_CODE);

diff --git a/src/Component/Checker/LICENSE b/src/Component/Checker/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Component/Console/LICENSE b/src/Component/Console/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Component/Core/LICENSE b/src/Component/Core/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Component/Core/Util/ECSignature.php b/src/Component/Core/Util/ECSignature.php
@@ -73,7 +73,9 @@ public static function fromAsn1(string $signature, int $length): string
         $pointR = self::retrievePositiveInteger(self::readAsn1Integer($message, $position));
         $pointS = self::retrievePositiveInteger(self::readAsn1Integer($message, $position));
 
-        $bin = hex2bin(str_pad($pointR, $length, '0', STR_PAD_LEFT) . str_pad($pointS, $length, '0', STR_PAD_LEFT));
+        $bin = hex2bin(
+            str_pad($pointR, $length, '0', STR_PAD_LEFT) . str_pad($pointS, $length, '0', STR_PAD_LEFT)
+        );
         if (! is_string($bin)) {
             throw new InvalidArgumentException('Unable to parse the data');
         }

diff --git a/src/Ecc/Curve.php → src/Component/Core/Util/Ecc/Curve.php b/src/Ecc/Curve.php → src/Component/Core/Util/Ecc/Curve.php
diff --git a/src/Ecc/EcDH.php → src/Component/Core/Util/Ecc/EcDH.php b/src/Ecc/EcDH.php → src/Component/Core/Util/Ecc/EcDH.php
diff --git a/src/Ecc/Math.php → src/Component/Core/Util/Ecc/Math.php b/src/Ecc/Math.php → src/Component/Core/Util/Ecc/Math.php
diff --git a/src/Ecc/ModularArithmetic.php → ...onent/Core/Util/Ecc/ModularArithmetic.php b/src/Ecc/ModularArithmetic.php → ...onent/Core/Util/Ecc/ModularArithmetic.php
diff --git a/src/Ecc/NistCurve.php → src/Component/Core/Util/Ecc/NistCurve.php b/src/Ecc/NistCurve.php → src/Component/Core/Util/Ecc/NistCurve.php
diff --git a/src/Ecc/Point.php → src/Component/Core/Util/Ecc/Point.php b/src/Ecc/Point.php → src/Component/Core/Util/Ecc/Point.php
diff --git a/src/Ecc/PrivateKey.php → src/Component/Core/Util/Ecc/PrivateKey.php b/src/Ecc/PrivateKey.php → src/Component/Core/Util/Ecc/PrivateKey.php
diff --git a/src/Ecc/PublicKey.php → src/Component/Core/Util/Ecc/PublicKey.php b/src/Ecc/PublicKey.php → src/Component/Core/Util/Ecc/PublicKey.php
diff --git a/src/Component/Core/composer.json b/src/Component/Core/composer.json
@@ -47,5 +47,9 @@
     },
     "conflict": {
         "spomky-labs/jose": "*"
+    },
+    "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/Component/Encryption/LICENSE b/src/Component/Encryption/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Component/KeyManagement/Analyzer/ESKeyAnalyzer.php b/src/Component/KeyManagement/Analyzer/ESKeyAnalyzer.php
@@ -7,20 +7,11 @@
 use Brick\Math\BigInteger;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\Ecc\Curve;
-use Jose\Component\Core\Util\Ecc\NistCurve;
 use ParagonIE\ConstantTime\Base64UrlSafe;
-use RuntimeException;
 use function is_string;
 
 abstract class ESKeyAnalyzer implements KeyAnalyzer
 {
-    public function __construct()
-    {
-        if (! class_exists(NistCurve::class)) {
-            throw new RuntimeException('Please install web-token/jwt-util-ecc to use this key analyzer');
-        }
-    }
-
     public function analyze(JWK $jwk, MessageBag $bag): void
     {
         if ($jwk->get('kty') !== 'EC') {

diff --git a/src/Component/KeyManagement/LICENSE b/src/Component/KeyManagement/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Component/KeyManagement/composer.json b/src/Component/KeyManagement/composer.json
@@ -46,7 +46,6 @@
     },
     "suggest": {
         "ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys",
-        "web-token/jwt-util-ecc": "To use EC key analyzers.",
         "php-http/message-factory": "To enable JKU/X5U support.",
         "php-http/httplug": "To enable JKU/X5U support."
     }

diff --git a/src/Component/NestedToken/LICENSE b/src/Component/NestedToken/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Component/Signature/LICENSE b/src/Component/Signature/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Ecc/LICENSE b/src/Ecc/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Ecc/composer.json b/src/Ecc/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "web-token/jwt-util-ecc",
-    "description": "ECC Tools for the JWT Framework.",
+    "description": "[DEPRECATED] Please use web-token/jwt-core instead.",
     "type": "library",
     "license": "MIT",
     "keywords": [
@@ -32,17 +32,7 @@
             "homepage": "https://github.com/web-token/jwt-framework/contributors"
         }
     ],
-    "autoload": {
-        "psr-4": {
-            "Jose\\Component\\Core\\Util\\Ecc\\": ""
-        }
-    },
     "require": {
-        "php": ">=8.1",
-        "brick/math": "^0.9|^0.10|^0.11|^0.12"
-    },
-    "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"
+        "web-token/jwt-core": "^3.3"
     }
 }
diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE b/src/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE b/src/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/EncryptionAlgorithm/Experimental/LICENSE b/src/EncryptionAlgorithm/Experimental/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE b/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE b/src/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE b/src/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE b/src/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json b/src/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json
@@ -45,6 +45,6 @@
         "ext-openssl": "*",
         "spomky-labs/aes-key-wrap": "^7.0",
         "web-token/jwt-encryption": "^3.2",
-        "web-token/jwt-util-ecc": "^3.2"
+        "web-token/jwt-core": "^3.3"
     }
 }
diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE b/src/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE b/src/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Experimental/LICENSE b/src/Experimental/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Experimental/Signature/RS1.php b/src/Experimental/Signature/RS1.php
@@ -4,7 +4,7 @@
 
 namespace Jose\Experimental\Signature;
 
-use Jose\Experimental\RSAPKCS1;
+use Jose\Component\Signature\Algorithm\RSAPKCS1;
 
 final class RS1 extends RSAPKCS1
 {

diff --git a/src/JoseFramework/LICENSE b/src/JoseFramework/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2024 Spomky-Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/JoseFramework/Resources/config/Algorithms/encryption_aescbc.php b/src/JoseFramework/Resources/config/Algorithms/encryption_aescbc.php
@@ -5,15 +5,6 @@
 use Jose\Component\Encryption\Algorithm\ContentEncryption\A128CBCHS256;
 use Jose\Component\Encryption\Algorithm\ContentEncryption\A192CBCHS384;
 use Jose\Component\Encryption\Algorithm\ContentEncryption\A256CBCHS512;
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return function (ContainerConfigurator $container): void {

diff --git a/src/JoseFramework/Resources/config/Algorithms/encryption_aesgcm.php b/src/JoseFramework/Resources/config/Algorithms/encryption_aesgcm.php
@@ -5,15 +5,6 @@
 use Jose\Component\Encryption\Algorithm\ContentEncryption\A128GCM;
 use Jose\Component\Encryption\Algorithm\ContentEncryption\A192GCM;
 use Jose\Component\Encryption\Algorithm\ContentEncryption\A256GCM;
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return function (ContainerConfigurator $container): void {

diff --git a/src/JoseFramework/Resources/config/Algorithms/encryption_aesgcmkw.php b/src/JoseFramework/Resources/config/Algorithms/encryption_aesgcmkw.php
@@ -5,15 +5,6 @@
 use Jose\Component\Encryption\Algorithm\KeyEncryption\A128GCMKW;
 use Jose\Component\Encryption\Algorithm\KeyEncryption\A192GCMKW;
 use Jose\Component\Encryption\Algorithm\KeyEncryption\A256GCMKW;
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return function (ContainerConfigurator $container): void {

diff --git a/src/JoseFramework/Resources/config/Algorithms/encryption_aeskw.php b/src/JoseFramework/Resources/config/Algorithms/encryption_aeskw.php
@@ -5,15 +5,6 @@
 use Jose\Component\Encryption\Algorithm\KeyEncryption\A128KW;
 use Jose\Component\Encryption\Algorithm\KeyEncryption\A192KW;
 use Jose\Component\Encryption\Algorithm\KeyEncryption\A256KW;
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return function (ContainerConfigurator $container): void {

diff --git a/src/JoseFramework/Resources/config/Algorithms/encryption_dir.php b/src/JoseFramework/Resources/config/Algorithms/encryption_dir.php
@@ -3,15 +3,6 @@
 declare(strict_types=1);
 
 use Jose\Component\Encryption\Algorithm\KeyEncryption\Dir;
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return function (ContainerConfigurator $container): void {

diff --git a/src/JoseFramework/Resources/config/Algorithms/encryption_ecdhes.php b/src/JoseFramework/Resources/config/Algorithms/encryption_ecdhes.php
@@ -10,15 +10,6 @@
 use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHSSA128KW;
 use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHSSA192KW;
 use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHSSA256KW;
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return function (ContainerConfigurator $container): void {