Remove ifmsa test IdP, big mistake. Make tidy SWAMIDOPS-12490

4 files changed, 193 insertions, 223 deletions

diff --git a/swamid-2.0/sso.ifmsa.se-login-saml2-idp-metadata.php.xml b/swamid-2.0/sso.ifmsa.se-login-saml2-idp-metadata.php.xml
deleted file mode 100644
index 5ac3157f..00000000
--- a/swamid-2.0/sso.ifmsa.se-login-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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://sso.ifmsa.se/login/saml2/idp/metadata.php">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAKcEVGR1HMdpMA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDHNzby5pZm1zYS5zZTEdMBsGCSqGSIb3DQEJARYOYWRtaW5AaWZtc2Euc2UwHhcNMTcwNTAzMjIyNTIyWhcNMjcwNTAzMjIyNTIyWjCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRUwEwYDVQQKDAxJRk1TQS1Td2VkZW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxzc28uaWZtc2Euc2UxHTAbBgkqhkiG9w0BCQEWDmFkbWluQGlmbXNhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw35QCfj3CbZjt7raQbKEVRwf9tWAzeyoPMLNZaRa3cPS0T5+5FRnOn7zjRy9GlGLxcD3PpzmibI7V6WBf1ZvZVZTez9lS790mrrSL+B2YdCZNH/y/+yGoiqZGNs6xKXsqk8K9OisnhLL8FGZQjVv4WO7KAmkY3VsbNDwUn/ouKyW4AzmZEGMqvPcJ+6dDQ+uyHqMhsglNYqFpZEA5JrRDntYr5wL7wQNDZKaudDhDUzX4heMGUzC4F2vpIX9vGtWUVNm83Yg2E91tJMN94hoL749xNRhPJ1BexK35OKwmz/Y/1z+H19GSLKT23Xcn6E9EXhoad8D8YyeTzH2TIbbAQIDAQABo1AwTjAdBgNVHQ4EFgQUlnGgbMY/gpR+pPIyZIWv5287d/0wHwYDVR0jBBgwFoAUlnGgbMY/gpR+pPIyZIWv5287d/0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAjRovrWI9/FrYJNcLk9TEnHrg9OkvnBK8zq4aS7uSUJqrIryqCwuMSNyo/JIdMd9kG7UCzW5cYououtpHrRKi+rIJUIjAn9irMa0LGfFn9/2HvyRHIU/sjZ0yWd1JFI5cA/hmDX0GMAIlLDD9VP0la90qfUseV3MnoQMpaw/nM5tXCxyHtgDV5FRW0liCaMUTONn0b1pyapwx1ymWnXKHkK4PjRMmRchW1T2doh8qRjsIBGTiBqSJ4IDzdgYWu+lbZs0JQDpJLFoRntR5dp0ggI8TiSv32OmlaOhzyv08aX8SRUC5kCDxpWl2c7OUT/JODRlRDTRrsWQSNIijBz+wOQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAKcEVGR1HMdpMA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDHNzby5pZm1zYS5zZTEdMBsGCSqGSIb3DQEJARYOYWRtaW5AaWZtc2Euc2UwHhcNMTcwNTAzMjIyNTIyWhcNMjcwNTAzMjIyNTIyWjCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRUwEwYDVQQKDAxJRk1TQS1Td2VkZW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxzc28uaWZtc2Euc2UxHTAbBgkqhkiG9w0BCQEWDmFkbWluQGlmbXNhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw35QCfj3CbZjt7raQbKEVRwf9tWAzeyoPMLNZaRa3cPS0T5+5FRnOn7zjRy9GlGLxcD3PpzmibI7V6WBf1ZvZVZTez9lS790mrrSL+B2YdCZNH/y/+yGoiqZGNs6xKXsqk8K9OisnhLL8FGZQjVv4WO7KAmkY3VsbNDwUn/ouKyW4AzmZEGMqvPcJ+6dDQ+uyHqMhsglNYqFpZEA5JrRDntYr5wL7wQNDZKaudDhDUzX4heMGUzC4F2vpIX9vGtWUVNm83Yg2E91tJMN94hoL749xNRhPJ1BexK35OKwmz/Y/1z+H19GSLKT23Xcn6E9EXhoad8D8YyeTzH2TIbbAQIDAQABo1AwTjAdBgNVHQ4EFgQUlnGgbMY/gpR+pPIyZIWv5287d/0wHwYDVR0jBBgwFoAUlnGgbMY/gpR+pPIyZIWv5287d/0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAjRovrWI9/FrYJNcLk9TEnHrg9OkvnBK8zq4aS7uSUJqrIryqCwuMSNyo/JIdMd9kG7UCzW5cYououtpHrRKi+rIJUIjAn9irMa0LGfFn9/2HvyRHIU/sjZ0yWd1JFI5cA/hmDX0GMAIlLDD9VP0la90qfUseV3MnoQMpaw/nM5tXCxyHtgDV5FRW0liCaMUTONn0b1pyapwx1ymWnXKHkK4PjRMmRchW1T2doh8qRjsIBGTiBqSJ4IDzdgYWu+lbZs0JQDpJLFoRntR5dp0ggI8TiSv32OmlaOhzyv08aX8SRUC5kCDxpWl2c7OUT/JODRlRDTRrsWQSNIijBz+wOQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ifmsa.se/login/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ifmsa.se/login/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Admin</md:GivenName>
-    <md:SurName>IFMSA-Sweden</md:SurName>
-    <md:EmailAddress>admin@ifmsa.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
index e424c16c..de3a3d9a 100644
--- a/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
@@ -1,98 +1,97 @@
-<?xml version="1.0"?>

