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

4 files changed, 108 insertions, 28 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index fcd4330c..6a1375bd 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -214,4 +214,6 @@
   <xi:include href="swamid-1.0/ni.nordu.net-pysaml2.xml"/>
   <xi:include href="swamid-2.0/coip.app.nordu.net.xml"/>
   <xi:include href="swamid-2.0/fds.hhs.se.xml"/>
+  <xi:include href="swamid-1.0/play.mdh.se.xml"/>
+  <xi:include href="swamid-1.0/play.lu.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0/play.hb.se.xml b/swamid-1.0/play.hb.se.xml
index 9c475137..4e66d6fc 100644
--- a/swamid-1.0/play.hb.se.xml
+++ b/swamid-1.0/play.hb.se.xml
@@ -1,36 +1,12 @@
 
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_b69a1a6618013810ed1afc1ae5d8fba2" entityID="https://play.hb.se/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_ecf21b3531263c1a3c09f6bfeafb7507041e7904" entityID="https://play.hb.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://play.hb.se/Shibboleth.sso/DS/ds.sunet.se" 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://play.hb.se/Shibboleth.sso/DS/ds.sunet.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://play.hb.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>play.hb.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=play.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAOvLiNnV6cTzMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCnBsYXkuaGIuc2UwHhcNMTIwNzA0MTM0NDIyWhcNMjIwNzAyMTM0NDIyWjAV
-MRMwEQYDVQQDEwpwbGF5LmhiLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAsC+n2G+sTBN1LFD3ouhmVNujuIZlzpgP22MWLZ4REIG4HOH2jOJRFbAS
-Z3hIBe35cMYT1099TJhGK/TpurA2zCiXrwu4FzVH8oAFK7Ko/EruEUZoqxwKO3fS
-bVRZhEW0YFPj2R5ENOoiccD55mp3RE5+wJ+GKgEWlYIJF/APZ8kFrXkTAv9Af6LH
-WZL1f5SEgqXCD7y7pr/Y97QbHz1ruAYsq7UFnOjtVMHhFNY2G9IrpzcqMQ7L18TE
-oBTQ0udKMOgMhcFwQh5lSDazrvCjMddUj8rQDymsl3pHZbPAOrWd15ojuwpO0dql
-LvvAwBMYWeozikSZk2/BtS2J+QRIhwIDAQABo0QwQjAhBgNVHREEGjAYggpwbGF5
-LmhiLnNlhgpwbGF5LmhiLnNlMB0GA1UdDgQWBBSVesO6y/DVoLHWvQjeutwfnSHQ
-kTANBgkqhkiG9w0BAQUFAAOCAQEAXS12bCxjIYpnC5oGD0UCOZmlgzBJtqTY/o76
-E7GuwCSO9i/SIEL06fzgzkJGjaUbLlAHws0Qo6QkS8PGlM0/Judv1qFrzG1Two0t
-TjwLfVTfl0MNCvx3BUnk/quKsj2s6o12EH279gND5Wuh4kAqSFIlO05mYxt+3eM6
-anE0HCN44TbeEOgfcWeXR8bYwjEIPQZM8FUfzK8z0R3FL0hMRPItgfEMnRiOqX05
-hQgJy7Uk7DD3Lcy9yZoMmihj9baBhImCe3aKc/2UTNKPYHiB9DGqY5Ab6iZeA5bg
-X6RkltZT6yho98P4hxRs87RcrU+ScrgsjYZq9RoLHDPid7sDIA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>play.hb.se</ds:KeyName>
         <ds:X509Data>
