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

Conflicts:
	swamid-1.0.mxml

1 files changed, 0 insertions, 74 deletions

diff --git a/swamid-1.0/mds.nordu.net.xml b/swamid-1.0/mds.nordu.net.xml
deleted file mode 100644
index 799a350d..00000000
--- a/swamid-1.0/mds.nordu.net.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_48c96d8e33d70912920fa299b42898e5" entityID="https://mds.nordu.net/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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mds.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mds.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAJy9CoSTSBHgMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDW1kcy5ub3JkdS5uZXQwHhcNMTEwNTI0MDkwMTI0WhcNMjEwNTIxMDkwMTI0
-WjAYMRYwFAYDVQQDEw1tZHMubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAzkiKNCOy4RX7t46Fc5fiBR3EazSIHiRLzULrrTqFE/h2j0PZ
-l+m5Zz7YVvVIrgegLYe3P2EbIymYuf+N7j/nxcoQiDneaywPP9tGX6D0YrSLHSLH
-MgnTGjjmugJxM5a7rFCjebeCI8KwI3LJlJ0vSp6m1KcPPibq9W478SsmQCipJ1dS
-sIiqoGdoD0g75BI0hrxVRr0ubgSycH3glW1UMGBMbhSe7cACrolSfuoTgpftYi90
-t6GyXeTCJYRw5W5rkBwsow9YIGqpldQfyfn/huNBS3cmRaa9nG0L9qhfKZhIMMGb
-cwTPkHYN7hmrQXBbdkwCRxT6LZXDXCafhUHoSQIDAQABo0owSDAnBgNVHREEIDAe
-gg1tZHMubm9yZHUubmV0hg1tZHMubm9yZHUubmV0MB0GA1UdDgQWBBQqK2psdO9L
-AT8fQvZM/1wQJAwxUjANBgkqhkiG9w0BAQUFAAOCAQEAXz5EvWeoUgb5Oy8myyHF
-SPDpXwWzZ/uNSnE40a3bPvjor1hH2AkEgMZ/GZ5HYT5hFVH6yEOGpBD576jYFmJ2
-K1EgSmb6j4dhPlBW6cRl6aIBqGJZFuS/D5KmkxEWABzorFQmxMJASAAZcb29x1Ee
-hvgLC2m2a3sNAKshsBbCVDSCoe5RK0J1YxqgsrkGTZmqH1czvZBxqVX09ISQCtWC
-ll3e7SVwC69BgwlZifZeO/QxSzyd+UIGXTq5O7oVr2LvnAweOtkgVpLPzBiIXNuR
-LE6cjSR4yr9//oZ1hMf6gdD0KWrfKSNt9LRzh1sodYAlXh+M36RGS3zvuxGuZ6qj
-RQ==
-</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.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mds.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAJy9CoSTSBHgMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDW1kcy5ub3JkdS5uZXQwHhcNMTEwNTI0MDkwMTI0WhcNMjEwNTIxMDkwMTI0
-WjAYMRYwFAYDVQQDEw1tZHMubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAzkiKNCOy4RX7t46Fc5fiBR3EazSIHiRLzULrrTqFE/h2j0PZ
-l+m5Zz7YVvVIrgegLYe3P2EbIymYuf+N7j/nxcoQiDneaywPP9tGX6D0YrSLHSLH
-MgnTGjjmugJxM5a7rFCjebeCI8KwI3LJlJ0vSp6m1KcPPibq9W478SsmQCipJ1dS
-sIiqoGdoD0g75BI0hrxVRr0ubgSycH3glW1UMGBMbhSe7cACrolSfuoTgpftYi90
-t6GyXeTCJYRw5W5rkBwsow9YIGqpldQfyfn/huNBS3cmRaa9nG0L9qhfKZhIMMGb
-cwTPkHYN7hmrQXBbdkwCRxT6LZXDXCafhUHoSQIDAQABo0owSDAnBgNVHREEIDAe
-gg1tZHMubm9yZHUubmV0hg1tZHMubm9yZHUubmV0MB0GA1UdDgQWBBQqK2psdO9L
-AT8fQvZM/1wQJAwxUjANBgkqhkiG9w0BAQUFAAOCAQEAXz5EvWeoUgb5Oy8myyHF
-SPDpXwWzZ/uNSnE40a3bPvjor1hH2AkEgMZ/GZ5HYT5hFVH6yEOGpBD576jYFmJ2
-K1EgSmb6j4dhPlBW6cRl6aIBqGJZFuS/D5KmkxEWABzorFQmxMJASAAZcb29x1Ee
-hvgLC2m2a3sNAKshsBbCVDSCoe5RK0J1YxqgsrkGTZmqH1czvZBxqVX09ISQCtWC
-ll3e7SVwC69BgwlZifZeO/QxSzyd+UIGXTq5O7oVr2LvnAweOtkgVpLPzBiIXNuR
-LE6cjSR4yr9//oZ1hMf6gdD0KWrfKSNt9LRzh1sodYAlXh+M36RGS3zvuxGuZ6qj
-RQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mds.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mds.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file