From bf290020d131d060873302aecded60772825ed5f Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 7 May 2021 00:25:40 +0200
Subject: [PATCH] Fix incorrect method call & optional param
---
modules/admin/lib/Controller/Config.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/admin/lib/Controller/Config.php b/modules/admin/lib/Controller/Config.php
index 026235804..fa771848a 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]);
}
}
--
GitLab