diff --git a/swamid-1.0/play.lu.se.xml b/swamid-1.0/play.lu.se.xml
new file mode 100644
index 00000000..4680aabe
--- /dev/null
+++ b/swamid-1.0/play.lu.se.xml
@@ -0,0 +1,51 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_05ae698664ddbedfd5c0a1ab75facdc6fc257641" entityID="https://play.lu.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://play.lu.se/Shibboleth.sso/DS/ds.sunet.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://play.lu.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>play.lu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=play.lu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJANdIt1sPlxZtMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+BAMTCnBsYXkubHUuc2UwHhcNMTIwOTIxMDg1ODQzWhcNMjIwOTE5MDg1ODQzWjAV
+MRMwEQYDVQQDEwpwbGF5Lmx1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAm52BjRAJpGfNZHRAES67hnyp1n9XiPmdZxQGGacgB+ME1zUS+s0+R4B4
+TQjJv3dzkkAa4Lhd3f3eRsTeJ1pnEJ2esqbK2bk5qX/GNC7lpdSnbRg+vBfvaZgD
+6643daq++Qt2gMvzbp7jn8BTqJUZQUH31RJwnoqjgrVj19GBOZOJmtBGmktBlPOb
+/MIWmk4p4epjgA9Fpg94WiJ8hjEl15SV+CtktRzQeRG3ph6uKFpMoXsda50LcmtW
+NrlnG/wkhGgT3BVyrqtUVi/0Fv0kVXhArhmDbN7f3foWpLfZhH+lhZYLfoxjtsgv
+16LqZVmWscFUI/oBmOjnwpZwvz7m8QIDAQABo0QwQjAhBgNVHREEGjAYggpwbGF5
+Lmx1LnNlhgpwbGF5Lmx1LnNlMB0GA1UdDgQWBBQogVFbpaWP1X0OCpOzt3bysyYD
+QDANBgkqhkiG9w0BAQUFAAOCAQEAdP4K4e/MS3Fpxbx7oDaIaFAEWXDzgUDimGdF
+2jzgtcbkZJBj9TpgMSNbY6ThcLOpahFMheogxZX9f+y/bi/kGbuv134PdlMAv6tn
+JnLtx0r+rgbciWJjdu49SrkuNx35nkVhHbVGg7K8F2ov5sL8qt5UlzHyhQZkzPjB
+F2+m5EhhpnrRKwSlgv5ZDpgSjcberEOdvpUFfUhvst1zWfJ0sT/F7V8WcfTVUEu0
+fZtv5Htmbw0VP2Hrh/PPYXiC2pce8i/5mGCVUhHfH8KUGxO+6VHhgtRnFBNYiI1l
+tG3wt4eOb5yI3XF8IM76la4ykRFQSukvkZv1Wj5YiCx5UDm+Xg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.lu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.lu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.lu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.lu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.lu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.lu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.lu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.lu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://play.lu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://play.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/play.mdh.se.xml b/swamid-1.0/play.mdh.se.xml
new file mode 100644
index 00000000..b1f69ff9
--- /dev/null
+++ b/swamid-1.0/play.mdh.se.xml
@@ -0,0 +1,51 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_629342af9576ac4bcdc0bac4ef3fc4beb3a68c0e" entityID="https://play.mdh.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://play.mdh.se/Shibboleth.sso/DS/ds.sunet.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://play.mdh.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>play.mdh.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=play.mdh.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAKvtXo7Z924eMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3BsYXkubWRoLnNlMB4XDTEyMDkyMTA4NTM0N1oXDTIyMDkxOTA4NTM0N1ow
+FjEUMBIGA1UEAxMLcGxheS5tZGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC1fDIENAaqctmukYnIMajTisvX74XzKa1c4ZrnlwaFgmKQIhmTeI3e
+uFNpYjVHfzpz7o19Q4vuFjogyfsi6cCahfvcLh7vvn3wplwTuA1Z1JNGlboybcmF
+tPOQnQTf1t0aSHaypOWNgZKnZuF87OM2bRDQ9LVHXgdAUIgjvC5PmIN0Rv0Ws7j5
+Qj4Q1bpG6+byA0hFCOxa9KiQKs03XWB4SR0PZsSQDKVQh5HVwz8AdIxOhSg94bei
+On0ztNMRcm4CNlmN5NNGhS+i02hZr3KPel6xe2SmqPmsLRLccowSQO8aLUPdde9o
+wDV0XtH69QzUg/GjLN8OT/Y2KyWcb90JAgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
+YXkubWRoLnNlhgtwbGF5Lm1kaC5zZTAdBgNVHQ4EFgQUZxpUfZYV6co1kdmJwlqA
+kSQ4uL8wDQYJKoZIhvcNAQEFBQADggEBAHi1snMpIi11/cGVH4V1Okzc5ucw1nbJ
+mexzUwM/wRLqiO3JLYmGZWqj0P7FFdRK6Ug9q5HmBqn4AGl1lbWTsjee2FGQQtxF
+XeZkZTKYKu3fI0aLFp4omw7m0vsDIYIVKUQPdEV2brqKQSeURtdTXxieCZsR9+8U
+v+Zu6RkWzLUWOly86hcChrLLHtFwpzcKXG5OaHnlFyODzRuwMw7LUQZ+YkQUQeiR
+UihuipaxEeF9qspOnUJEmpAXEoGo/fOueGF045k2Bw6fH6hBbu/6k59Je/aeFZIM
+cPl/udSDVhrtgjhhK6hPgDEpcIskofAJC6+DejW8PESi0qV/pDpG9Eo=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mdh.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mdh.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mdh.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mdh.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mdh.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mdh.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mdh.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mdh.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mdh.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mdh.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://play.mdh.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mdh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://play.mdh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.mdh.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.mdh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file