Skip to content

GitLab

mahara
mahara
Commit ea641a96 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files
Options

Merge "Bug 1750931: Populating the available certs array"

parents c0b3ae79 a9ac04a9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
htdocs/auth/saml/sp/metadata.php
View file @ ea641a96
......@@ -133,9 +133,11 @@ foreach ($assertionsconsumerservices as $services) {
$metaArray20['AssertionConsumerService'] = $eps;
$availableCerts = array();
$keys = array();
$certInfo = SimpleSAML\Utils\Crypto::loadPublicKey($spconfig, false, 'new_');
if ($certInfo !== null && array_key_exists('certData', $certInfo)) {
$availableCerts['new_idp.crt'] = $certInfo;
$hasNewCert = true;
$certData = $certInfo['certData'];
......@@ -153,6 +155,7 @@ else {
$certInfo = SimpleSAML\Utils\Crypto::loadPublicKey($spconfig);
if ($certInfo !== null && array_key_exists('certData', $certInfo)) {
$availableCerts['idp.crt'] = $certInfo;
$certData = $certInfo['certData'];
$keys[] = array(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment