Merge pull request #79 from Spomky-Labs/temp-bbef23

Merge up 1.4.1 to 1.5.X

Author: Spomky

src/X509/CertificationPath/PathValidation/PathValidator.php

@@ -222,7 +222,7 @@ private function setPublicKeyState(ValidatorState $state, Certificate $cert): Va
             if ($pk_info->algorithmIdentifier()->oid() !==
                 $state->workingPublicKeyAlgorithm()
                     ->oid()) {
-                $state = $state->withWorkingPublicKeyParameters(null);
+                $state = $state->withWorkingPublicKeyParameters();
             }
         }
         // assign working_public_key_algorithm

src/X509/CertificationPath/PathValidation/ValidatorState.php

@@ -141,7 +141,7 @@ public static function initialize(PathValidationConfig $config, Certificate $tru
         $state->_workingPublicKeyParameters = self::getAlgorithmParameters(
             $state->_workingPublicKey->algorithmIdentifier()
         );
-        $state->_workingIssuerName = $tbsCert->issuer();
+        $state->_workingIssuerName = $tbsCert->subject();
         $state->_maxPathLength = $config->maxLength();
         return $state;
     }

src/X509/GeneralName/IPv4Address.php

@@ -39,9 +39,9 @@ public static function fromOctets(string $octets): self
 
     protected function octets(): string
     {
-        $bytes = array_map('intval', explode('.', $this->ip));
+        $bytes = array_map(intval(...), explode('.', $this->ip));
         if (isset($this->mask)) {
-            $bytes = array_merge($bytes, array_map('intval', explode('.', $this->mask)));
+            $bytes = array_merge($bytes, array_map(intval(...), explode('.', $this->mask)));
         }
         return pack('C*', ...$bytes);
     }

src/X509/GeneralName/IPv6Address.php

@@ -51,9 +51,9 @@ protected static function wordsToIPv6String(array $words): string
 
     protected function octets(): string
     {
-        $words = array_map('hexdec', explode(':', $this->ip));
+        $words = array_map(hexdec(...), explode(':', $this->ip));
         if (isset($this->mask)) {
-            $words = array_merge($words, array_map('hexdec', explode(':', $this->mask)));
+            $words = array_merge($words, array_map(hexdec(...), explode(':', $this->mask)));
         }
         return pack('n*', ...$words);
     }

tests/X509/Unit/CertificationPath/CertificationPathValidationTest.php

@@ -94,4 +94,14 @@ public function explicitTrustAnchor()
         $validator = PathValidator::create(Crypto::getDefault(), $config, ...self::$_path->certificates());
         static::assertInstanceOf(PathValidationResult::class, $validator->validate());
     }
+
+    #[Test]
+    public function explicitTrustAnchorWithIntermediateCA()
+    {
+        $trustAnchor = self::$_path->certificates()[1];
+        $certs = [self::$_path->certificates()[2]];
+        $config = PathValidationConfig::defaultConfig()->withTrustAnchor($trustAnchor);
+        $validator = PathValidator::create(Crypto::getDefault(), $config, ...$certs);
+        static::assertInstanceOf(PathValidationResult::class, $validator->validate());
+    }
 }