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

6 files changed, 421 insertions, 0 deletions

diff --git a/swamid-2.0/crowd.sunet.se-shibboleth.xml b/swamid-2.0/crowd.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..90588118
--- /dev/null
+++ b/swamid-2.0/crowd.sunet.se-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd.sunet.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <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://crowd.sunet.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://crowd.sunet.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Sunets Crowd-inloggningstjänst </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Sunet Crowd Identity Management</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Sunets Atlassian Crowd-tjänst som hjälper till med användarhantering för Sunets Jira och Confluence </mdui:Description>
+        <mdui:Description xml:lang="en">Sunet's Atlassian Crowd-service providing identity management for Sunet's Jira and Confluence</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>1b0d6163fdc2</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=1b0d6163fdc2</ds:X509SubjectName>
+          <ds:X509Certificate>MIID6zCCAlOgAwIBAgIJAMap5fIDYPdFMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMTDDFiMGQ2MTYzZmRjMjAeFw0xNzAyMDExMjQ2NDVaFw0yNzAxMzAxMjQ2NDVa
+MBcxFTATBgNVBAMTDDFiMGQ2MTYzZmRjMjCCAaIwDQYJKoZIhvcNAQEBBQADggGP
+ADCCAYoCggGBAMbW8tDeOxLRESCeqFfEPsBLpBxh19q13zD5QGZPxR1cUZuxJhUs
+9E6AZFtCtX+zu9d2C3GH7NPiRk939ADzLWO4MRtvtgZ9Qhre04VVlOLUM0OapCV6
+Bx1qKzlPk9Vc+Hq1zF2pVVUvOtzHuywdm0BkTI1l1za6PBCb58dHizP4alCr9UHT
+SpQEn2Ri0dVp6K0Nk9SyVsml7WsKcYAhMXJiTIKspnrV/iJU2mBA89jOa0yWl1Nl
+cDEAKAlfrCGn7MP9Rng+u2oN7Sh2iov9AU+Rszu4dDRuJkQNJDO4GAQ0mYSMyQvv
+BElVbNdeq6XTVBlFHdkhBjUuvnqae+dqjY4XGE9icTSASiv9EEad1H7Vmcy4EwLX
+EjlMVMnVfdTz+yi3jK8mOt0C3S9Gz3KjwaitgBKm7uju89FYFn7fG99L4hOeTQB1
+ga+Cii+dL7y0v+kkHAk8jpJALN5KEjj4AmT4IcNPp7uJPBFlNwkq0Zg5rMB161XV
+pfwPEXs8lEzZ1wIDAQABozowODAXBgNVHREEEDAOggwxYjBkNjE2M2ZkYzIwHQYD
+VR0OBBYEFGcYsbkt1uxRugUqMsX2dzGUZ5rOMA0GCSqGSIb3DQEBCwUAA4IBgQAQ
+lYqH1Wob2pDSASiUprmePnuvAGbUPEzwr/cXAJ/KP3xJzHs7LG1qDf8BVcne5n7Q
+meRD8ocFEz/UJWCJ2zp025G+Ch3Q6JMGSNMYzsQPYPLP7DjiTM7MXrg7u8+y/LJo
+uE6XTuAh0c5NEO3szKgMVIHYYVjoTV5GRN15qBk2zhnfEXPdRv4yvPgyLRVnxnVl
+jTZ/4gj8yiuqxfLqLWDNOOdgBtaJNsflR/vSKs5GbrjuFxnG0p3pFBSO2jfFpApy
+POMHGO5/++lxJI0O/UMUfTLbLAHRhStcSuc8jQCg40kBdqiK2+ns5oiSOQi02WeP
+SPx6+DfRbHqYyOt/XGR5Xlx7Cy+Umu76ZjhLYY1Q28Btv4uxlTfjsnPpPgpYnFc6
+arPPNl3iFqtn/BL+kFv4G5DAs+AcR+tw818VU+oC8JOLUKX6x9vt97mc0lmMe6XD
+og+StCZFRCgVG6Yoq6EYaJYK1DsUP+4hBlptoRNdLd4aYwdG52H3By9WhnAE8wQ=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml b/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..ae3e0ae3
--- /dev/null
+++ b/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://login.test.it.liu.se/idp/shibboleth">
+  <Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Linköpings Universitet (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linköping University (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testidentitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">Test Identity Provider for employees and students at Linköping University.</mdui:Description>
+        <mdui:Logo height="68" width="350">https://login.test.it.liu.se/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="68" width="350">https://login.test.it.liu.se/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="68" width="350">https://login.test.it.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>liu.se</mdui:DomainHint>
+        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
+        <mdui:IPHint>192.36.54.0/24</mdui:IPHint>
+        <mdui:IPHint>192.36.93.0/24</mdui:IPHint>
+        <mdui:IPHint>192.36.94.0/24</mdui:IPHint>
+        <mdui:IPHint>192.12.235.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.86.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:4c::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:58.397836,15.576008</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:58.403479,15.622827</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:58.589874,16.176439</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.350824,18.143391</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAPnX7SmJwfxmgq0gnMtTEtq/GapJMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTEw
+MjEzNloXDTM2MDkyMTEwMjEzNlowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5s
+aXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFBFo6NO2WFR4K
+LmjqsFiJRFwkJ7A98o+wPy59W627iMmPznOs1+6zTW5qeJETmzaBmvjNw/26kQrz
+dDrpkVcowvDmRR4rDWja8TcnpZiTJmaZBHpwRGagyke0cA/mL7zemV4E6S1afMun
+mJh8+PqbEYfhzVFn0w5AzPA7EZrcZa7Bl2E+0D7BxwKDOoF5IIQHPxc6JbcQKlPe
+Wq7qudk7vlxFUCECagMxXinikp14f3mqF/2wDAb/8Bxm72puiqZfH3LDuxVGTsUN
+klFZCGb0WcX5rY968uGCQOQPzmS5zibsaqtccpTkpmj0fGMGk3mvCHoFRjBdjZvM
+GOFuHV9RAgMBAAGjbzBtMB0GA1UdDgQWBBSAoF+lmeQ/Pg7kyR36UrZNrxrb8TBM
+BgNVHREERTBDghRsb2dpbi50ZXN0Lml0LmxpdS5zZYYraHR0cHM6Ly9sb2dpbi50
+ZXN0Lml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+ei9tRZlLCAzaxM1+Qr7QsKxX5KV4uPlnFZMV+sUs2c6gNjExyJMbXdWy92Z+BQhT
+y8msGro25wSomHEHY+Oy34e9W8fe2481M7xCdQoitGJfZREBpUN42pGFEzCPPK2A
+HSAMrh+izTL/crSbQX1KRlyXy2n75w4v4IRRkR8Q5/uL40OvXqHD//vqn5OLxZyq
+XnE9+OuzX+tzqyUsSxnbuiZeIO4RvtES8Z8jV+R8zbsqAJntBCREjX8IjMMrjOqV
+Q2rShyR2/rmM4FdYDvTeT2CS/mtLvHjcqhrnnyooFS8Cn6wKY1gYzWkXJ02wRbO3
+tx6vZWS6c4lQgs+Q2zdb5Q==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDETCCAfmgAwIBAgIJANDfvhcg8Z1SMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTExNDU0NVoXDTM2MDkx
+NjExNDU0NVowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5saXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr8zqZ+v3IFDjCC6UsASzdm6yTVaEs
+eTTs6U85e+Tfc2zoTOn8mxB8qRgcazmiZhYUfxg2engHsu/KsJ+xvf08pPvTH/5H
+d4DU+TOpevKLmJYH16A+1xXnJi9B5H28QEHNIUCR49+azgWrLy+Hwd5h+R6GL9Wr
++0wlGmC0iZfEPhaKqVKXxyPq3EoMKtIPgiFBUeXdIwEWnJQZSwOq8//rgNA4ShEn
+eTzwxf84rfVo8ztLV7CU/t69NNcv4b8BAILE9nvw465hlmkiqsxsUbQk/U6k3kiw
++VkfEiRJZqhz9sNv2x2b7m5aXLBH9h6mwjRwHwuYV2U9NU+jk6DVkgcJAgMBAAGj
+UDBOMB0GA1UdDgQWBBSELqFg/9+/XeobX9F2GTuWzkZ/5DAfBgNVHSMEGDAWgBSE
+LqFg/9+/XeobX9F2GTuWzkZ/5DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+A4IBAQByp838nFRFS+BehmwUUZSWdbHo6BcXcuKMCL2ADnWjKV1FMjvLlbzyyFl8
+bbTEEdUGpi5kyouJbMZyObr0BXvX3CZvoANdAJoN01z+35U4DoXGwevF5AjFt8m6
+4eYKGoL7fm6cbXR/EBpW7IDZUPl5S52ChnCVl6LPLAkaDFFmCG9vfYzb9p/Ay0Ia
+yqxIdplRaHbyykcA2vw7QclI5VoYwBEKwKig/5SFAXfs74QkOtMTkIpGBv/ECH5F
+f91hP1hqE59m9aIhTEHrmZMFmFgerXAsewRCSFs70Sucttv9IiTRxrj9JYMWBK4N
+UpYE3HavN9JHts63XvKCEfiptKe/
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAPJvGGG3PRGpj8/9g2ripJeFnDqqMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTEw
+MjEzNFoXDTM2MDkyMTEwMjEzNFowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5s
+aXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKiUPLthUZ7I8G
+hHO/Ekt0hyYAGFrWVbWTYmV3Y3T2G73LpqtznEWnRXuwXVExBtbstZ5ZFsWol7ac
+szaGimSaU/aANsDalFhQVuM3xYhCbQbkDq/3A1SQchciJxyR02gfRYVXLns9xLKc
+ZWVVJkeKeviyI3d4oX+GRYWb4Z6uG3NMuQ2Q2YNfqBkS6/9sj1vtliu1KiUOBYGS
+D5wIDlrJD8bcErWPOpWgS5F8d3LAb+OnwzpfSCP0s/ReA2OTDjQ5sDQPTHD8Ay/p
+u7WmTqlCSc2P/1q3CrYhNx8MlT56riXuJcYHpGlVj9W7BI84LrCjIDp4NCygPar1
+cEuers5fAgMBAAGjbzBtMB0GA1UdDgQWBBRI5PH2qRvZtOGRCGag0ZSNN+9HRjBM
+BgNVHREERTBDghRsb2dpbi50ZXN0Lml0LmxpdS5zZYYraHR0cHM6Ly9sb2dpbi50
+ZXN0Lml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+ZHEv2vWK9Hbht44bXodv/QeMk8UbR7H2QL83gQLGB4UI8ZyWLgQ6SMydn3XTZN3a
+r5Gt0B1cXpZT6cbVD5OghdydR8XDndbCrf2McXi+xmPqt9CigbBj49jvVk/iSX1q
+4gKdCyp/oMNYi67alCHQoDhTg1rPBEwBSoYs33y/Qn4nq02eOO5M77SdrwxC2XwG
+WHS0O+aCDB6cUmqu3vihoNCSQd6XhhWziXf3ZX0NBUOgHAqP+1DHv5d/9co/0rWA
+YuL6+TdT8Df+TZZZsCcCqEXauHzNFYBVP9iu3ZCLRbtIimTeYtKA1DwIcKewBZBv
++9LTW/kA/AILP1MSXxyCKg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.test.it.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.test.it.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.test.it.liu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.test.it.liu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.test.it.liu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAPnX7SmJwfxmgq0gnMtTEtq/GapJMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTEw
+MjEzNloXDTM2MDkyMTEwMjEzNlowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5s
+aXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFBFo6NO2WFR4K
+LmjqsFiJRFwkJ7A98o+wPy59W627iMmPznOs1+6zTW5qeJETmzaBmvjNw/26kQrz
+dDrpkVcowvDmRR4rDWja8TcnpZiTJmaZBHpwRGagyke0cA/mL7zemV4E6S1afMun
+mJh8+PqbEYfhzVFn0w5AzPA7EZrcZa7Bl2E+0D7BxwKDOoF5IIQHPxc6JbcQKlPe
+Wq7qudk7vlxFUCECagMxXinikp14f3mqF/2wDAb/8Bxm72puiqZfH3LDuxVGTsUN
+klFZCGb0WcX5rY968uGCQOQPzmS5zibsaqtccpTkpmj0fGMGk3mvCHoFRjBdjZvM
+GOFuHV9RAgMBAAGjbzBtMB0GA1UdDgQWBBSAoF+lmeQ/Pg7kyR36UrZNrxrb8TBM
+BgNVHREERTBDghRsb2dpbi50ZXN0Lml0LmxpdS5zZYYraHR0cHM6Ly9sb2dpbi50
+ZXN0Lml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+ei9tRZlLCAzaxM1+Qr7QsKxX5KV4uPlnFZMV+sUs2c6gNjExyJMbXdWy92Z+BQhT
+y8msGro25wSomHEHY+Oy34e9W8fe2481M7xCdQoitGJfZREBpUN42pGFEzCPPK2A
+HSAMrh+izTL/crSbQX1KRlyXy2n75w4v4IRRkR8Q5/uL40OvXqHD//vqn5OLxZyq
+XnE9+OuzX+tzqyUsSxnbuiZeIO4RvtES8Z8jV+R8zbsqAJntBCREjX8IjMMrjOqV
+Q2rShyR2/rmM4FdYDvTeT2CS/mtLvHjcqhrnnyooFS8Cn6wKY1gYzWkXJ02wRbO3
+tx6vZWS6c4lQgs+Q2zdb5Q==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDETCCAfmgAwIBAgIJANDfvhcg8Z1SMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTExNDU0NVoXDTM2MDkx
+NjExNDU0NVowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5saXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr8zqZ+v3IFDjCC6UsASzdm6yTVaEs
+eTTs6U85e+Tfc2zoTOn8mxB8qRgcazmiZhYUfxg2engHsu/KsJ+xvf08pPvTH/5H
+d4DU+TOpevKLmJYH16A+1xXnJi9B5H28QEHNIUCR49+azgWrLy+Hwd5h+R6GL9Wr
++0wlGmC0iZfEPhaKqVKXxyPq3EoMKtIPgiFBUeXdIwEWnJQZSwOq8//rgNA4ShEn
+eTzwxf84rfVo8ztLV7CU/t69NNcv4b8BAILE9nvw465hlmkiqsxsUbQk/U6k3kiw
++VkfEiRJZqhz9sNv2x2b7m5aXLBH9h6mwjRwHwuYV2U9NU+jk6DVkgcJAgMBAAGj
+UDBOMB0GA1UdDgQWBBSELqFg/9+/XeobX9F2GTuWzkZ/5DAfBgNVHSMEGDAWgBSE
+LqFg/9+/XeobX9F2GTuWzkZ/5DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+A4IBAQByp838nFRFS+BehmwUUZSWdbHo6BcXcuKMCL2ADnWjKV1FMjvLlbzyyFl8
+bbTEEdUGpi5kyouJbMZyObr0BXvX3CZvoANdAJoN01z+35U4DoXGwevF5AjFt8m6
+4eYKGoL7fm6cbXR/EBpW7IDZUPl5S52ChnCVl6LPLAkaDFFmCG9vfYzb9p/Ay0Ia
+yqxIdplRaHbyykcA2vw7QclI5VoYwBEKwKig/5SFAXfs74QkOtMTkIpGBv/ECH5F
+f91hP1hqE59m9aIhTEHrmZMFmFgerXAsewRCSFs70Sucttv9IiTRxrj9JYMWBK4N
+UpYE3HavN9JHts63XvKCEfiptKe/
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAPJvGGG3PRGpj8/9g2ripJeFnDqqMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTEw
+MjEzNFoXDTM2MDkyMTEwMjEzNFowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5s
+aXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKiUPLthUZ7I8G
+hHO/Ekt0hyYAGFrWVbWTYmV3Y3T2G73LpqtznEWnRXuwXVExBtbstZ5ZFsWol7ac
+szaGimSaU/aANsDalFhQVuM3xYhCbQbkDq/3A1SQchciJxyR02gfRYVXLns9xLKc
+ZWVVJkeKeviyI3d4oX+GRYWb4Z6uG3NMuQ2Q2YNfqBkS6/9sj1vtliu1KiUOBYGS
+D5wIDlrJD8bcErWPOpWgS5F8d3LAb+OnwzpfSCP0s/ReA2OTDjQ5sDQPTHD8Ay/p
+u7WmTqlCSc2P/1q3CrYhNx8MlT56riXuJcYHpGlVj9W7BI84LrCjIDp4NCygPar1
+cEuers5fAgMBAAGjbzBtMB0GA1UdDgQWBBRI5PH2qRvZtOGRCGag0ZSNN+9HRjBM
+BgNVHREERTBDghRsb2dpbi50ZXN0Lml0LmxpdS5zZYYraHR0cHM6Ly9sb2dpbi50
+ZXN0Lml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+ZHEv2vWK9Hbht44bXodv/QeMk8UbR7H2QL83gQLGB4UI8ZyWLgQ6SMydn3XTZN3a
+r5Gt0B1cXpZT6cbVD5OghdydR8XDndbCrf2McXi+xmPqt9CigbBj49jvVk/iSX1q
+4gKdCyp/oMNYi67alCHQoDhTg1rPBEwBSoYs33y/Qn4nq02eOO5M77SdrwxC2XwG
+WHS0O+aCDB6cUmqu3vihoNCSQd6XhhWziXf3ZX0NBUOgHAqP+1DHv5d/9co/0rWA
+YuL6+TdT8Df+TZZZsCcCqEXauHzNFYBVP9iu3ZCLRbtIimTeYtKA1DwIcKewBZBv
++9LTW/kA/AILP1MSXxyCKg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.test.it.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.test.it.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="sv">LiU</OrganizationName>
+    <OrganizationName xml:lang="en">LiU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet (TEST)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Linköping University (TEST)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://liu.se</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://liu.se/en</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Linköping University</Company>
+    <SurName>LiU-IT SAML admins</SurName>
+    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Linköping University</Company>
+    <SurName>LiU-IT SAML admins</SurName>
+    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Linköping University</Company>
+    <SurName>LiU-IT SAML admins</SurName>
+    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/play.chalmers.se.xml b/swamid-2.0/play.chalmers.se.xml
new file mode 100644
index 00000000..c56ca454
--- /dev/null
+++ b/swamid-2.0/play.chalmers.se.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://play.chalmers.se">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Chalmers Tekniska Högskolas Play tjänst</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Chalmers University of Technology's Play service</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Chalmers Tekniska Högskolas Play tjänst</mdui:Description>
+        <mdui:Description xml:lang="en">This is Chalmers University of Technology’s streaming service</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIJAJcfrITADDmvMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazERMA8GA1UEBxMITmV3IFlvcmsxEDAOBgNVBAoTB0thbHR1cmExGTAXBgNVBAMTEHBsYXkuY2hhbG1lcnMuc2UwHhcNMTcwMzA4MTIyMjQ5WhcNMjcwMzA4MTIyMjQ5WjBgMQswCQYDVQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRAwDgYDVQQKEwdLYWx0dXJhMRkwFwYDVQQDExBwbGF5LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv60o0thHM1HlLkORVd84BBp+O6pGlfbbBihToc/VkWrI7hD9ZAWCeAofsAhXQgWyfcPD/B00qunNOZ27WNcWIO7v2rRqxw15ysJeobiVJfSKvQz0fWNCuaWHQBw12SxsbY0hxHYOSAq1EkI2c1tiikWlcw8yEBvcLfOA4kGiZk7XxeCs29sDC78ZwNDD7Gvbe5rxSI001Q8DLL286+YoH7ZsVdXZtuxyiysduonVpbztdlbclrNdSLkmcdk3oE+a7L6Q7L5FMRkCpevq7mG1U9D98aKutyO12bGied5CffTNll//CpIZ7Q9HQK33vETDmIJUFaYPC2jNWNMWkccaPQIDAQABo4HFMIHCMB0GA1UdDgQWBBRivsK/ylKwp/Wglce7twJpjnH7GzCBkgYDVR0jBIGKMIGHgBRivsK/ylKwp/Wglce7twJpjnH7G6FkpGIwYDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEQMA4GA1UEChMHS2FsdHVyYTEZMBcGA1UEAxMQcGxheS5jaGFsbWVycy5zZYIJAJcfrITADDmvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAK9llJZsfKU6tjtHKVxlX8aaZCeICl8IHsdpi3hJDpLSgr3vIj+ZEABnCpKvcPVbX/A2lvC1EtbV4o3uNyp3A6V//YubIFqt9UPdogw6/MNFpWmHMRDBaMZVOyT4X2VikPFlJ5Ucfr+O7Sjag/mCq61Sjd5XkvZlGMRPL4Cg6Ea6VlnncW6Rpaj9QX/gMxIQ9NCttZ06RwIjj5eZAaiGRQazhd0GLhGNQRz9jnvRNbOJ7jGSx300QEk6p+mHP09mUnx5YOzJCE9nMByXhl4Ab9nTqvf4mCi+r6J/uodGyyovzdgCDX+4mHsGaBcy3IopnPBcItOQeBc1E8xkVIE29nk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIJAJcfrITADDmvMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazERMA8GA1UEBxMITmV3IFlvcmsxEDAOBgNVBAoTB0thbHR1cmExGTAXBgNVBAMTEHBsYXkuY2hhbG1lcnMuc2UwHhcNMTcwMzA4MTIyMjQ5WhcNMjcwMzA4MTIyMjQ5WjBgMQswCQYDVQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRAwDgYDVQQKEwdLYWx0dXJhMRkwFwYDVQQDExBwbGF5LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv60o0thHM1HlLkORVd84BBp+O6pGlfbbBihToc/VkWrI7hD9ZAWCeAofsAhXQgWyfcPD/B00qunNOZ27WNcWIO7v2rRqxw15ysJeobiVJfSKvQz0fWNCuaWHQBw12SxsbY0hxHYOSAq1EkI2c1tiikWlcw8yEBvcLfOA4kGiZk7XxeCs29sDC78ZwNDD7Gvbe5rxSI001Q8DLL286+YoH7ZsVdXZtuxyiysduonVpbztdlbclrNdSLkmcdk3oE+a7L6Q7L5FMRkCpevq7mG1U9D98aKutyO12bGied5CffTNll//CpIZ7Q9HQK33vETDmIJUFaYPC2jNWNMWkccaPQIDAQABo4HFMIHCMB0GA1UdDgQWBBRivsK/ylKwp/Wglce7twJpjnH7GzCBkgYDVR0jBIGKMIGHgBRivsK/ylKwp/Wglce7twJpjnH7G6FkpGIwYDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEQMA4GA1UEChMHS2FsdHVyYTEZMBcGA1UEAxMQcGxheS5jaGFsbWVycy5zZYIJAJcfrITADDmvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAK9llJZsfKU6tjtHKVxlX8aaZCeICl8IHsdpi3hJDpLSgr3vIj+ZEABnCpKvcPVbX/A2lvC1EtbV4o3uNyp3A6V//YubIFqt9UPdogw6/MNFpWmHMRDBaMZVOyT4X2VikPFlJ5Ucfr+O7Sjag/mCq61Sjd5XkvZlGMRPL4Cg6Ea6VlnncW6Rpaj9QX/gMxIQ9NCttZ06RwIjj5eZAaiGRQazhd0GLhGNQRz9jnvRNbOJ7jGSx300QEk6p+mHP09mUnx5YOzJCE9nMByXhl4Ab9nTqvf4mCi+r6J/uodGyyovzdgCDX+4mHsGaBcy3IopnPBcItOQeBc1E8xkVIE29nk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.chalmers.se/user/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.chalmers.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Chalmers (PROD)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Chalmers (PROD)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.chalmers.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/play.rkh.se.xml b/swamid-2.0/play.rkh.se.xml
new file mode 100644
index 00000000..afd9dc51
--- /dev/null
+++ b/swamid-2.0/play.rkh.se.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://play.rkh.se">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Röda Korsets Högskola Play service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Röda Korsets Högskola Play tjänst</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Röda Korsets Högskola streaming service.</mdui:Description>
+        <mdui:Description xml:lang="sv">Röda Korsets Högskola play tjänst</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEHTCCAwWgAwIBAgIJAKMLtmHYqmdaMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRUwEwYDVQQHDAxGbGVtaW5nc2JlcmcxJDAiBgNVBAoMG1LDg8K2ZGEgS29yc2V0cyBIw4PCtmdza29sYTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3BsYXkucmtoLnNlMSEwHwYJKoZIhvcNAQkBFhJzZXJ2aWNlZGVza0Bya2guc2UwHhcNMTcwMzA5MDcxODI1WhcNMjcwMzA5MDcxODI1WjCBpDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTEVMBMGA1UEBwwMRmxlbWluZ3NiZXJnMSQwIgYDVQQKDBtSw4PCtmRhIEtvcnNldHMgSMODwrZnc2tvbGExCzAJBgNVBAsMAklUMRQwEgYDVQQDDAtwbGF5LnJraC5zZTEhMB8GCSqGSIb3DQEJARYSc2VydmljZWRlc2tAcmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqJwUFYl3fVy7u3gB5uEjlEfjVlXFtMr2t9AuNfuNrIfDjl6Qhnsnot2InWF/0VL0YS/pV69ApMGQB5A/7QhawGHCN5YB9RNPjaCNzHK9xhXwp/sE2lI5deqdqCZkxLxjJNZ19avD9FO1K4N7Oz0MiM8HCW6t7JSSqAcbpjg35SgAyUiNtyQQ6sJ7aWaJMU65ZFsGdukmy7QrnYmUJtCRj5CRsywkZKzJkESRuVMfFHx+/Hal+rPoL6FOqdDpLw6lmkhSjslmrXHtkuKhovvpMCB/P0vvokXEvLx+pt1Zp7kEFK2XeOfl/oi7uRoC69yeV1U2eTF6DmUbPFziQG1oGwIDAQABo1AwTjAdBgNVHQ4EFgQUeSJs7xIqIYEDInWcuBrzOXrt9iwwHwYDVR0jBBgwFoAUeSJs7xIqIYEDInWcuBrzOXrt9iwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAoUO4js/oP4jNDMjoOdrfwSDdt/gTBMntseP8UeQMQ1fUuPwZ5F8Np2YMfxXNlJ77n3IoRAODO6JNiDwVSSwX9K09QJbYEzzUKG4b9p9GAR+XglFrX1o1dD9WZcjYrc722hkKNXgqWgIJ9rfbkrlj7RbfaSx5coLw9ht30XjWCBGVoADH7FUerzYDtCm7Mjas31B3iiR/zPAl4tP8S9Ahm5qBPEyF3o6swvnrVNYF0YNZ6lYWtm6T3WxzkuTRVoRKLsMRWSqvx+eLtnegW55I3wHU8p0IRlwn4YmCwpm1MFggHIdTJTpHDeVIcvvn8JwTIaCt/2o1n0MbBGIA1o0OpA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEHTCCAwWgAwIBAgIJAKMLtmHYqmdaMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRUwEwYDVQQHDAxGbGVtaW5nc2JlcmcxJDAiBgNVBAoMG1LDg8K2ZGEgS29yc2V0cyBIw4PCtmdza29sYTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3BsYXkucmtoLnNlMSEwHwYJKoZIhvcNAQkBFhJzZXJ2aWNlZGVza0Bya2guc2UwHhcNMTcwMzA5MDcxODI1WhcNMjcwMzA5MDcxODI1WjCBpDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTEVMBMGA1UEBwwMRmxlbWluZ3NiZXJnMSQwIgYDVQQKDBtSw4PCtmRhIEtvcnNldHMgSMODwrZnc2tvbGExCzAJBgNVBAsMAklUMRQwEgYDVQQDDAtwbGF5LnJraC5zZTEhMB8GCSqGSIb3DQEJARYSc2VydmljZWRlc2tAcmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqJwUFYl3fVy7u3gB5uEjlEfjVlXFtMr2t9AuNfuNrIfDjl6Qhnsnot2InWF/0VL0YS/pV69ApMGQB5A/7QhawGHCN5YB9RNPjaCNzHK9xhXwp/sE2lI5deqdqCZkxLxjJNZ19avD9FO1K4N7Oz0MiM8HCW6t7JSSqAcbpjg35SgAyUiNtyQQ6sJ7aWaJMU65ZFsGdukmy7QrnYmUJtCRj5CRsywkZKzJkESRuVMfFHx+/Hal+rPoL6FOqdDpLw6lmkhSjslmrXHtkuKhovvpMCB/P0vvokXEvLx+pt1Zp7kEFK2XeOfl/oi7uRoC69yeV1U2eTF6DmUbPFziQG1oGwIDAQABo1AwTjAdBgNVHQ4EFgQUeSJs7xIqIYEDInWcuBrzOXrt9iwwHwYDVR0jBBgwFoAUeSJs7xIqIYEDInWcuBrzOXrt9iwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAoUO4js/oP4jNDMjoOdrfwSDdt/gTBMntseP8UeQMQ1fUuPwZ5F8Np2YMfxXNlJ77n3IoRAODO6JNiDwVSSwX9K09QJbYEzzUKG4b9p9GAR+XglFrX1o1dD9WZcjYrc722hkKNXgqWgIJ9rfbkrlj7RbfaSx5coLw9ht30XjWCBGVoADH7FUerzYDtCm7Mjas31B3iiR/zPAl4tP8S9Ahm5qBPEyF3o6swvnrVNYF0YNZ6lYWtm6T3WxzkuTRVoRKLsMRWSqvx+eLtnegW55I3wHU8p0IRlwn4YmCwpm1MFggHIdTJTpHDeVIcvvn8JwTIaCt/2o1n0MbBGIA1o0OpA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.rkh.se/user/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.rkh.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Röda Korsets Högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Röda Korsets Högskola</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.rkh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 1607d69e..1ee153da 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -621,4 +621,7 @@
   <xi:include href="swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml"/>
   <xi:include href="swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml"/>
+  <xi:include href="swamid-2.0/play.chalmers.se.xml"/>
+  <xi:include href="swamid-2.0/crowd.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/play.rkh.se.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index bca483b4..21630182 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -54,4 +54,5 @@
   <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rikards-idp.omv.lu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>