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

3 files changed, 129 insertions, 1 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 8377fa57..f60563dd 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -89,7 +89,6 @@
   <xi:include href="swamid-1.0/mail.su.se.xml"/>
   <xi:include href="swamid-1.0/support.it.secure.su.se.xml"/>
   <xi:include href="swamid-1.0/tools.sunet.se.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.slu.se.xml"/>
   <xi:include href="swamid-1.0/publications.ki.se.xml"/>
   <xi:include href="swamid-1.0/pp-prod-admin.it.su.se.xml"/>
   <xi:include href="swamid-1.0/pp-redmigr-admin.it.su.se.xml"/>
@@ -178,4 +177,6 @@
   <xi:include href="swamid-1.0/medieportaltest.kau.se.xml"/>
   <xi:include href="swamid-1.0/smd.du.se.xml"/>
   <xi:include href="swamid-1.0/livesrv.ex.vr.se.xml"/>
+  <xi:include href="swamid-1.0/mds.lan.kth.se.xml"/>
+  <xi:include href="swamid-1.0/ws3.bmc.uu.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0/mds.lan.kth.se.xml b/swamid-1.0/mds.lan.kth.se.xml
new file mode 100644
index 00000000..4f418b93
--- /dev/null
+++ b/swamid-1.0/mds.lan.kth.se.xml
@@ -0,0 +1,77 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_63b44d382bf65bf5608abcce0689be06" entityID="https://mds.lan.kth.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://mds.lan.kth.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>mds.lan.kth.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=mds.lan.kth.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDATCCAemgAwIBAgIJAKuJLl2VWSDhMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDm1kcy5sYW4ua3RoLnNlMB4XDTExMTAyNTE0MDMzN1oXDTIxMTAyMjE0MDMz
+N1owGTEXMBUGA1UEAxMObWRzLmxhbi5rdGguc2UwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQD1ZMkEwaMPbixuO7VOmHpZ86vfKMIw5P6AzprpKXLV7m5q
+PFyb3OcK5B8R6iN+uNAE9T4G57G1N0VEQqAdZzOodZRaIypXd8Y6f0PmWPjaptC7
+RCjfyXOEdTeHPBFmJrdkdykF6/jv0zn+BE3wuVCqbULDaHd1l4eBi2Lz7elxVsVX
+rxNDJHG+qRrohbka4tSSCi6yUcSo3Go0Nv7fd5gjidMuqoTK5B0fSfEW5qg8x/Kn
+IrvIFCTlMl81PybL9D/H2uopC8jqWvMkMK8db4P4Ckq96J3KvaIbZyWPmbN0nEgR
+5gwpc7alwRrAOaxit/fB54ps6sR3s7NUwuQcx77zAgMBAAGjTDBKMCkGA1UdEQQi
+MCCCDm1kcy5sYW4ua3RoLnNlhg5tZHMubGFuLmt0aC5zZTAdBgNVHQ4EFgQU0UDQ
+iSy3a0gXV/eYtxzIfft90kAwDQYJKoZIhvcNAQEFBQADggEBAHE3lggheqGWhWcS
+O2MECNb8+wKFMS+06ht2j+WJYrqtE73dGdVIwCwkSfT0C0P85NShGCdexaUfzZD6
+4vLqHHfx+zSvJomqkOV0khSte59BsajGET0aa3obgJJaWCjfsgFu840qqKX1sDcD
+mFV1KDcpYhC52EveHBchKQ45ZH/KqKJ4laQy6OkCMQPQolX+KxY8nyJ4J6qACCdY
+A/uj+L0Hs/4CBKkM9kbs0P6oszY0dbWwXLY8+bjZpD0XqZULIkjJixlJ0nQk12uE
+Wq6nlMKr18cS90g2FgxclTGMrHuSxPvAdDKGAfO29lzRLGWoCSDLKqIAeajHnRNc
+K4y2OQU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>mds.lan.kth.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=mds.lan.kth.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDATCCAemgAwIBAgIJAKuJLl2VWSDhMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDm1kcy5sYW4ua3RoLnNlMB4XDTExMTAyNTE0MDMzN1oXDTIxMTAyMjE0MDMz
+N1owGTEXMBUGA1UEAxMObWRzLmxhbi5rdGguc2UwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQD1ZMkEwaMPbixuO7VOmHpZ86vfKMIw5P6AzprpKXLV7m5q
+PFyb3OcK5B8R6iN+uNAE9T4G57G1N0VEQqAdZzOodZRaIypXd8Y6f0PmWPjaptC7
+RCjfyXOEdTeHPBFmJrdkdykF6/jv0zn+BE3wuVCqbULDaHd1l4eBi2Lz7elxVsVX
+rxNDJHG+qRrohbka4tSSCi6yUcSo3Go0Nv7fd5gjidMuqoTK5B0fSfEW5qg8x/Kn
+IrvIFCTlMl81PybL9D/H2uopC8jqWvMkMK8db4P4Ckq96J3KvaIbZyWPmbN0nEgR
+5gwpc7alwRrAOaxit/fB54ps6sR3s7NUwuQcx77zAgMBAAGjTDBKMCkGA1UdEQQi
+MCCCDm1kcy5sYW4ua3RoLnNlhg5tZHMubGFuLmt0aC5zZTAdBgNVHQ4EFgQU0UDQ
+iSy3a0gXV/eYtxzIfft90kAwDQYJKoZIhvcNAQEFBQADggEBAHE3lggheqGWhWcS
+O2MECNb8+wKFMS+06ht2j+WJYrqtE73dGdVIwCwkSfT0C0P85NShGCdexaUfzZD6
+4vLqHHfx+zSvJomqkOV0khSte59BsajGET0aa3obgJJaWCjfsgFu840qqKX1sDcD
+mFV1KDcpYhC52EveHBchKQ45ZH/KqKJ4laQy6OkCMQPQolX+KxY8nyJ4J6qACCdY
+A/uj+L0Hs/4CBKkM9kbs0P6oszY0dbWwXLY8+bjZpD0XqZULIkjJixlJ0nQk12uE
+Wq6nlMKr18cS90g2FgxclTGMrHuSxPvAdDKGAfO29lzRLGWoCSDLKqIAeajHnRNc
+K4y2OQU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds.lan.kth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds.lan.kth.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds.lan.kth.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds.lan.kth.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds.lan.kth.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds.lan.kth.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds.lan.kth.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds.lan.kth.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds.lan.kth.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds.lan.kth.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mds.lan.kth.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds.lan.kth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mds.lan.kth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds.lan.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds.lan.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/ws3.bmc.uu.se.xml b/swamid-1.0/ws3.bmc.uu.se.xml
new file mode 100644
index 00000000..a75039b9
--- /dev/null
+++ b/swamid-1.0/ws3.bmc.uu.se.xml
@@ -0,0 +1,50 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_6b400320e6ef3032756f36d981217c6cb1449af4" entityID="https://ws3.bmc.uu.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>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ws3.bmc.uu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ws3.bmc.uu.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ws3.bmc.uu.se/Shibboleth.sso/WAYF/ds.swamid.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ws3.bmc.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ws3.bmc.uu.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ws3.bmc.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ws3.bmc.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJAJd2CtAiLVt5MA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDXdzMy5ibWMudXUuc2UwHhcNMTExMDIwMTExNjU2WhcNMjExMDE3MTExNjU2
+WjAYMRYwFAYDVQQDEw13czMuYm1jLnV1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAqx7+HJExRK1e+/qomq6aSQwaEGtS+IDK32Fv74FiYp8L4U5I
+8eUAlm3FIHB7Oy48C+io2k8Dz75Xa8LfHA0Cr26kXdHWkr3mQe1P359sgKroWavR
+cYJZ95CUhhr0+V+imHRzWrMldkOUA/eDCNc4M0z+yFFZUG40qRk/UfZe2fw/DVCC
+/0yrUFmxWZm2Ucu0YU0nVS6uH1Hc/FViqYqYp3b9mAOH+ikxkrxz3QWgO8mgmFsq
+slgEefRqXoQGCTNiHMi3Qmy/eGTtosCDFGBmd+TgSAySGU7x4S3V5+4ITVcJA8Bg
+L4PcQzFVlGygsPmfplm//vt/13nqoaiZWgtK2wIDAQABozswOTAYBgNVHREEETAP
+gg13czMuYm1jLnV1LnNlMB0GA1UdDgQWBBQdGkaJLeARtbXFF9QMtMoypLlhgzAN
+BgkqhkiG9w0BAQUFAAOCAQEADuz7Porc0f074NZ/hJ6VyaUYkxAa4/pHqGtCFvi2
+qEf8DmJ7YyWqOoDx5hJMZ2yBkZi2vfIyJBNLJw5O6/puTDfhUNRKTPncAE6hIHQi
+bCluAlR5AJZF8nMzyB+7bTG6XyCWz2No/KZrUcRFh/VEVolrVQwZPQZyKUv/cYNh
+FExo68rNtRrKYOcY5sQk7h+9T/Jgl7NAUddzCcaqS1BDi1LpS82F1kjmUm3DQv13
+pjMCd1M+kVHVj+YL5bwEF3ixEf4TUOLwD4GR+7iA4KYwQAwjQ9s2GEYVfcwoOh+N
+qQWpNmDn3kYrd5oTakoGUxe5200RC/e241+n+hwJtUsJ9A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ws3.bmc.uu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ws3.bmc.uu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file