SWAMID-3253: Ladok integrationstestmd-2023-10-30-v01

8 files changed, 99 insertions, 71 deletions

diff --git a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index 90be016e..1aa8fa9d 100644
--- a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -53,15 +53,6 @@
           <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMLiHS4a6f9OMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjQ2WhcNMzIwODE2MTMxNjQ2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzwX6vTkOZoSmumLJh9cKTPUPMCZK69k/e3S9A9Am2zmbKn0Wrtmz5fKdmnxCfRUITAa2mopyXu0z6aQbF4D/qpYg1ihD5rBfYAi0diNIa/evlSkLQYXX+NboTQuXoEd3vdTELC8b0ycp+7wh3Lj6ATYvEKpc7Vi5QlV8rdXOs9QpmUKmK4v7XBffUrYxMEcktk1mgJnCX5Nbdd2F4ln7mWRN0zoh1BYvq+prLvMMQPTJLFRhltDq1dTjLlw1haULY/ckr2sTGm5ookxADd94Wp2LKSwlRsIrx9wikJKpjFkqk7LO6L+pxEHNRIf4/dRqFj7IMeV5ZTKqJfiQS9YVqu7JTQuO5nUZb2krSrajZxOgmlgaOki9qFx4sdoPi8Rp6OkBXTQ4piJkzS8qvtwkE7ByoQ6koT3tineYNAbceZmniClya5z6J+oiESOQFg3cYQt8MRZS0EwXpAiHS9z0mfQG7dBczPP1RL/JCZA7ALRlmx/Ygk/tXdahLsHUBtHVb8w1W54Ab2pNgDol/XPpW1Zc4SgQhLcuWJaz7UI+DkV5yAsesT6C0/hhnqdKBTE2jvbKZpfW8o3Hb2E2q1FlgO3t4osfEHHQUqPqGUkAv17DVmuX+HfIVrqGXG8nVbwv9g9FYt2MQjjFzcaaCEJWPreUy7Wm4G8uJHHmx64pclcCAwEAAaNQME4wHQYDVR0OBBYEFDPf15zdA77UoC+hecrvpp879O0AMB8GA1UdIwQYMBaAFDPf15zdA77UoC+hecrvpp879O0AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGoCDhK02cEXdZEhe7Fv0A2wZ1xsrA+GTAMesA4dR9BOreLbHWsE57EWw1TQa7624JyJ3B28KG+pnC7N1LGWEAmUinYfd/9scjKCOHMUURhK5oM/VM8ILeA/B2+u8jEM4jikmSmztv2+CBDFV4LtFxd52BIimDwGRef504IjHfQ/6bQifOsjIWEWonzpLk4ds1UVQlRtiSx5npbeIRunAEQ5oVuLMix2vcyWaWD2qLjrHcy81/V/kbo4ke6LUN5Ijk3LHk0CFMghA8RpPRI0nsv3X/DSb8oHeLGvp6oFgqfiMkEZJK3kCqCMf7Iwda88ltqoLOGmLZ6D9wyX4Hc90PO0UBPuCuWxdhEe6tTO1c45Q/8UvPfoPmYU8VklQEtRwVGeBuXhr1rrPOtsQqKZ+fO8a3vv0mIEJi+IRtGuepZTceinZelc258NmapUTAiuUFVkXmvTPl+wa5hiUkO7zzC9154HpzoZ0vQ7jSczkT/HotT6ky1GJtNcStNKuzlvUG5i7DEZMjyAuaFbx/vy0hRahUefzaZqXeNl31+Vac7rekOHATmgkivaOppqFYEVroG7bwpridNUwrL5/kMYc2IvtmK9tDA7GOcsRFG5T4KO2RBy0t9YPuCoqobGqBgWE9MAqXsomGrinXsEPBlTKJb9PNcmqRueQjubkhx3BPmo</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:KeyDescriptor use="encryption">
       <ds:KeyInfo>
