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

3 files changed, 214 insertions, 1 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index f60563dd..596a96c2 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -176,7 +176,7 @@
   <xi:include href="swamid-1.0/play.sunet.se.xml"/>
   <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"/>
+  <xi:include href="swamid-1.0/mds-test.sunet.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0/mds-test.sunet.se.xml b/swamid-1.0/mds-test.sunet.se.xml
new file mode 100644
index 00000000..aa32eaea
--- /dev/null
+++ b/swamid-1.0/mds-test.sunet.se.xml
@@ -0,0 +1,77 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_e6195f92f464d63dcf30e16cd4b8491c" entityID="https://mds-test.sunet.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-test.sunet.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-test.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=mds-test.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAM5Yhbpd3TmcMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEW1kcy10ZXN0LnN1bmV0LnNlMB4XDTExMTExNzE0NTUyMVoXDTIxMTExNDE0
+NTUyMVowHDEaMBgGA1UEAxMRbWRzLXRlc3Quc3VuZXQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDCqEcLC0Zdpy/RH2bhjc149216gnMdiz1q8agv
+eZNbww+9f6DNvQzevyr1U7nnKzY3mZRsMoLXCbgYSfe7d7GXv/fRyx3Nx9g1sG5F
+C3ydosS2/1aWWLwMjFRYr/QIqTZa7ihWLQhetJ+dObCGPO43PmIC0fIvBUJ/KX7B
+DJXNKbA+PR2Xyiavv153DoT46/KVsPIgkCMlMTltLUB5030Bm3IwMs+sHFhnVx8Y
+TZ7phNR7kGrgmody+YIvoAz4vtuuvlPHO8l0d3HTO4M9Z4H7OufTN6ivxdPIcfsn
+z0baiuQpWziayeeAHrLwC09RS3FMFeadR5ZTcDW0eY0ralsNAgMBAAGjUjBQMC8G
+A1UdEQQoMCaCEW1kcy10ZXN0LnN1bmV0LnNlhhFtZHMtdGVzdC5zdW5ldC5zZTAd
+BgNVHQ4EFgQUokBRRHpa+5pznLea5K03GSgBG80wDQYJKoZIhvcNAQEFBQADggEB
+AAEucvMd1uSQnSDcMkd9jVS9rtTy9R32Zik2OWjYzW6HbM2/8jU7XFscqlgmunuA
+0+k3i9BtmSc+SbI3n3QejeUleINWah19CJ+VdKUJGN9GKiGPaK3EGz8OLqhXHIpN
+HGCYy1/df0OtdqptbrRiVMlqXIBJhLmenczTb9fw6ercngudu3ftIu2/+85ZER3p
+otlxWXhbXhBVUmi89hDXmtUL4ulDy3Ufx1zAtuxf5CWTmMQukSSSg2m+QYraFyPL
+ZNCOgNyiOFcrqr9kcDc2fsyVUlAKmm/sG2P+mCEj/zRhLCpUWbG2vg3r84H3lNKv
+VtHMCV6pEmWvRxvRGMxUfw8=
+</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-test.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=mds-test.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAM5Yhbpd3TmcMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEW1kcy10ZXN0LnN1bmV0LnNlMB4XDTExMTExNzE0NTUyMVoXDTIxMTExNDE0
+NTUyMVowHDEaMBgGA1UEAxMRbWRzLXRlc3Quc3VuZXQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDCqEcLC0Zdpy/RH2bhjc149216gnMdiz1q8agv
+eZNbww+9f6DNvQzevyr1U7nnKzY3mZRsMoLXCbgYSfe7d7GXv/fRyx3Nx9g1sG5F
+C3ydosS2/1aWWLwMjFRYr/QIqTZa7ihWLQhetJ+dObCGPO43PmIC0fIvBUJ/KX7B
+DJXNKbA+PR2Xyiavv153DoT46/KVsPIgkCMlMTltLUB5030Bm3IwMs+sHFhnVx8Y
+TZ7phNR7kGrgmody+YIvoAz4vtuuvlPHO8l0d3HTO4M9Z4H7OufTN6ivxdPIcfsn
+z0baiuQpWziayeeAHrLwC09RS3FMFeadR5ZTcDW0eY0ralsNAgMBAAGjUjBQMC8G
+A1UdEQQoMCaCEW1kcy10ZXN0LnN1bmV0LnNlhhFtZHMtdGVzdC5zdW5ldC5zZTAd
+BgNVHQ4EFgQUokBRRHpa+5pznLea5K03GSgBG80wDQYJKoZIhvcNAQEFBQADggEB
+AAEucvMd1uSQnSDcMkd9jVS9rtTy9R32Zik2OWjYzW6HbM2/8jU7XFscqlgmunuA
+0+k3i9BtmSc+SbI3n3QejeUleINWah19CJ+VdKUJGN9GKiGPaK3EGz8OLqhXHIpN
+HGCYy1/df0OtdqptbrRiVMlqXIBJhLmenczTb9fw6ercngudu3ftIu2/+85ZER3p
+otlxWXhbXhBVUmi89hDXmtUL4ulDy3Ufx1zAtuxf5CWTmMQukSSSg2m+QYraFyPL
+ZNCOgNyiOFcrqr9kcDc2fsyVUlAKmm/sG2P+mCEj/zRhLCpUWbG2vg3r84H3lNKv
+VtHMCV6pEmWvRxvRGMxUfw8=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds-test.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds-test.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds-test.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds-test.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds-test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds-test.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds-test.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds-test.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds-test.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-backport-1.0.xml b/swamid-backport-1.0.xml
new file mode 100644
index 00000000..45c8f615
--- /dev/null
+++ b/swamid-backport-1.0.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
+  <xi:include href="swamid-1.0/order.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/dedserv79.levonline.com.xml"/>
+  <xi:include href="swamid-1.0/mondo.su.se.xml"/>
+  <xi:include href="swamid-1.0/mondo-test.su.se.xml"/>
+  <xi:include href="swamid-1.0/ensky.lhs.se.xml"/>
+  <xi:include href="swamid-1.0/shib-sp.kau.se.xml"/>
+  <xi:include href="swamid-1.0/www.wisum.umdac.umu.se.xml"/>
+  <xi:include href="swamid-1.0/beta.augustus.se.xml"/>
+  <xi:include href="swamid-1.0/dspace.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/lists.su.se.xml"/>
+  <xi:include href="swamid-1.0/pp-komm-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/www.sub.su.se.xml"/>
+  <xi:include href="swamid-1.0/samsok.libris.kb.se.xml"/>
+  <xi:include href="swamid-1.0/public.it.secure.su.se.xml"/>
+  <xi:include href="swamid-externals-1.0/downloads.channel8.msdn.com.xml"/>
+  <xi:include href="swamid-1.0/mondo-web.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/cbs-vylvatest.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/labs.swami.se.xml"/>
+  <xi:include href="swamid-1.0/shibboleth.ebscohost.com.xml"/>
+  <xi:include href="swamid-1.0/www3.genuinetext.com.xml"/>
+  <xi:include href="swamid-1.0/xfire.mimas.ac.uk.xml"/>
+  <xi:include href="swamid-1.0/umdac-humpdac.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/sp.lhs.se.xml"/>
+  <xi:include href="swamid-1.0/roundup.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/moodle.lhs.se.xml"/>
+  <xi:include href="swamid-1.0/slcstest.uninett.no.xml"/>
+  <xi:include href="swamid-1.0/www.cambro.umu.se.xml"/>
+  <xi:include href="swamid-1.0/cambro-utv1.umdc.umu.se.xml"/>
+  <xi:include href="swamid-1.0/kurser.math.su.se.xml"/>
+  <xi:include href="swamid-1.0/kurser3.math.su.se.xml"/>
+  <xi:include href="swamid-1.0/webwork.math.su.se.xml"/>
+  <xi:include href="swamid-1.0/webwork2.math.su.se.xml"/>
+  <xi:include href="swamid-1.0/etenta.math.su.se"/>
+  <xi:include href="swamid-1.0/sp.swamid.se.xml"/>
+  <xi:include href="swamid-1.0/connect.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/connect-test.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/converis.info.xml"/>
+  <xi:include href="swamid-1.0/sp.wavelan.su.se.xml"/>
+  <xi:include href="swamid-1.0/samadhi.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/tcs-test.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/tcs-escience.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/tcs-personal.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/tcs-escience-portal.terena.org.xml"/>
+  <xi:include href="swamid-1.0/tcs-personal-portal.terena.org.xml"/>
+  <xi:include href="swamid-1.0/akino.hh.se.xml"/>
+  <xi:include href="swamid-1.0/bibliometrics.ki.se.xml"/>
+  <xi:include href="swamid-1.0/uu.test.diva-portal.org.xml"/>
+  <xi:include href="swamid-1.0/account-test.unit.liu.se.xml"/>
+  <xi:include href="swamid-1.0/www4.genuinetext.com.xml"/>
+  <xi:include href="swamid-1.0/beta.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/su.avedas.com.xml"/>
+  <xi:include href="swamid-1.0/registrera.hb.se.xml"/>
+  <xi:include href="swamid-1.0/aktivering.db.umu.se.xml"/>
+  <xi:include href="swamid-1.0/sukattool-web1.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/www.diva-portal.org.xml"/>
+  <xi:include href="swamid-1.0/pp-edu-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/minastudier-test.su.se.xml"/>
+  <xi:include href="swamid-1.0/ladok-test.su.se.xml"/>
+  <xi:include href="swamid-1.0/pp-redtest-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/cambro-tst1.umdc.umu.se.xml"/>
+  <xi:include href="swamid-1.0/login.proxy.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/nordushare-dev.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/pp-migr-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/pp-test-admin.it.su.se.xml"/>
+  <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/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"/>
+  <xi:include href="swamid-1.0/brainstorm.swami.se.xml"/>
+  <xi:include href="swamid-1.0/kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/beta.lobber.se.xml"/>
+  <xi:include href="swamid-1.0/www07test.sub.su.se.xml"/>
+  <xi:include href="swamid-1.0/sp.kau.se.xml"/>
+  <xi:include href="swamid-1.0/fordrop.irt.kth.se.xml"/>
+  <xi:include href="swamid-1.0/minastudier.su.se.xml"/>
+  <xi:include href="swamid-1.0/ladok.su.se.xml"/>
+  <xi:include href="swamid-1.0/bardo.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/mailfilter-test.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/unitcf.se.xml"/>
+  <xi:include href="swamid-1.0/crowd.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/rt-test-app1.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/webapp-utv.ita.mdh.se.xml"/>
+  <xi:include href="swamid-1.0/portal.mdh.se.xml"/>
+  <xi:include href="swamid-1.0/confluence.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/jira.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/confluence-test.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/mailfilter.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/jira-test.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/rt.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/ilearn.dsv.su.se.xml"/>
+  <xi:include href="swamid-1.0/connect.uninett.no.xml"/>
+  <xi:include href="swamid-1.0/nagios.dev.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/www.studera.testb.antagning.se.xml"/>
+  <xi:include href="swamid-1.0/dev.lobber.se.xml"/>
+  <xi:include href="swamid-1.0/www.bmcmediatek.uu.se.xml"/>
+  <xi:include href="swamid-1.0/sp-test.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/www.studera.nu.xml"/>
+  <xi:include href="swamid-1.0/smd-dev.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/vlab-chemsub.explizit.se.xml"/>
+  <xi:include href="swamid-1.0/sp.it.gu.se.xml"/>
+  <xi:include href="swamid-1.0/monitor.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/coip-test.sunet.se-sp.xml"/>
+  <xi:include href="swamid-1.0/betafoo.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se.xml"/>
+  <xi:include href="nya-1.0/www.antagning.se.xml"/>
+  <xi:include href="swamid-1.0/crowdtest.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/connect8.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/sp-test.swamid.se.xml"/>
+  <xi:include href="nya-1.0/www.studera.testa.antagning.se.xml"/>
+  <xi:include href="swamid-1.0/lingon.ladok.umu.se.xml"/>
+  <xi:include href="swamid-1.0/ni.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/jabber.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/epc.ub.uu.se.xml"/>
+  <xi:include href="swamid-1.0/expert.antagning.se.xml"/>
+  <xi:include href="swamid-1.0/its-pd0001.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/www.servicedesk.its.umu.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-olho0001.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/www.wisum.its.umu.se.xml"/>
+  <xi:include href="swamid-1.0/kiladokdev.it.ki.se.xml"/>
+  <xi:include href="swamid-1.0/kiladoktest.it.ki.se.xml"/>
+  <xi:include href="swamid-1.0/lpw.ki.se.xml"/>
+  <xi:include href="swamid-1.0/nordunet.tv.xml"/>
+  <xi:include href="swamid-1.0/mailfilter.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/dev.teol.uu.se.xml"/>
+  <xi:include href="swamid-1.0/www2.teol.uu.se.xml"/>
+  <xi:include href="swamid-1.0/www2.student.teol.uu.se.xml"/>
+  <xi:include href="swamid-1.0/www.student.teol.uu.se.xml"/>
+  <xi:include href="swamid-1.0/sutest.dsv.su.se.xml"/>
+  <xi:include href="swamid-1.0/www.antagning.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/mds.sunet.se.xml"/>
+</md:EntitiesDescriptor>