-<!--

-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" ID="_6ad03a13e8e3d2745822c20e4e3b8eafe3f36ad8" entityID="https://student.verifiering3.ladok.se/student-sp">

-  <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/hei-service</samla:AttributeValue>

-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>

-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://student.verifiering3.ladok.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://student.verifiering3.ladok.se/Shibboleth.sso/Login" index="1"/>

-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">

-        <mdui:DisplayName xml:lang="sv">Ladok student.verifiering3.ladok.se</mdui:DisplayName>

-        <mdui:DisplayName xml:lang="en">Ladok student.verifiering3.ladok.se</mdui:DisplayName>

-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>

-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>

-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>

-        <mdui:Logo height="64" width="64">https://student.verifiering3.ladok.se/branded/HSK/logo.png</mdui:Logo>

-      </mdui:UIInfo>

-    </md:Extensions>

-    <md:KeyDescriptor>

-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">

-        <ds:KeyName>https://student.verifiering3.ladok.se/student-sp</ds:KeyName>

-        <ds:KeyName>student.verifiering3.ladok.se</ds:KeyName>

-        <ds:X509Data>

-          <ds:X509SubjectName>CN=student.verifiering3.ladok.se</ds:X509SubjectName>

-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANsnL5BGPQW4MA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV

-BAMTHXN0dWRlbnQudmVyaWZpZXJpbmczLmxhZG9rLnNlMB4XDTE3MDUwNTA5MjAx

-OFoXDTI3MDUwMzA5MjAxOFowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmlu

-ZzMubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3QvP/

-gv/vw2kldqa3rvfHn3wrhsaw2XU6x6E1UahoyCDxbfa9rCcVwDMdZA0tXEvAZwlL

-oZ9BhtfpeUTtpDkYbJ+KLERt0AoZWMY6VbS/O14zuUOdsK8lVgnSbdZC4HKUvaZ9

-M7QVGpvvus42V6NHIozAlSjgoq4l4fGQ8tMGYce/vUX39OoQQbQM+CYI0nEeZQl9

-BLZfQ4gZri2sZJqe6XtDgosafXskBwasEF+EIxaQG0uyk8P1fwOvG6yomt5x72Zj

-EON2e/cVVauZE4sq7C6CAATyBYfr3SiMKwPNfWf4QqGZy+vVeCZ632DlIDlgdTAm

-/mKNneMO6AJrfmIjAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZp

-ZXJpbmczLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmczLmxh

-ZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFIunHXlNt0Hh7u+B/w1BPJMzendI

-MA0GCSqGSIb3DQEBCwUAA4IBAQBnwH0RHk66u5RTBPB90tZy56igXplUZQiZ45Xs

-1pdFHkaKlhldssDXSZa64TfJIaaXLt/Kf0d4CE1jxSi6y76L+PaeXvCHB/Uu5Xge

-IDYjHDWDVMNOU3smyECzVBUq703kdQ/YsXHG4AsUs8Jms/ch81KCjFFWicdy6/j4

-KRRDKzw2Hm+brJ0fYd5qrkbtm883PDVSMzz2K2HeZKBAmnEfeHgdiQhhOMD/6eAA

-dilLZZdiV4S3BMqr/E74Fg3nLYdadL4QKxE9qFw+XQJTM5gB2PohTxOCL1DdOMNE

-fc7cHBpwT44JCllErveMtQyLVozNsl3kC0KrSnyn7z+gshrg

-</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://student.verifiering3.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/SOAP"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/Redirect"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/POST"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/Artifact"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/SOAP"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/Redirect"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/POST"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/Artifact"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>

-  </md:SPSSODescriptor>

-</md:EntityDescriptor>

-

+<?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://student.verifiering3.ladok.se/student-sp">
+  <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://student.verifiering3.ladok.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://student.verifiering3.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.verifiering3.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.verifiering3.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.verifiering3.ladok.se/branded/HSK/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.verifiering3.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.verifiering3.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.verifiering3.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANsnL5BGPQW4MA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+BAMTHXN0dWRlbnQudmVyaWZpZXJpbmczLmxhZG9rLnNlMB4XDTE3MDUwNTA5MjAx
+OFoXDTI3MDUwMzA5MjAxOFowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmlu
+ZzMubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3QvP/
+gv/vw2kldqa3rvfHn3wrhsaw2XU6x6E1UahoyCDxbfa9rCcVwDMdZA0tXEvAZwlL
+oZ9BhtfpeUTtpDkYbJ+KLERt0AoZWMY6VbS/O14zuUOdsK8lVgnSbdZC4HKUvaZ9
+M7QVGpvvus42V6NHIozAlSjgoq4l4fGQ8tMGYce/vUX39OoQQbQM+CYI0nEeZQl9
+BLZfQ4gZri2sZJqe6XtDgosafXskBwasEF+EIxaQG0uyk8P1fwOvG6yomt5x72Zj
+EON2e/cVVauZE4sq7C6CAATyBYfr3SiMKwPNfWf4QqGZy+vVeCZ632DlIDlgdTAm
+/mKNneMO6AJrfmIjAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZp
+ZXJpbmczLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmczLmxh
+ZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFIunHXlNt0Hh7u+B/w1BPJMzendI
+MA0GCSqGSIb3DQEBCwUAA4IBAQBnwH0RHk66u5RTBPB90tZy56igXplUZQiZ45Xs
+1pdFHkaKlhldssDXSZa64TfJIaaXLt/Kf0d4CE1jxSi6y76L+PaeXvCHB/Uu5Xge
+IDYjHDWDVMNOU3smyECzVBUq703kdQ/YsXHG4AsUs8Jms/ch81KCjFFWicdy6/j4
+KRRDKzw2Hm+brJ0fYd5qrkbtm883PDVSMzz2K2HeZKBAmnEfeHgdiQhhOMD/6eAA
+dilLZZdiV4S3BMqr/E74Fg3nLYdadL4QKxE9qFw+XQJTM5gB2PohTxOCL1DdOMNE
+fc7cHBpwT44JCllErveMtQyLVozNsl3kC0KrSnyn7z+gshrg
+</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://student.verifiering3.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
index 5d5e39cf..2488b190 100644
--- a/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
@@ -1,97 +1,96 @@
-<?xml version="1.0"?>

-<!--

-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" ID="_147d53cb88d097782f8a03bf32bf3b3cdd8619fb" entityID="https://www.verifiering3.ladok.se/gui-sp">

-  <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/hei-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://www.verifiering3.ladok.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://www.verifiering3.ladok.se/Shibboleth.sso/Login" index="1"/>

-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">

-        <mdui:DisplayName xml:lang="sv">Ladok www.verifiering3.ladok.se</mdui:DisplayName>

-        <mdui:DisplayName xml:lang="en">Ladok www.verifiering3.ladok.se</mdui:DisplayName>

-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>

-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>

-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>

-        <mdui:Logo height="64" width="64">https://www.verifiering3.ladok.se/branded/HSK/logo.png</mdui:Logo>

-      </mdui:UIInfo>

-    </md:Extensions>

-    <md:KeyDescriptor>

-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">

-        <ds:KeyName>https://www.verifiering3.ladok.se/gui-sp</ds:KeyName>

-        <ds:KeyName>www.verifiering3.ladok.se</ds:KeyName>

-        <ds:X509Data>

-          <ds:X509SubjectName>CN=www.verifiering3.ladok.se</ds:X509SubjectName>

-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJANgmwmOahKcoMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV

-BAMTGXd3dy52ZXJpZmllcmluZzMubGFkb2suc2UwHhcNMTcwNTA1MDkyMDA5WhcN

-MjcwNTAzMDkyMDA5WjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmczLmxhZG9r

-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoMkKJBKiVmiJ2em

-96OpucfAo/jgNJ/EDsbfw0R8xD93U1vs4EYE03vRSr3Qnoaxs4fgIJkQSvRXY7MO

-LsaSFJ99HZkMYsjSfFIqrhdK/HpfvnvzIUKaRbT6/dwdZEiL360X0JEpXn9N9ArV

-zpYFSzh/y++bs5vJG6M8gTE16dptsDeyvaKWHNPfDbMUk7HuTmm/dkP6uo4sNUbk

-PXKi8+sHhSmSSlX4CNsK2UxC+YudWaX2JUcKeON3RViIT7bskelv9Z3e1NY0QLD3

-ZESJnrZt6GnR/s4jmI6vouUL17qcECH4xPHWBH30GQso045R8FCJ2302L7eBLJOv

-pBy+6QIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmczLmxhZG9r

-LnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzMubGFkb2suc2UvZ3VpLXNwMB0G

-A1UdDgQWBBR+HpER+M2Mbg+nI1BT68eUuNcIbjANBgkqhkiG9w0BAQsFAAOCAQEA

-B63YL3Sq71Yw9D3Z9omKDWVhs7qzEhXk2qdGTQg+YDD6jKt/tuPHwzXnuxf6H79Z

-sR6mkZ/1eaeuZ8zfOiL7YJOLzV7peEUVrgolO6ys2jnfdTqhHs8a0qyCC0IiAvWD

-0xnhtwit0w5TZz0jrYb9mMe3jS50smpw7y6dEdTdGjW8qQYWKQEIH5Y4eqU0djF0

-jBdvGdDYtcuJOW2rb0rcnXwQN+ELGSgEkpQDD59BBQ9ymkiyqJfRkHZ7i0a8rfrD

-mG2qTD0tk+mAK0G+GIsFGLvoAI04kOu1X9oaMAbmcn/vwgiAZpAp7ybxVeiF+ma1

-XM/cnNAHoSS5B7k3xzLyaw==

-</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://www.verifiering3.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/SOAP"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/Redirect"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/POST"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/Artifact"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/SOAP"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/Redirect"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/POST"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/Artifact"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>

-  </md:SPSSODescriptor>

-</md:EntityDescriptor>

-

+<?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://www.verifiering3.ladok.se/gui-sp">
+  <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/hei-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://www.verifiering3.ladok.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://www.verifiering3.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.verifiering3.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.verifiering3.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.verifiering3.ladok.se/branded/HSK/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.verifiering3.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.verifiering3.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.verifiering3.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJANgmwmOahKcoMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGXd3dy52ZXJpZmllcmluZzMubGFkb2suc2UwHhcNMTcwNTA1MDkyMDA5WhcN
+MjcwNTAzMDkyMDA5WjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmczLmxhZG9r
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoMkKJBKiVmiJ2em
+96OpucfAo/jgNJ/EDsbfw0R8xD93U1vs4EYE03vRSr3Qnoaxs4fgIJkQSvRXY7MO
+LsaSFJ99HZkMYsjSfFIqrhdK/HpfvnvzIUKaRbT6/dwdZEiL360X0JEpXn9N9ArV
+zpYFSzh/y++bs5vJG6M8gTE16dptsDeyvaKWHNPfDbMUk7HuTmm/dkP6uo4sNUbk
+PXKi8+sHhSmSSlX4CNsK2UxC+YudWaX2JUcKeON3RViIT7bskelv9Z3e1NY0QLD3
+ZESJnrZt6GnR/s4jmI6vouUL17qcECH4xPHWBH30GQso045R8FCJ2302L7eBLJOv
+pBy+6QIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmczLmxhZG9r
+LnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzMubGFkb2suc2UvZ3VpLXNwMB0G
+A1UdDgQWBBR+HpER+M2Mbg+nI1BT68eUuNcIbjANBgkqhkiG9w0BAQsFAAOCAQEA
+B63YL3Sq71Yw9D3Z9omKDWVhs7qzEhXk2qdGTQg+YDD6jKt/tuPHwzXnuxf6H79Z
+sR6mkZ/1eaeuZ8zfOiL7YJOLzV7peEUVrgolO6ys2jnfdTqhHs8a0qyCC0IiAvWD
+0xnhtwit0w5TZz0jrYb9mMe3jS50smpw7y6dEdTdGjW8qQYWKQEIH5Y4eqU0djF0
+jBdvGdDYtcuJOW2rb0rcnXwQN+ELGSgEkpQDD59BBQ9ymkiyqJfRkHZ7i0a8rfrD
+mG2qTD0tk+mAK0G+GIsFGLvoAI04kOu1X9oaMAbmcn/vwgiAZpAp7ybxVeiF+ma1
+XM/cnNAHoSS5B7k3xzLyaw==
+</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://www.verifiering3.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 9c5f0588..843cf755 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -59,5 +59,4 @@
   <xi:include href="swamid-2.0/idp.test.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/sso.ifmsa.se-login-saml2-idp-metadata.php.xml"/>
 </EntitiesDescriptor>