Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
ea641a96
Commit
ea641a96
authored
Feb 23, 2018
by
Robert Lyon
Committed by
Gerrit Code Review
Feb 23, 2018
Browse files
Merge "Bug 1750931: Populating the available certs array"
parents
c0b3ae79
a9ac04a9
Changes
1
Hide whitespace changes
Inline
Side-by-side
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
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment