Merge branch 'master' of md-master.swamid.se:swamid-metadata

1 files changed, 56 insertions, 20 deletions

diff --git a/swamid-1.0/order.kib.ki.se.xml b/swamid-1.0/order.kib.ki.se.xml
index fd47c1bc..2043aeb4 100644
--- a/swamid-1.0/order.kib.ki.se.xml
+++ b/swamid-1.0/order.kib.ki.se.xml
@@ -1,9 +1,15 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://order.kib.ki.se/shibboleth">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_eebcbd51d43986142c070ad091b66099" entityID="https://order.kib.ki.se/shibboleth">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://order.kib.ki.se/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>order3.cb.ad</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=order3.cb.ad</ds:X509SubjectName>
           <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAKiPmXgb0jZdMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDG9yZGVyMy5jYi5hZDAeFw0wOTAyMTAxMjM5MzZaFw0xOTAyMDgxMjM5MzZa
 MBcxFTATBgNVBAMTDG9yZGVyMy5jYi5hZDCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -19,21 +25,51 @@ t5cJkdRcQWX74TarAoTgnQOHa4CcE6vYM0I+ihny+xxPz7uCbuwJr05qEImWnloq
 0/qLrVNVvnvQTiKWLrtm7Uew5djgf1qL1SMuHM9DOjTo0gs4YDLztDbYkBvFTA76
 0EjTdV5FU94cL+Mw/Laug0wouLqWuT77Zyc5WluQlfaS0MpQLac2qdLZNtnK+L3d
 RJm+DQbWtEH144Z3nMzk8jbylRWrrWYKFgg+6OhuwKr3AhtDvJpJoZSBJHEHFJoG
-ZnpMbRDL4QVlO6/nMZjUzttWoq+9rjmPowjbgd3RtQ==</ds:X509Certificate>
+ZnpMbRDL4QVlO6/nMZjUzttWoq+9rjmPowjbgd3RtQ==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://order.kib.ki.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KI</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Karolinska Institutet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ki.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>KI bibliotek</Company>
-    <GivenName>Ylva</GivenName>
-    <SurName>Gavel</SurName>
-    <EmailAddress>ylva.gavel@ki.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>order3.cb.ad</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=order3.cb.ad</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAKiPmXgb0jZdMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDG9yZGVyMy5jYi5hZDAeFw0wOTAyMTAxMjM5MzZaFw0xOTAyMDgxMjM5MzZa
+MBcxFTATBgNVBAMTDG9yZGVyMy5jYi5hZDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL/0D/AlkYaW6kkDFE4cpyrTF9qSqTxeaMiiHUdjw0BAq4eH/pH/
+9asVrtl5OkNK4GRP5Grwu1Ebxu7E53etjJXnn2IHpXrDlDmfrRRhcbV4KSJrFytW
+kBXHgBvGa/R9FLyJdBSvmNO/LY0TtrZXA6Jh/ZsMxChqSMp4QqRjUv9ftCFOZr0c
+MMUQuYAZC74CwCzjD59S/u1EVgd1oj1mvk4qt/Znl5Y4UNu8Nwgvp29xXgyGC3O0
+N6ZPV2/x5aofl6rWeTiGBUBLNPV41lPIoHpAxU0mdH++FRI5EFKeIZhKKDKUFCtm
+G0nsgaMX7YUWzDas3wWZGv+bP/tGfvL7Z6ECAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+b3JkZXIzLmNiLmFkMB0GA1UdDgQWBBSXh8MggMc1hc/5JyvrlEPbZja5PDANBgkq
+hkiG9w0BAQUFAAOCAQEATJHWhMNioZKtvdDzH2IJfMecvSHxZwdg26tfLmriOJvb
+t5cJkdRcQWX74TarAoTgnQOHa4CcE6vYM0I+ihny+xxPz7uCbuwJr05qEImWnloq
+0/qLrVNVvnvQTiKWLrtm7Uew5djgf1qL1SMuHM9DOjTo0gs4YDLztDbYkBvFTA76
+0EjTdV5FU94cL+Mw/Laug0wouLqWuT77Zyc5WluQlfaS0MpQLac2qdLZNtnK+L3d
+RJm+DQbWtEH144Z3nMzk8jbylRWrrWYKFgg+6OhuwKr3AhtDvJpJoZSBJHEHFJoG
+ZnpMbRDL4QVlO6/nMZjUzttWoq+9rjmPowjbgd3RtQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://order.kib.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://order.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://order.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://order.kib.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://order.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://order.kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://order.kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://order.kib.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://order.kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://order.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://order.kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://order.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://order.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://order.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://order.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file