diff --git a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
index 065a026c..a6c7e11c 100644
--- a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
@@ -56,15 +56,6 @@
           <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMLiHS4a6f9OMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjQ2WhcNMzIwODE2MTMxNjQ2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzwX6vTkOZoSmumLJh9cKTPUPMCZK69k/e3S9A9Am2zmbKn0Wrtmz5fKdmnxCfRUITAa2mopyXu0z6aQbF4D/qpYg1ihD5rBfYAi0diNIa/evlSkLQYXX+NboTQuXoEd3vdTELC8b0ycp+7wh3Lj6ATYvEKpc7Vi5QlV8rdXOs9QpmUKmK4v7XBffUrYxMEcktk1mgJnCX5Nbdd2F4ln7mWRN0zoh1BYvq+prLvMMQPTJLFRhltDq1dTjLlw1haULY/ckr2sTGm5ookxADd94Wp2LKSwlRsIrx9wikJKpjFkqk7LO6L+pxEHNRIf4/dRqFj7IMeV5ZTKqJfiQS9YVqu7JTQuO5nUZb2krSrajZxOgmlgaOki9qFx4sdoPi8Rp6OkBXTQ4piJkzS8qvtwkE7ByoQ6koT3tineYNAbceZmniClya5z6J+oiESOQFg3cYQt8MRZS0EwXpAiHS9z0mfQG7dBczPP1RL/JCZA7ALRlmx/Ygk/tXdahLsHUBtHVb8w1W54Ab2pNgDol/XPpW1Zc4SgQhLcuWJaz7UI+DkV5yAsesT6C0/hhnqdKBTE2jvbKZpfW8o3Hb2E2q1FlgO3t4osfEHHQUqPqGUkAv17DVmuX+HfIVrqGXG8nVbwv9g9FYt2MQjjFzcaaCEJWPreUy7Wm4G8uJHHmx64pclcCAwEAAaNQME4wHQYDVR0OBBYEFDPf15zdA77UoC+hecrvpp879O0AMB8GA1UdIwQYMBaAFDPf15zdA77UoC+hecrvpp879O0AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGoCDhK02cEXdZEhe7Fv0A2wZ1xsrA+GTAMesA4dR9BOreLbHWsE57EWw1TQa7624JyJ3B28KG+pnC7N1LGWEAmUinYfd/9scjKCOHMUURhK5oM/VM8ILeA/B2+u8jEM4jikmSmztv2+CBDFV4LtFxd52BIimDwGRef504IjHfQ/6bQifOsjIWEWonzpLk4ds1UVQlRtiSx5npbeIRunAEQ5oVuLMix2vcyWaWD2qLjrHcy81/V/kbo4ke6LUN5Ijk3LHk0CFMghA8RpPRI0nsv3X/DSb8oHeLGvp6oFgqfiMkEZJK3kCqCMf7Iwda88ltqoLOGmLZ6D9wyX4Hc90PO0UBPuCuWxdhEe6tTO1c45Q/8UvPfoPmYU8VklQEtRwVGeBuXhr1rrPOtsQqKZ+fO8a3vv0mIEJi+IRtGuepZTceinZelc258NmapUTAiuUFVkXmvTPl+wa5hiUkO7zzC9154HpzoZ0vQ7jSczkT/HotT6ky1GJtNcStNKuzlvUG5i7DEZMjyAuaFbx/vy0hRahUefzaZqXeNl31+Vac7rekOHATmgkivaOppqFYEVroG7bwpridNUwrL5/kMYc2IvtmK9tDA7GOcsRFG5T4KO2RBy0t9YPuCoqobGqBgWE9MAqXsomGrinXsEPBlTKJb9PNcmqRueQjubkhx3BPmo</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:KeyDescriptor use="encryption">
       <ds:KeyInfo>
diff --git a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index bec41974..9b98611f 100644
--- a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -27,7 +27,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </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:SPSSODescriptor AuthnRequestsSigned="true" 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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
@@ -53,15 +53,6 @@
           <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMECDl0w1cg/MA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjUwWhcNMzIwODE2MTMxNjUwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwcl+Ekm2rS/oCjnkQXuTcgM0kjj2UFnzutUB2Gnz7vu4MG89XpXhbr7GPVaIi+VK7OcR5WQ73I+exqO9jFJb23qoIfGQBzdShxJdWCICeFuhr7jwsqjwwcX+UP9bR0yvCPoHebgphzi+oUXBNTNF7HoS862q6FhXAvYBvJapSLj8P/qXEMjps7BRZs8eCvTKsVWRd0BnWM1qFjSHfCvBqJvQzgQlgcJpf/Pn6pkqv3xJPokPGiFuQM0gPTrjJHA0GDMBLdTZLfHo8hx9ycNr6r/HQ1oMay+3yX9Chw6dQuxLlXirZTN19mwbmCymRZ84OCVFuAOa5y3CMimZdUEUv8AfS9Gfxs3t/VP7xcdufHGnjIpCd/cadn1wSGCOqmJ66UFtzQtRadMcpgVNHsz9Wy33CCqXBV1ApyQAyav++BUcjkfm+706ZL5tWpprYZGm1M4/0bcQpfXRySMZTRLXyAUHNgN1hefNUTgaZnaUrQJOkForUK+iiOO/R10gYK0r3cEHgLreDEJpN9jPiWRwox6NkEFVbvU6uHcM+qsbRKioZJ3pEcqpEUX2C7QGS6++uvLUT03PUafMoLf0t19rZj5T4cwjCMZ0ZMXgzquSPbXBhCbnnSAcygnVZBusHAJJ5uawUF3BWoDElfIYapPpzCSOf3nwfpcoXJUrbqqLq68CAwEAAaNQME4wHQYDVR0OBBYEFGDQrp6MVLYjkHCvRdKOGQB0NhIjMB8GA1UdIwQYMBaAFGDQrp6MVLYjkHCvRdKOGQB0NhIjMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIPp/zbfikl/SMlWMb0NCJjSRGpL6GAzlTCDp0Blum8IqMdp4K5qGjdLwXUEiP0IUhlsEhsaB/WpHajzHpKLv/UWcf/orFAIo4jnpDPe7amZPSxyUmiiYREDNJs4Ia2vv4MwW13CmezHnlP5+5iHDCQ65CFtsti9TL6Q56T71/mzpu9Y7z6vZ3WvHNaO2MoSR3m8L4Evje3z70MsDkrcyQf/C3kjYzsNMScZbsbmNwWqAjRBnUSTQ5t0a7/PAoAJrNBm4myQdPs4G7inOqmnpSuXlc8p5TVi7cszoBhj100nd1W9FQvK3n74XnSnqRGU/nfDQO1HToFMBN2gQdPgjRC2WidM7YXQ4jckH7nbB3pLFvV7wuwo40w2S9mB2Hrh1fzlxUMtrqAYwKW6hoR+aKagSMVFF4rIV9gEB5a3sAmXa9m009sRuUoYVR4ljYS+oJfZAzfy31K2484baubDh/d/94DxkfSuX6fpkfGDCMKkzRQMrlq5lTaSknctFyx2jR166OUO7SQjGwEFwYpIDoP5VtQhQN73RsM8lFNsw8S0vy7xuM+n6AJxAFXKW2FMoA9UkOrH3gpCyvMuRcvQ61er9DIW3jc1lE4WjTyUnmipTdHFNzx30PJqKXOKT/Ot+fxbzKVkzAfKFRkX6JXL3eVD72dvK1jknPrPK1G53mE8</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:KeyDescriptor use="encryption">
       <ds:KeyInfo>
