Skip to content
Snippets Groups Projects
Commit 9310bcbf authored by Tim van Dijen's avatar Tim van Dijen
Browse files

Fix static calls to non-static methods

parent 8e787fbf
No related branches found
No related tags found
No related merge requests found
...@@ -341,13 +341,15 @@ class Config ...@@ -341,13 +341,15 @@ class Config
'enabled' => $this->config->getString('auth.adminpassword', '123') !== '123', 'enabled' => $this->config->getString('auth.adminpassword', '123') !== '123',
]; ];
$cryptoUtils = new Utils\Crypto();
// perform some sanity checks on the configured certificates // perform some sanity checks on the configured certificates
if ($this->config->getString('enable.saml20-idp', false) !== false) { if ($this->config->getString('enable.saml20-idp', false) !== false) {
$handler = MetaDataStorageHandler::getMetadataHandler(); $handler = MetaDataStorageHandler::getMetadataHandler();
$metadata = $handler->getMetaDataCurrent('saml20-idp-hosted'); $metadata = $handler->getMetaDataCurrent('saml20-idp-hosted');
$metadata_config = Configuration::loadfromArray($metadata); $metadata_config = Configuration::loadfromArray($metadata);
$private = Utils\Crypto::loadPrivateKey($metadata_config, false); $private = $cryptoUtils->loadPrivateKey($metadata_config, false);
$public = Utils\Crypto::loadPublicKey($metadata_config, false); $public = $cryptoUtils->loadPublicKey($metadata_config, false);
$matrix[] = [ $matrix[] = [
'required' => 'required', 'required' => 'required',
...@@ -355,9 +357,9 @@ class Config ...@@ -355,9 +357,9 @@ class Config
'enabled' => $this->matchingKeyPair($public['PEM'], [$private['PEM'], $private['password']]), 'enabled' => $this->matchingKeyPair($public['PEM'], [$private['PEM'], $private['password']]),
]; ];
$private = Utils\Crypto::loadPrivateKey($metadata_config, false, 'new_'); $private = $cryptoUtils->loadPrivateKey($metadata_config, false, 'new_');
if ($private !== null) { if ($private !== null) {
$public = Utils\Crypto::loadPublicKey($metadata_config, false, 'new_'); $public = $cryptoUtils->loadPublicKey($metadata_config, false, 'new_');
$matrix[] = [ $matrix[] = [
'required' => 'required', 'required' => 'required',
'descr' => Translate::noop('Matching key-pair for signing assertions (rollover key)'), 'descr' => Translate::noop('Matching key-pair for signing assertions (rollover key)'),
...@@ -367,8 +369,8 @@ class Config ...@@ -367,8 +369,8 @@ class Config
} }
if ($this->config->getBoolean('metadata.sign.enable', false) !== false) { if ($this->config->getBoolean('metadata.sign.enable', false) !== false) {
$private = Utils\Crypto::loadPrivateKey($this->config, false, 'metadata.sign.'); $private = $cryptoUtils->loadPrivateKey($this->config, false, 'metadata.sign.');
$public = Utils\Crypto::loadPublicKey($this->config, false, 'metadata.sign.'); $public = $cryptoUtils->loadPublicKey($this->config, false, 'metadata.sign.');
$matrix[] = [ $matrix[] = [
'required' => 'required', 'required' => 'required',
'descr' => Translate::noop('Matching key-pair for signing metadata'), 'descr' => Translate::noop('Matching key-pair for signing metadata'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment