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

Conflicts:
	swamid-1.0.mxml

4 files changed, 85 insertions, 75 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 966760dc..0a4b95d7 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -172,8 +172,8 @@
   <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/mds.nordu.net.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"/>
 </EntitiesDescriptor>
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
diff --git a/swamid-1.0/nordunet.tv.xml b/swamid-1.0/nordunet.tv.xml
new file mode 100644
index 00000000..8352723b
--- /dev/null
+++ b/swamid-1.0/nordunet.tv.xml
@@ -0,0 +1,83 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_3eefe17e2021aa3061e95a0bde9936fa" entityID="https://nordunet.tv/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://nordunet.tv/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nordunet.tv</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nordunet.tv</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJbH0STVcsEQMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC25vcmR1bmV0LnR2MB4XDTExMDUzMTE1NDg1NloXDTIxMDUyODE1NDg1Nlow
+FjEUMBIGA1UEAxMLbm9yZHVuZXQudHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDgvw+Ecpy85/x9dFLRnI11QoYRx9eRC/H23k5ItE5g/HOinHkl7tT2
+KYhXE8orDVpvtj1edXppIE0C3XWkgltdJTvPOXxnfto2rQOx6h8lZHldFzNhlaD1
+gNNzrNLD/PqOJ4vGgqFogV7BAQFHBWz1hiU98xle7Jqa8/7rWj2V1T7ZcjkfaRhU
+q/4EoJg0UTy0NURQjhgD8pk4gw9PdUfnxWBeiukIFFIiRzPVy6E/DnMHO/Lj3UYU
+hlVK4CZJ1eMaDlqq2msAM2NXFEvfG7jd/XfCdx8ZSqKCRsa4o8pTOcbAW9cxhso8
+rC2gcjgeZypevNVxHzcepMMeCrbs1rblAgMBAAGjRjBEMCMGA1UdEQQcMBqCC25v
+cmR1bmV0LnR2hgtub3JkdW5ldC50djAdBgNVHQ4EFgQULkNNPNMu2YQkJwXc62KQ
+gVs9cTcwDQYJKoZIhvcNAQEFBQADggEBAEQw4jnSd7l+50jXx9lDY4Ffn9s2m69M
+pdKjSUlCN/0+MFRzpZcgJcVSrivqiICeDOW1QHNJZLmiZXzOV4QHwrOGObCMCclo
++lCmV0sLvZ/N9E5mAne/61kx251w1ub/aQJ5H2HV+wgcGMLyrJN+Fas3Z6D0WIwE
+ln9IKS3JyKG+VBcpLWosX1jaSP6XFJe7kZ58SVbRnAoaGoIWh7tww13KsHkPEmU3
+UuGq63xCD7WDlXE0wpoWBE2dJUti1P4OovwFCUN4aqYT1c2y4wneVj/KTEWy8qKz
+000W3/HStrhj0L5kZNAkal6vzZ0Ux9n3V/9/ZoeSilM5ZiFD9whUQho=
+</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>nordunet.tv</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nordunet.tv</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJbH0STVcsEQMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC25vcmR1bmV0LnR2MB4XDTExMDUzMTE1NDg1NloXDTIxMDUyODE1NDg1Nlow
+FjEUMBIGA1UEAxMLbm9yZHVuZXQudHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDgvw+Ecpy85/x9dFLRnI11QoYRx9eRC/H23k5ItE5g/HOinHkl7tT2
+KYhXE8orDVpvtj1edXppIE0C3XWkgltdJTvPOXxnfto2rQOx6h8lZHldFzNhlaD1
+gNNzrNLD/PqOJ4vGgqFogV7BAQFHBWz1hiU98xle7Jqa8/7rWj2V1T7ZcjkfaRhU
+q/4EoJg0UTy0NURQjhgD8pk4gw9PdUfnxWBeiukIFFIiRzPVy6E/DnMHO/Lj3UYU
+hlVK4CZJ1eMaDlqq2msAM2NXFEvfG7jd/XfCdx8ZSqKCRsa4o8pTOcbAW9cxhso8
+rC2gcjgeZypevNVxHzcepMMeCrbs1rblAgMBAAGjRjBEMCMGA1UdEQQcMBqCC25v
+cmR1bmV0LnR2hgtub3JkdW5ldC50djAdBgNVHQ4EFgQULkNNPNMu2YQkJwXc62KQ
+gVs9cTcwDQYJKoZIhvcNAQEFBQADggEBAEQw4jnSd7l+50jXx9lDY4Ffn9s2m69M
+pdKjSUlCN/0+MFRzpZcgJcVSrivqiICeDOW1QHNJZLmiZXzOV4QHwrOGObCMCclo
++lCmV0sLvZ/N9E5mAne/61kx251w1ub/aQJ5H2HV+wgcGMLyrJN+Fas3Z6D0WIwE
+ln9IKS3JyKG+VBcpLWosX1jaSP6XFJe7kZ58SVbRnAoaGoIWh7tww13KsHkPEmU3
+UuGq63xCD7WDlXE0wpoWBE2dJUti1P4OovwFCUN4aqYT1c2y4wneVj/KTEWy8qKz
+000W3/HStrhj0L5kZNAkal6vzZ0Ux9n3V/9/ZoeSilM5ZiFD9whUQho=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nordunet.tv/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nordunet.tv/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nordunet.tv/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nordunet.tv/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nordunet.tv/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nordunet.tv/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nordunet.tv/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nordunet.tv/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nordunet.tv/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nordunet.tv/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nordunet.tv/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nordunet.tv/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nordunet.tv/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nordunet.tv/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nordunet.tv/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+       <md:ServiceName xml:lang="en">NORDUnet TV</md:ServiceName>
+       <md:ServiceDescription xml:lang="en">NORDUnet Media Distribution Site</md:ServiceDescription>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-kalmar-1.0.mxml b/swamid-kalmar-1.0.mxml
index 770ff5d5..a0c0ae96 100644
--- a/swamid-kalmar-1.0.mxml
+++ b/swamid-kalmar-1.0.mxml
@@ -13,4 +13,5 @@
   <xi:include href="swamid-1.0/samlidp.ki.se.xml"/>
   <xi:include href="swamid-1.0/identity.mdh.se.xml"/>
   <xi:include href="swamid-1.0/hbidp.hb.se.xml"/>
+  <xi:include href="swamid-1.0/nordunet.tv.xml"/>
 </md:EntitiesDescriptor>