diff --git a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index 6357f43c..321e72fa 100644
--- a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
@@ -20,13 +20,17 @@
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/eidas-naturalperson</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/st/1.0/public-sector-sp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/sc/eid-choice-2017</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-28T11:23:28Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </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:SPSSODescriptor AuthnRequestsSigned="true" 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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/Login" index="1"/>
@@ -35,15 +39,25 @@
         <mdui:DisplayName xml:lang="en">Ladok for students ladok3-01.ladok.umu.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://ladok3-01.ladok.umu.se:442/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-01.ladok.umu.se:442/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.student.ladok.se/logo/ladok_en.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://ladok3-01.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMECDl0w1cg/MA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjUwWhcNMzIwODE2MTMxNjUwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwcl+Ekm2rS/oCjnkQXuTcgM0kjj2UFnzutUB2Gnz7vu4MG89XpXhbr7GPVaIi+VK7OcR5WQ73I+exqO9jFJb23qoIfGQBzdShxJdWCICeFuhr7jwsqjwwcX+UP9bR0yvCPoHebgphzi+oUXBNTNF7HoS862q6FhXAvYBvJapSLj8P/qXEMjps7BRZs8eCvTKsVWRd0BnWM1qFjSHfCvBqJvQzgQlgcJpf/Pn6pkqv3xJPokPGiFuQM0gPTrjJHA0GDMBLdTZLfHo8hx9ycNr6r/HQ1oMay+3yX9Chw6dQuxLlXirZTN19mwbmCymRZ84OCVFuAOa5y3CMimZdUEUv8AfS9Gfxs3t/VP7xcdufHGnjIpCd/cadn1wSGCOqmJ66UFtzQtRadMcpgVNHsz9Wy33CCqXBV1ApyQAyav++BUcjkfm+706ZL5tWpprYZGm1M4/0bcQpfXRySMZTRLXyAUHNgN1hefNUTgaZnaUrQJOkForUK+iiOO/R10gYK0r3cEHgLreDEJpN9jPiWRwox6NkEFVbvU6uHcM+qsbRKioZJ3pEcqpEUX2C7QGS6++uvLUT03PUafMoLf0t19rZj5T4cwjCMZ0ZMXgzquSPbXBhCbnnSAcygnVZBusHAJJ5uawUF3BWoDElfIYapPpzCSOf3nwfpcoXJUrbqqLq68CAwEAAaNQME4wHQYDVR0OBBYEFGDQrp6MVLYjkHCvRdKOGQB0NhIjMB8GA1UdIwQYMBaAFGDQrp6MVLYjkHCvRdKOGQB0NhIjMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIPp/zbfikl/SMlWMb0NCJjSRGpL6GAzlTCDp0Blum8IqMdp4K5qGjdLwXUEiP0IUhlsEhsaB/WpHajzHpKLv/UWcf/orFAIo4jnpDPe7amZPSxyUmiiYREDNJs4Ia2vv4MwW13CmezHnlP5+5iHDCQ65CFtsti9TL6Q56T71/mzpu9Y7z6vZ3WvHNaO2MoSR3m8L4Evje3z70MsDkrcyQf/C3kjYzsNMScZbsbmNwWqAjRBnUSTQ5t0a7/PAoAJrNBm4myQdPs4G7inOqmnpSuXlc8p5TVi7cszoBhj100nd1W9FQvK3n74XnSnqRGU/nfDQO1HToFMBN2gQdPgjRC2WidM7YXQ4jckH7nbB3pLFvV7wuwo40w2S9mB2Hrh1fzlxUMtrqAYwKW6hoR+aKagSMVFF4rIV9gEB5a3sAmXa9m009sRuUoYVR4ljYS+oJfZAzfy31K2484baubDh/d/94DxkfSuX6fpkfGDCMKkzRQMrlq5lTaSknctFyx2jR166OUO7SQjGwEFwYpIDoP5VtQhQN73RsM8lFNsw8S0vy7xuM+n6AJxAFXKW2FMoA9UkOrH3gpCyvMuRcvQ61er9DIW3jc1lE4WjTyUnmipTdHFNzx30PJqKXOKT/Ot+fxbzKVkzAfKFRkX6JXL3eVD72dvK1jknPrPK1G53mE8</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>https://ladok3-01.ladok.umu.se/student-sp</ds:KeyName>
         <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
