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

7 files changed, 135 insertions, 194 deletions

diff --git a/swamid-2.0/hkrplay.hkr.se.xml b/swamid-2.0/hkrplay.hkr.se.xml
index cee9f01f..37d105b0 100644
--- a/swamid-2.0/hkrplay.hkr.se.xml
+++ b/swamid-2.0/hkrplay.hkr.se.xml
@@ -18,7 +18,7 @@
         <mdui:Description xml:lang="en">This service is for presentation of videos from Kristianstad University.</mdui:Description>
         <mdui:Description xml:lang="sv">Denna tjänst används för presentationer av video från Högskolan Kristianstad.</mdui:Description>
         <mdui:Logo height="94" width="83">https://hkr.se/gui/i/logotype.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="94" width="83">https:hkr.se/gui/i/logotype.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="94" width="83">https://hkr.se/gui/i/logotype.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="94" width="83">https://hkr.se/gui/i/logotype.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
diff --git a/swamid-2.0/play.hkr.se.xml b/swamid-2.0/play.hkr.se.xml
index 59277b42..9f32c0f6 100644
--- a/swamid-2.0/play.hkr.se.xml
+++ b/swamid-2.0/play.hkr.se.xml
@@ -19,7 +19,7 @@
         <mdui:Description xml:lang="en">This service is for presentation of videos from Kristianstad University.</mdui:Description>
         <mdui:Description xml:lang="sv">Denna tjänst används för presentationer av video från Högskolan Kristianstad.</mdui:Description>
         <mdui:Logo height="94" width="83">https://hkr.se/gui/i/logotype.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="94" width="83">https:hkr.se/gui/i/logotype.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="94" width="83">https://hkr.se/gui/i/logotype.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="94" width="83">https://hkr.se/gui/i/logotype.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
