Merge pull request #211 from web-token/OpenSSLDep

lib-openssl deps fixed

Author: Spomky

src/Bundle/JoseFramework/DataCollector/JoseCollector.php

@@ -16,6 +16,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+use Symfony\Component\VarDumper\Cloner\Data;
 
 class JoseCollector extends DataCollector
 {
@@ -41,7 +42,10 @@ public function getName()
         return 'jose_collector';
     }
 
-    public function getData(): array
+    /**
+     * @return array|Data
+     */
+    public function getData()
     {
         return $this->data;
     }

src/Bundle/JoseFramework/Normalizer/JWENormalizer.php

@@ -30,12 +30,25 @@ public function supportsDenormalization($data, $type, $format = null)
         return JWE::class === $type && $this->componentInstalled();
     }
 
+    /**
+     * @param mixed  $object Object to normalize
+     * @param string $format Format the normalization result will be encoded as
+     *
+     * @return mixed
+     */
     public function normalize($object, $format = null, array $context = [])
     {
         return $object;
     }
 
-    public function denormalize($data, $class, $format = null, array $context = [])
+    /**
+     * @param mixed  $data   Data to restore
+     * @param string $type   The expected class to instantiate
+     * @param string $format Format the given data was extracted from
+     *
+     * @return array|object
+     */
+    public function denormalize($data, $type, $format = null, array $context = [])
     {
         return $data;
     }

src/Bundle/JoseFramework/Normalizer/JWSNormalizer.php

@@ -35,7 +35,15 @@ public function normalize($object, $format = null, array $context = [])
         return $object;
     }
 
-    public function denormalize($data, $class, $format = null, array $context = [])
+    /**
+     * @param mixed  $data    Data to restore
+     * @param string $type    The expected class to instantiate
+     * @param string $format  Format the given data was extracted from
+     * @param array  $context Options available to the denormalizer
+     *
+     * @return array|object
+     */
+    public function denormalize($data, $type, $format = null, array $context = [])
     {
         return $data;
     }

src/Component/Core/Util/ECKey.php

@@ -123,6 +123,9 @@ private static function getNistCurveSize(string $curve): int
 
     private static function createECKeyUsingOpenSSL(string $curve): array
     {
+        if (!\extension_loaded('openssl')) {
+            throw new RuntimeException('Please install the OpenSSL extension');
+        }
         $key = openssl_pkey_new([
             'curve_name' => self::getOpensslCurveName($curve),
             'private_key_type' => OPENSSL_KEYTYPE_EC,

src/Component/Encryption/composer.json

@@ -20,7 +20,6 @@
         }
     },
     "require": {
-        "lib-openssl": "*",
         "web-token/jwt-core": "^2.1"
     },
     "require-dev": {

src/Component/KeyManagement/KeyConverter/KeyConverter.php

@@ -35,6 +35,10 @@ public static function loadKeyFromCertificateFile(string $file): array
 
     public static function loadKeyFromCertificate(string $certificate): array
     {
+        if (!\extension_loaded('openssl')) {
+            throw new RuntimeException('Please install the OpenSSL extension');
+        }
+
         try {
             $res = openssl_x509_read($certificate);
             if (false === $res) {
@@ -59,6 +63,9 @@ public static function loadKeyFromCertificate(string $certificate): array
      */
     public static function loadKeyFromX509Resource($res): array
     {
+        if (!\extension_loaded('openssl')) {
+            throw new RuntimeException('Please install the OpenSSL extension');
+        }
         $key = openssl_get_publickey($res);
         if (false === $key) {
             throw new InvalidArgumentException('Unable to load the certificate.');
@@ -110,6 +117,10 @@ public static function loadFromX5C(array $x5c): array
         if (0 === \count($x5c)) {
             throw new InvalidArgumentException('The certificate chain is empty');
         }
+
+        if (!\extension_loaded('openssl')) {
+            throw new RuntimeException('Please install the OpenSSL extension');
+        }
         $certificate = null;
         $last_issuer = null;
         $last_subject = null;
@@ -157,6 +168,9 @@ private static function loadKeyFromPEM(string $pem, ?string $password = null): a
             $pem = self::decodePem($pem, $matches, $password);
         }
 
+        if (!\extension_loaded('openssl')) {
+            throw new RuntimeException('Please install the OpenSSL extension');
+        }
         self::sanitizePEM($pem);
         $res = openssl_pkey_get_private($pem);
         if (false === $res) {

src/Component/KeyManagement/KeyConverter/RSAKey.php

@@ -17,6 +17,7 @@
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\BigInteger;
+use RuntimeException;
 
 /**
  * @internal
@@ -67,6 +68,9 @@ public static function createFromKeyDetails(array $details): self
      */
     public static function createFromPEM(string $pem): self
     {
+        if (!\extension_loaded('openssl')) {
+            throw new RuntimeException('Please install the OpenSSL extension');
+        }
         $res = openssl_pkey_get_private($pem);
         if (false === $res) {
             $res = openssl_pkey_get_public($pem);

src/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json

@@ -20,6 +20,7 @@
         }
     },
     "require": {
+        "lib-openssl": "*",
         "web-token/jwt-encryption": "^2.1"
     },
     "require-dev": {

src/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json

@@ -20,6 +20,7 @@
         }
     },
     "require": {
+        "lib-openssl": "*",
         "web-token/jwt-encryption": "^2.1"
     },
     "require-dev": {

src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json

@@ -20,6 +20,7 @@
         }
     },
     "require": {
+        "lib-openssl": "*",
         "spomky-labs/aes-key-wrap": "^5.0",
         "web-token/jwt-encryption": "^2.1"
     },