@@ -71,6 +85,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <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://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML2/ECP" index="4"/>
@@ -83,11 +99,12 @@
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
index e14d7053..477769e5 100644
--- a/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.integrationstest.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-12-13T09:59:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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"/>
@@ -23,10 +20,17 @@
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/eidas-naturalperson</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/st/1.0/public-sector-sp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/sc/eid-choice-2017</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-12-13T09:59:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </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:SPSSODescriptor AuthnRequestsSigned="true" 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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -35,15 +39,25 @@
         <mdui:DisplayName xml:lang="en">Ladok for students student.integrationstest.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.integrationstest.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.integrationstest.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.student.ladok.se/logo/ladok_en.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://student.integrationstest.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.integrationstest.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.integrationstest.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDYjCCAkqgAwIBAgIJAL07ezPv6S1/MA0GCSqGSIb3DQEBCwUAMCwxKjAoBgNVBAMTIXN0dWRlbnQuaW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZTAeFw0xODEyMTMwODQ2MDNaFw0yODEyMTAwODQ2MDNaMCwxKjAoBgNVBAMTIXN0dWRlbnQuaW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANiCZAHKWIwajs/5bUQVK9XmGH86B+/63i1jjdi8Z1JPaad02O7tiFIWaoVybzUcP9DFIeEenXp07HghYlovtQj31qjJ5tdhmzoombfg/BbIGQpRU6WrvkZtYohrzIDyk9F8oJMDa+O3YjMJTvDxdsbtrT7IGYjUsSfOMyd+44iWSDUGfnDLXrjyd1FA8H+MzQXo26fW+T8Gw6XyTCyrWFcc6a6119sZm+7DTXd0OFWt9CihZe3YqsjzfvkyNoJXhwi28Ly4ru90ihCeKrjJnTPgMCP85wb1t2CLkRXO6qJdzY9OH/YQHoPiFooVTuRUvgK9Gci1mp8GNuSNB8tatrcCAwEAAaOBhjCBgzBiBgNVHREEWzBZgiFzdHVkZW50LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2WGNGh0dHBzOi8vc3R1ZGVudC5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFP/5ISHkLMQLAO0Ci9FlDn6PmijGMA0GCSqGSIb3DQEBCwUAA4IBAQAdh9QNOEithRlgh1jf/qXujxjbkw2rQ7UcnTPwctSchqxtSqocGMBJXQawtDHHtkrrDvoQDOTa0reQp1RPObpvOGlm0AA5df8lrJYeFs9w4sWGHoFJhm6cO7W74Cqb7xNMUxTuMt0oWMt8KhYiAaDSA5R53FNTsqW9XQxmoABHlv/y4o8s8b0WOE2q6hoU1kXwjvq1a4OJosYf2gdZcfjH+W4IvrZjnkj7HQ5Qe7QyXlRnTVQ/3CtYyMZV+zcRsSyKqRMqSqN3jLPxf8P/lUKx8cyUBlPaSorFOMavNDnYFyxjxSQVysOc+7+nTEwxv4wTKvzz2dyPXajltC+HnAbz</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>https://student.integrationstest.ladok.se/student-sp</ds:KeyName>
         <ds:KeyName>student.integrationstest.ladok.se</ds:KeyName>