diff --git a/swamid-2.0/rikards-idp.omv.lu.se-idp-shibboleth.xml b/swamid-2.0/rikards-idp.omv.lu.se-idp-shibboleth.xml
deleted file mode 100644
index 09ad6657..00000000
--- a/swamid-2.0/rikards-idp.omv.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rikards-idp.omv.lu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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">lu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Rikard Johansson rikards-idp.omv.lu.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enter a description of your IdP at rikards-idp.omv.lu.se</mdui:Description>
-        <mdui:Logo height="80" width="80">https://rikards-idp.omv.lu.se/Path/To/Logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUWYloYvOxnwHKotvFflK1Uwe3d3owDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVcmlrYXJkcy1pZHAub212Lmx1LnNlMB4XDTE2MTExNzA5
-MzgwNFoXDTM2MTExNzA5MzgwNFowIDEeMBwGA1UEAwwVcmlrYXJkcy1pZHAub212
-Lmx1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhtN81xdm39lu
-4IktGiS0RZoOdcH6bb4ZlJHiGdBSj1U1Y/98zYabJ39QOyJSogoPg86mfLR8nnkg
-GrY3Hu1eB4LJ2HCt0vrvEunw0/Bye/82xIYWD091lUAqQcljh45NKceGOMZ8idcA
-P67Gnjob4cDYrKLFHNWZHQcj+VaUEGYm2ZCc3ni8KmBO2eTF85soKP8BDOzxdu06
-GqHihlj9iqVyN7kvNOSbLhBA8zUqR0sfI6VIB2VM0X/nCtQK4aKTiZdRKL17hKSP
-PLCybpRmBtqP7WCqTY3H01Q5Q9bFglsXdxUDzIt7/kyvF3eMa422P8096IG/RMgl
-rdIfULRv2QIDAQABo3EwbzAdBgNVHQ4EFgQUbsiihFEJLHhiwIxSvL454i6bjc4w
-TgYDVR0RBEcwRYIVcmlrYXJkcy1pZHAub212Lmx1LnNlhixodHRwczovL3Jpa2Fy
-ZHMtaWRwLm9tdi5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAHRaKP9uHZEtJ3p5umAKq/b6iNXQm6dJuDWn677K2eWUr5cMPQ8yvCt2G4v5+
-BrQvZLItOSRwWTBdEthEo9XuPl7wkDqa8K1qe90z1VZrpnj2AaYwXLfVyHA4fSNg
-TYRYkjSbRhzFgC+r/2IBh/bEW3Nu28tVQXPFVjmb/1bjLgutf9XjcIR2XxrhryVh
-PkgaBjn8eshEiNyCF5g76pmho2jIFvY405jxqvbKfTJhIINYxtakuOzKykq4MvwO
-Vwotp85ehiSezLQOuNMBwpDkT08F4xBlsDRspm7TmNcV7c43u5bbc1q7rDzanfnd
-PgBG2a0EaqHNhZwPBNb+S9MJEw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUGkq6aLmngReHABBI7S0nCIWjDKswDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVcmlrYXJkcy1pZHAub212Lmx1LnNlMB4XDTE2MTExNzA5
-MzgwM1oXDTM2MTExNzA5MzgwM1owIDEeMBwGA1UEAwwVcmlrYXJkcy1pZHAub212
-Lmx1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjCm3MhdkX6pA
-go6B1diDBRYcY4iOTvmfSZKV0B0TD2KKM+QlWR/DLM0+e3hMFV8lBfRKQK0TMMaC
-UTVgNErAns48b4I5swU2OXcjXZa0ugjBq6ydfCHjmVeyS2e+/hvRYlrUapCSF+Js
-oK48E647zoUTPzhRp2P3mSXtcPxzMccz22BB5yS+PgsDjNmbJYsTsiml9RNOYa5K
-aC4Dldgh2xY2wSRNum9enZhMXoAnegzXCe8gusMOlLudXHFdH4NsIOeYMGsfblWo
-ip9u3YwXR1EN8/iUi1Olk/lhMmLdeP+4gc3j941++OOP5XD/S/j8pmA1yOiSnAMf
-JMJpxm1knwIDAQABo3EwbzAdBgNVHQ4EFgQU39I5Vx7+OGRZ/TWdDm5HDYvso1Qw
-TgYDVR0RBEcwRYIVcmlrYXJkcy1pZHAub212Lmx1LnNlhixodHRwczovL3Jpa2Fy
-ZHMtaWRwLm9tdi5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAL7+vWDY6aYNNVHl4McskpvyN3RbZFXPaAmqq5Nj+LyGc+nQT+nZvSPgW6FPM
-SlI5/IokIpsbwteaJHbaq4bdhYEcrcs4O7wsEfKqSgGX/8CRcE5/HbYvu6m2dZgp
-TiE5l74NgW1o2prXCsQ1Ann1FH7yD9o5tAYl2ptfMghBoK5qhOi33W9En2tmItLo
-LFfrNQWFOqTsKIJam8soaNbwHjSN7NEtv/Ei55UkPpOSedbEK2T72f3vP2h4dHrQ
-OcbKekM9uaU++VLIjhKYb8tJk+bz7Xg7xutH4FFiRVLmrhsC0M3MSALWoZGLjUHW
-vjcB2lVuz0zcRg36zSEqZ6Fx2g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVALd2Z0wMwPe8vjnT4f03UHABBgitMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXJpa2FyZHMtaWRwLm9tdi5sdS5zZTAeFw0xNjExMTcw
-OTM4MDRaFw0zNjExMTcwOTM4MDRaMCAxHjAcBgNVBAMMFXJpa2FyZHMtaWRwLm9t
-di5sdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI+AgbLAiHWa
-jJ3B4EM9s/buRhGO2c/DiUqqQZTrGLkCShMXjifB1TdzGY9w8QDPBg19txfH4fpJ
-62LHEqLz74RT4I38/moiwViK3Z76D3Uxmjja88+1jW7Vh6/+R+SwzGttsGYm+Qmx
-wEQcsz6hYNXCq3yKHARodOlrPczfxuV0zTG9pcMrKNpU2FLGNA8Z6CIDnPQDNpm6
-uT2uzAdsAayGoKSeVSZfs3A1erFOf1rmDa91VjXSmhWV8Y7Mh51os/vP8ed91H+B
-N8lPhxD4bCVGIB5H1LEgdUWaNSPNYY7UIjKZGSQVrei8l2DwG88ZMCAjS8QY8hyz
-BW7NwPDGwfcCAwEAAaNxMG8wHQYDVR0OBBYEFEHDfZoq8hd4FiFvoHZqVYCH7yk3
-ME4GA1UdEQRHMEWCFXJpa2FyZHMtaWRwLm9tdi5sdS5zZYYsaHR0cHM6Ly9yaWth
-cmRzLWlkcC5vbXYubHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBACg+bFQ0gm24AQKTLSBV5fRIL8ntuGEdIJt0pMfFfafWnT+7eTSrP+e2Bq91
-bT1sXoKHe8yFvQEWkPVjLvD5VLsWb4UwZSqu7+c1fyQ3IZbpgaA4Yp6MP9yWyjFb
-Z3yPjV/j3BajxPLxhUwW4dYCIAY/BWMPbDFcVIJgIarShj2sqUrTobYs7Dtcqu6I
-S4H/L8XeZPyjEwBQ6YRPseNeOMCRCFWjs4Cy/cEQ95GFhvFwI4cJl/A5cVd4oPl6
-V6T+niX3S1uuhRveG+6u/rz8moLBy+wYVE31+qsoE3ZkDWULEJg2pZxlaFKhA/FW
-1UcHa8rEtMxdtMXicv5R5dx3SHw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rikards-idp.omv.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rikards-idp.omv.lu.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://rikards-idp.omv.lu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rikards-idp.omv.lu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rikards-idp.omv.lu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUWYloYvOxnwHKotvFflK1Uwe3d3owDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVcmlrYXJkcy1pZHAub212Lmx1LnNlMB4XDTE2MTExNzA5
-MzgwNFoXDTM2MTExNzA5MzgwNFowIDEeMBwGA1UEAwwVcmlrYXJkcy1pZHAub212
-Lmx1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhtN81xdm39lu
-4IktGiS0RZoOdcH6bb4ZlJHiGdBSj1U1Y/98zYabJ39QOyJSogoPg86mfLR8nnkg
-GrY3Hu1eB4LJ2HCt0vrvEunw0/Bye/82xIYWD091lUAqQcljh45NKceGOMZ8idcA
-P67Gnjob4cDYrKLFHNWZHQcj+VaUEGYm2ZCc3ni8KmBO2eTF85soKP8BDOzxdu06
-GqHihlj9iqVyN7kvNOSbLhBA8zUqR0sfI6VIB2VM0X/nCtQK4aKTiZdRKL17hKSP
-PLCybpRmBtqP7WCqTY3H01Q5Q9bFglsXdxUDzIt7/kyvF3eMa422P8096IG/RMgl
-rdIfULRv2QIDAQABo3EwbzAdBgNVHQ4EFgQUbsiihFEJLHhiwIxSvL454i6bjc4w
-TgYDVR0RBEcwRYIVcmlrYXJkcy1pZHAub212Lmx1LnNlhixodHRwczovL3Jpa2Fy
-ZHMtaWRwLm9tdi5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAHRaKP9uHZEtJ3p5umAKq/b6iNXQm6dJuDWn677K2eWUr5cMPQ8yvCt2G4v5+
-BrQvZLItOSRwWTBdEthEo9XuPl7wkDqa8K1qe90z1VZrpnj2AaYwXLfVyHA4fSNg
-TYRYkjSbRhzFgC+r/2IBh/bEW3Nu28tVQXPFVjmb/1bjLgutf9XjcIR2XxrhryVh
-PkgaBjn8eshEiNyCF5g76pmho2jIFvY405jxqvbKfTJhIINYxtakuOzKykq4MvwO
-Vwotp85ehiSezLQOuNMBwpDkT08F4xBlsDRspm7TmNcV7c43u5bbc1q7rDzanfnd
-PgBG2a0EaqHNhZwPBNb+S9MJEw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUGkq6aLmngReHABBI7S0nCIWjDKswDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVcmlrYXJkcy1pZHAub212Lmx1LnNlMB4XDTE2MTExNzA5
-MzgwM1oXDTM2MTExNzA5MzgwM1owIDEeMBwGA1UEAwwVcmlrYXJkcy1pZHAub212
-Lmx1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjCm3MhdkX6pA
-go6B1diDBRYcY4iOTvmfSZKV0B0TD2KKM+QlWR/DLM0+e3hMFV8lBfRKQK0TMMaC
-UTVgNErAns48b4I5swU2OXcjXZa0ugjBq6ydfCHjmVeyS2e+/hvRYlrUapCSF+Js
-oK48E647zoUTPzhRp2P3mSXtcPxzMccz22BB5yS+PgsDjNmbJYsTsiml9RNOYa5K
-aC4Dldgh2xY2wSRNum9enZhMXoAnegzXCe8gusMOlLudXHFdH4NsIOeYMGsfblWo
-ip9u3YwXR1EN8/iUi1Olk/lhMmLdeP+4gc3j941++OOP5XD/S/j8pmA1yOiSnAMf
-JMJpxm1knwIDAQABo3EwbzAdBgNVHQ4EFgQU39I5Vx7+OGRZ/TWdDm5HDYvso1Qw
-TgYDVR0RBEcwRYIVcmlrYXJkcy1pZHAub212Lmx1LnNlhixodHRwczovL3Jpa2Fy
-ZHMtaWRwLm9tdi5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAL7+vWDY6aYNNVHl4McskpvyN3RbZFXPaAmqq5Nj+LyGc+nQT+nZvSPgW6FPM
-SlI5/IokIpsbwteaJHbaq4bdhYEcrcs4O7wsEfKqSgGX/8CRcE5/HbYvu6m2dZgp
-TiE5l74NgW1o2prXCsQ1Ann1FH7yD9o5tAYl2ptfMghBoK5qhOi33W9En2tmItLo
-LFfrNQWFOqTsKIJam8soaNbwHjSN7NEtv/Ei55UkPpOSedbEK2T72f3vP2h4dHrQ
-OcbKekM9uaU++VLIjhKYb8tJk+bz7Xg7xutH4FFiRVLmrhsC0M3MSALWoZGLjUHW
-vjcB2lVuz0zcRg36zSEqZ6Fx2g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVALd2Z0wMwPe8vjnT4f03UHABBgitMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXJpa2FyZHMtaWRwLm9tdi5sdS5zZTAeFw0xNjExMTcw
-OTM4MDRaFw0zNjExMTcwOTM4MDRaMCAxHjAcBgNVBAMMFXJpa2FyZHMtaWRwLm9t
-di5sdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI+AgbLAiHWa
-jJ3B4EM9s/buRhGO2c/DiUqqQZTrGLkCShMXjifB1TdzGY9w8QDPBg19txfH4fpJ
-62LHEqLz74RT4I38/moiwViK3Z76D3Uxmjja88+1jW7Vh6/+R+SwzGttsGYm+Qmx
-wEQcsz6hYNXCq3yKHARodOlrPczfxuV0zTG9pcMrKNpU2FLGNA8Z6CIDnPQDNpm6
-uT2uzAdsAayGoKSeVSZfs3A1erFOf1rmDa91VjXSmhWV8Y7Mh51os/vP8ed91H+B
-N8lPhxD4bCVGIB5H1LEgdUWaNSPNYY7UIjKZGSQVrei8l2DwG88ZMCAjS8QY8hyz
-BW7NwPDGwfcCAwEAAaNxMG8wHQYDVR0OBBYEFEHDfZoq8hd4FiFvoHZqVYCH7yk3
-ME4GA1UdEQRHMEWCFXJpa2FyZHMtaWRwLm9tdi5sdS5zZYYsaHR0cHM6Ly9yaWth
-cmRzLWlkcC5vbXYubHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBACg+bFQ0gm24AQKTLSBV5fRIL8ntuGEdIJt0pMfFfafWnT+7eTSrP+e2Bq91
-bT1sXoKHe8yFvQEWkPVjLvD5VLsWb4UwZSqu7+c1fyQ3IZbpgaA4Yp6MP9yWyjFb
-Z3yPjV/j3BajxPLxhUwW4dYCIAY/BWMPbDFcVIJgIarShj2sqUrTobYs7Dtcqu6I
-S4H/L8XeZPyjEwBQ6YRPseNeOMCRCFWjs4Cy/cEQ95GFhvFwI4cJl/A5cVd4oPl6
-V6T+niX3S1uuhRveG+6u/rz8moLBy+wYVE31+qsoE3ZkDWULEJg2pZxlaFKhA/FW
-1UcHa8rEtMxdtMXicv5R5dx3SHw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rikards-idp.omv.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rikards-idp.omv.lu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test0.release-check.swamid.se-shibboleth.xml b/swamid-2.0/test0.release-check.swamid.se-shibboleth.xml
new file mode 100644
index 00000000..2e580f69
--- /dev/null
+++ b/swamid-2.0/test0.release-check.swamid.se-shibboleth.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test0.release-check.swamid.se/shibboleth">
+  <!-- Test with SP without any EC -->
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://test0.release-check.swamid.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://test0.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - EC verification</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - EC verification</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/Privacy+Policy+for+the+SWAMID+Identity+Provider+Test+Suite</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/Privacy+Policy+for+the+SWAMID+Identity+Provider+Test+Suite</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
+          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
+MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
+9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
+/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
+Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
+2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
+qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
+95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
+fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
++z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
+X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
+OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
+AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
+fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
+l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
+6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
+l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
+lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
+Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
+LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
+KK/Bciw51EZ7Ew==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
+          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
+MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
+9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
+iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
+TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
+yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
+aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
+nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
+wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
+GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
+fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
+OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
+AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
+/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
+8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
+PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
+RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
+CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
+b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
+2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
+rtSd5rXgy930PQ==
+</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://test0.release-check.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test0.release-check.swamid.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test0.release-check.swamid.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test0.release-check.swamid.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test0.release-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test0.release-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test0.release-check.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test0.release-check.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SWAMID</md:Company>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml b/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml
index 0d016ed3..c06297cd 100644
--- a/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml
@@ -28,8 +28,8 @@
         <mdui:Description xml:lang="en">Test identity Provider for employees and students at Lund University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.lu.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.lunduniversity.lu.se/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="78" width="450">https://testidpv3.lu.se/idp/images/LU_swe_logo_450px.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="78" width="382">https://testidpv3.lu.se/idp/images/LU_eng_logo_382px.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="80" width="95">https://www.medarbetarwebben.lu.se/profiles/factory/themes/lu_theme/img/logos/logo-square.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="80" width="95">https://www.staff.lu.se/profiles/factory/themes/lu_theme/img/logos/logo-square-en.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
         <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 39a6e806..94dec31e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -643,6 +643,7 @@
   <xi:include href="swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kb-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/test0.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test1.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test2.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test3.release-check.swamid.se-shibboleth.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 74fca7fc..deb25ec9 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -43,7 +43,6 @@
   <xi:include href="swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/testswamid.vr.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"/>
   <xi:include href="swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml"/>