diff --git a/modules/admin/lib/Controller/Config.php b/modules/admin/lib/Controller/Config.php index 026235804014f2d547f08be5d4aea33d185a489e..fa771848a283f11a5ff6b46037bfcb785431bbc0 100644 --- a/modules/admin/lib/Controller/Config.php +++ b/modules/admin/lib/Controller/Config.php @@ -354,7 +354,7 @@ class Config $matrix[] = [ 'required' => 'required', 'descr' => Translate::noop('Matching key-pair for signing assertions'), - 'enabled' => $this->matchingKeyPair($public['PEM'], [$private['PEM'], $private['password']]), + 'enabled' => $this->matchingKeyPair($public['PEM'], $private['PEM'], $private['password']), ]; $private = $cryptoUtils->loadPrivateKey($metadata_config, false, 'new_'); @@ -363,7 +363,7 @@ class Config $matrix[] = [ 'required' => 'required', 'descr' => Translate::noop('Matching key-pair for signing assertions (rollover key)'), - 'enabled' => $this->matchingKeyPair($public['PEM'], [$private['PEM'], $private['password']]), + 'enabled' => $this->matchingKeyPair($public['PEM'], $private['PEM'], $private['password']), ]; } } @@ -374,7 +374,7 @@ class Config $matrix[] = [ 'required' => 'required', 'descr' => Translate::noop('Matching key-pair for signing metadata'), - 'enabled' => $this->matchingKeyPair($public['PEM'], [$private['PEM'], $private['password']]), + 'enabled' => $this->matchingKeyPair($public['PEM'], $private['PEM'], $private['password']), ]; } @@ -485,7 +485,7 @@ class Config * @param string|null $password * @return bool */ - private function matchingKeyPair(string $publicKey, string $privateKey, ?string $password) : bool { + private function matchingKeyPair(string $publicKey, string $privateKey, ?string $password = null) : bool { return openssl_x509_check_private_key($publicKey, [$privateKey, $password]); } }