@@ -71,6 +85,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <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://student.integrationstest.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
@@ -83,11 +99,12 @@
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
index f046443d..84ae05f6 100644
--- a/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.ladoktest00.utv.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-02T13:19:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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"/>
@@ -23,10 +20,17 @@
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/eidas-naturalperson</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/st/1.0/public-sector-sp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/sc/eid-choice-2017</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-02T13:19:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </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:SPSSODescriptor AuthnRequestsSigned="true" 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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -35,15 +39,25 @@
         <mdui:DisplayName xml:lang="en">Ladok for students student.ladoktest00.utv.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.ladoktest00.utv.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.ladoktest00.utv.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.student.ladok.se/logo/ladok_en.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://student.ladoktest00.utv.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.ladoktest00.utv.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.ladoktest00.utv.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAPHDqZPdyiHsMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNVBAMTGHd3dy5sYWRva3Rlc3QwMC5sYWRvay5zZTAeFw0xODEyMTMxNzMwMjhaFw0yODEyMTAxNzMwMjhaMCMxITAfBgNVBAMTGHd3dy5sYWRva3Rlc3QwMC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKzCtwkaQyxqYPdYYeHIyNQnvjx2Yqj7JPoGJkJ2yrmTobWCcen9reOAiKmdBCnNyecXAldzV5DOPqRG7HbEVprvxa0kWeA8kc1o4v2sThr8h55VVJxoLJ1FAAym4fTTb7tCBPs2DSBge6R2qJP3oIRxKHCn6ggbM8cCM4CCiEts4VRLOZV2WSLec1XnTWA9JjQt9utS18IeX6kuxgc8Sjq0Oa7qO4yyDqAoSdzlABoTUvmZ1sNGN/cPQk1nnpPRYh/n9ytIHnmhRV5VqZpY8pJ/yT6vUWRE0+V1mejcfW/4EXN+vUN0j4VDEyXHNwWx85WKXO2F6vhjGQrks+upq1MCAwEAAaNvMG0wTAYDVR0RBEUwQ4IYd3d3LmxhZG9rdGVzdDAwLmxhZG9rLnNlhidodHRwczovL3d3dy5sYWRva3Rlc3QwMC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFDmPGCt2tRHIuahWnPOGF/JByKtdMA0GCSqGSIb3DQEBCwUAA4IBAQAQpdq4qIYZMAMwefjovusnEeqx/+sWwj0oV1v8l55iGk70ZWhyHuP9gATwCzAxFAh09IholsplHkl0u6j74eofmyDTyGoI1F8i+qdYz7J5Fp7W0HM4JSTPyv3GLJ/I7UcoEWBX9kveRl1zqE8Wgb+qAu40vhnQl1J2jEfd1nHW6l+gaHaEEjcskI5iX5mRE7E9ZOm1vBMEQ0zvpzNCzBEGAd8bPjEs7YB1fpr8b1naoFYqAyGyloo6WtX9KdWACqv72HKuMH2s9oc2uGrBbX6jpwKJWa5mC+fwB34jm6IhE2EfkR8kaUtP5QlUpLgEqOs534GGbaQJhlkpf+onI1xw</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>https://student.ladoktest00.utv.ladok.se/student-sp</ds:KeyName>
         <ds:KeyName>student.ladoktest00.utv.ladok.se</ds:KeyName>
@@ -71,6 +85,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <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://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
@@ -83,11 +99,12 @@
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml b/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
index 8eef42d4..83e37907 100644
--- a/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
+++ b/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.ladoktest00.utv.ladok.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-02T13:19:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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"/>
@@ -22,11 +19,15 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-02T13:19:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </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:SPSSODescriptor AuthnRequestsSigned="true" 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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -35,15 +36,25 @@
         <mdui:DisplayName xml:lang="en">Ladok for employees www.ladoktest00.utv.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.ladoktest00.utv.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.ladoktest00.utv.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.start.ladok.se/logo/ladok_en.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://www.ladoktest00.utv.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.ladoktest00.utv.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.ladoktest00.utv.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAOLuLYSK49WuMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNVBAMTGHd3dy5sYWRva3Rlc3QwMC5sYWRvay5zZTAeFw0xODEyMTMxNzMwMTVaFw0yODEyMTAxNzMwMTVaMCMxITAfBgNVBAMTGHd3dy5sYWRva3Rlc3QwMC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMh9Q6MHXfp3XPloR8vzggkIX8kkewyXOR8bbOer62+AT3eH7K8h4T4QK/upr1F52/miFIIQW7VpwGSXO8f3fNEbu91lOBmeSRPzK2r2NnSRhlmX2Wl5OUWxHVjX73z596R/ejLmvRByiFx/QELYsnpTTSFOrRaCpoP3OOe4B4Q43WC4IPwZbRkImtQjG8KP/aUA1C1DOyMQxKrkMQlNRXvHhEiCYNp19gZ4VqlWbeg7QT4le9KhIx0sqCjPMTfcf7iLPeF3ltWTPiBtWnQ6ZItsWk0TiEKEeMK151FrAONEPvVABslfrnxw60P9OxuRt/H6f503OxAqpylcMPzAmg8CAwEAAaNvMG0wTAYDVR0RBEUwQ4IYd3d3LmxhZG9rdGVzdDAwLmxhZG9rLnNlhidodHRwczovL3d3dy5sYWRva3Rlc3QwMC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFO/kUzNZzMSiLQ08cbnIdZfVC3L+MA0GCSqGSIb3DQEBCwUAA4IBAQBDseFrVMr/ongJa4iqGcCzEG7lGBV/ohATR6d4re9l/+odIYkOR3FPp+YxBCPX5zeCHFvESzNKAefKyOHo5c2IZo7366RC933G5r5dg4GcBcsb5fHy8JGF0eUXQfZjKpQnz+TwpMJB708JS4yhvltWzkXg87izqr8JRQZ/3YNkRo1OYtkeqmwVcz0KBOXa22J38DBXa1MrJJaTFTJWQ3ZqvdlQdJnkdJQeM4EkfPv+NTc4QarWKXPWPwPzZ1IIJH3M0mCF5aMe1ARMy30LxUpuKjuK3oovxDS+wGBSBKr+NdgsimuZZXuXN0NAyTYlTy+tkJRb61fRibSOcpx3rC7p</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>https://www.ladoktest00.utv.ladok.se/gui-sp</ds:KeyName>
         <ds:KeyName>www.ladoktest00.utv.ladok.se</ds:KeyName>
