diff options
| author | Einar Lönn <el@sunet.se> | 2017-06-07 15:52:17 +0200 |
|---|---|---|
| committer | Einar Lönn <el@sunet.se> | 2017-06-07 15:52:17 +0200 |
| commit | 8f9b4a01115b0cd8188923a1aab8d5ce044adfad (patch) | |
| tree | 4c951a9b9c617f22b8063d370e7e3d2745c27939 | |
| parent | c7503f69316f5c0aff8a108a484b375d116e4983 (diff) | |
| parent | 1a690840e96db64b21e8c221da70150405894063 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
| -rw-r--r-- | swamid-2.0/adfs.rkh.se-adfs-services-trust.xml | 8 | ||||
| -rw-r--r-- | swamid-idp-2.0.mxml | 1 | ||||
| -rw-r--r-- | swamid-testing-idp-1.0.mxml | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml index e5b2b491..254d9506 100644 --- a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml +++ b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml @@ -604,6 +604,14 @@ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/" index="2"/> </SPSSODescriptor> <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <Extensions> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="sv">Röda Korsets Högskola</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Röda Korsets Högskola</mdui:DisplayName> + <mdui:Description xml:lang="sv">ADFS Röda Korsets Högskola</mdui:Description> + <mdui:Description xml:lang="en">ADFS Röda Korsets Högskola</mdui:Description> + </mdui:UIInfo> + </Extensions> <KeyDescriptor use="encryption"> <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <X509Data> diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index a89cb50c..f4c2c893 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -22,4 +22,5 @@ <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml"/> + <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/> </md:EntitiesDescriptor> diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml index 9978cdc9..62555d9f 100644 --- a/swamid-testing-idp-1.0.mxml +++ b/swamid-testing-idp-1.0.mxml @@ -57,5 +57,4 @@ <xi:include href="swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.test.antagning.se-aws-idp.xml"/> <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/> </EntitiesDescriptor> |