@@ -71,6 +82,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <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://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
@@ -87,8 +100,8 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
diff --git a/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
index 2fd0fd16..4dc40cc3 100644
--- a/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
@@ -27,7 +27,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </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:SPSSODescriptor AuthnRequestsSigned="true" 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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -53,15 +53,6 @@
           <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAOfifxZbao7mMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNVBAMTHXd3dy5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMB4XDTE4MTIxMzA4NDMyN1oXDTI4MTIxMDA4NDMyN1owKDEmMCQGA1UEAxMdd3d3LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5lmjzPJRC3fZ4VxhaY0VVGwp8swciwoSBQeO9NnGJ+IQfdmjxGme1MvIcpN0osEnah7kmljHczxmI0j52pmxtJblazB9KVTQBtmRXGUwJtS9j5xnMwdiE2JrMPX9SA+4TxgNGfwNr/5u6HJn06yzVpLagiCF5fabmkHQD7woMW7ewMca9CirzxKtOGT/x2kTTUpvVnY5oAMxoTZWSg1Y6tfx22Gh8zlIw1AePhWSqyTXPmO/z+b8/k8DjVDO/P7zbQrAxzoVZ6dc3xXf0974WaThs7wMCYYNAwSLSu8IAOaCg5R0M9aqqmTMw8Y9585Ioh6kMllYSVhpRW0mb8as3AgMBAAGjeTB3MFYGA1UdEQRPME2CHXd3dy5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlhixodHRwczovL3d3dy5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUqiaQksw8f2VI8MWBOvxje2xpp+0wDQYJKoZIhvcNAQELBQADggEBABQ7NHvIUTeNbepLr2t6OZBWpQZeKfG+zeoP6ehqth10MOE9atah+pzRgh8Lm4xR8RrMSxGfuv3TvMAwLul8jVKTCNsFHxbfp3GHmRB/DwScCYtSnW8pJot9CKiX7pFRPe8t5ExUh3utqSP6s93m7lVOpJwu+7b5W9F2X6THf4yNaOtPYXtaAmNx0VNANcpLhLXtgTnmtzzagaFYm+6vyMbA0cxUXzvp9us0+4xF966Lx/STbDuhpfCsE+Gg/8A2Byzz2lXfLSV0kjHxYnpybLISk/lhSTZ2jkjxg4jFRanM7+3107TsPXmOcNtzisOUhhodSkhOr9wBrs1RV2Cj/0M=</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:KeyDescriptor use="encryption">
       <ds:KeyInfo>