SWAMID-3821 Uppdated test-du.hr.evry.se, test-kau.hr.evry.se, test-ki.hr.evry.se and test-kmh.hr.evry.semd-2024-02-14-v02

4 files changed, 144 insertions, 70 deletions

diff --git a/metadata/swamid-2.0/test-du.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
index 2acb6d72..3636173f 100644
--- a/metadata/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
@@ -32,31 +32,44 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJALQZLo4SG3IqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Rlc3Qtc3NjLmhyLmV2cnkuc2UwHhcNMTQxMTI1MTQ0ODU1WhcNMjQxMTIy
-MTQ0ODU1WjAeMRwwGgYDVQQDExN0ZXN0LXNzYy5oci5ldnJ5LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmMXETFuyDLH3w07c8NvkgzVuwzIXrCE
-Uvs7wZyT6ZxJBZUpv40E3hMjWD6H1HES5EReGn1Pz/N0WNwJgKwPSoXAKdIsarle
-JXT8tLnWh1VwxYwqJAWicIBEHg+wieZOtpx4bZWbuoawrmG4y+Sv2bQ4ysCGTv+e
-ldtBQDDg7AoYgKKNd7XTCvmpCFSRgsvKNlfcM7IqqbQGZXAjAdN8fE925NCwJAXD
-Ls1TkHuhdUDqonkpjeIcOknfl1MYHmabjICyStZapz+3/dwbkUxpR92FwaCg+RcQ
-S0rnS/PL9NXZYliFZp0Xh4ScDIma9psz2sE7slSRYuw1YVUiOu5iawIDAQABo2kw
-ZzBGBgNVHREEPzA9ghN0ZXN0LXNzYy5oci5ldnJ5LnNlhiZodHRwczovL3Rlc3Qt
-c3NjLmhyLmV2cnkuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyz73UbcUW2un96s
-oed1EtDPMQAwDQYJKoZIhvcNAQEFBQADggEBADlt8uXtd2pneWkOTEsnz1pjb9bi
-pirtJavI5AUPV2rK70VRG/jpSbagsZFJWQrw+fPZVEF5emKUyR49EUJRn0KCBNya
-SZg2n3AISr0f3QfubUAzCCHukIRnhGt4xeAAWN05X7ANzxwnGlvVFrY4LQmwYiyD
-8IUFY03HFM86DjGWnC7TfPA4sg12abLkRuWHRytlWSO61a6xXvFflQlAuwMlL6Vm
-gEhPDsDiKCgP+rtRfKirnUj/35G+bl+esZ9Nv4FQ3uEMxezo5IofzVjy92Xg4bxP
-tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIULEhwn+nwjqi+7Mw6zemniKD4DZgwDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIxNDA5MjQ1OFoXDTI3MDIxMzA5MjQ1
+OFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4+V01hg4pRWZoSX1t/X0mgKdp/010IwAK10pTs/tJ5HP4PX4Ak3G40FXnwx0
+EpHnacJMQM4acqr+Bo+dsu4mrTZ5hE1E6KHyROGu7RNdQPWtXoktucPaQArsPJcq
+4iQJauM6K0RDVHmOaSRHbY0i2zBFddN7Ua1U9RHGcEqktTUfZ5K6/igQjH0KvZaK
+Ia0Bd62Oe+reSo8xErzcQylZFl0EOI/2LHFGQuX6TFvTqrxzwhOMbhsPqNlVmWT2
+oazsCJxLHstscJH1X8JSa6Qn7BZVS+vS7sJaoFHE8rbVYmR1ionsMtTfOE8YDli5
+vFmzAA6fljY2dLGRYBPxe5SJ3Q6ZFdnqQ41NnkfnKMh6GofBUQOuB5xtg8JzxRjl
+JNE7GnZEELSBQtRJUWFGG5dIhY6ilRO2cDYKG5RvldY9H17BILf+AT82RmEURji4
+oNYgn+5QTlTHziQolMgapwtJhfce+GPO+ETD6abxWSCjtLYd/iE5uR/R21WhtasX
+RjEme6Irg9I1yRw+v/fLkTZl7h0nWcoDO9OvRg7qKBpVzkIOeV/tfyCIzTCnjZ34
+RWL4vOakkkChbLSCdjs1J//of2/FTHNEEr1SabzXtEVJRpHlpM08TXGmCNfStC8z
+CyLLzX1uqZ/yR49yweyXLUQJx4VVH2r30UAJ4MyKainZ/zECAwEAAaNTMFEwHQYD
+VR0OBBYEFKz7yUU34pXektL13SuAAEmAQlF+MB8GA1UdIwQYMBaAFKz7yUU34pXe
+ktL13SuAAEmAQlF+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+AIAGXVwGOYS+PcncZ+ZvaJZtOJam9MbIpdKVVBKTyYamTUg96HtckTexlYNA2Zbw
+wD3aUPpTGHvrZYiLobCqxjr2+GyUZR6Errs4ybDjT9bO/hewR7v6QWcVZwlMW3Cl
+BUsMoawN53baybVx4uFG+oKCSd0E1R8BXqRJi0+wK3quKTyAUgAT3bojHPBpKKU7
+MfIRQJV6UhNtkwacakpFlDKCZq14+Td9SuttDr4VnyH0/CrQy6/4QT2YW+Jorro/
+lIISw5aRscdcqB9n1dokOZY0+AHwvRr8ObMW4s8aEZvPLW3D4NdovciHjWskPwiD
+wFUcAl/mCDHdLb9LFUAw0IgJMWXJ7c46Wg69hb4Xyf4ozE3I09n7qNa5emfnDXW4
+50SDbwa7/eZF6K06PbLJXBG6LQEpTu8pAcBy4h9XY/NuFgkF/kuNNmXB1brIfbOD
+Gs+C8nYi6JEepF5k1rRKAY3ZGTHmOalvXO/RSMv5WsWxzGCSUaWI/o7XH22xTvVZ
+eWwx+18O5eY7z7TRJeASvS3qs4llFMSm2IDqTG7saZmLK54Z6rJH0QatrrDPwG9q
+NiqWpB6CKYic0z/oc5l/WUHyrVl9Gdt4s61ojvhGJlp2KADkPAfrcgWELme96/8q
+Rl9w0lJL52YpAeCfGZZdZ5VUfaIPIdWcRmL4srhuMNYG
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-du.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-du.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
diff --git a/metadata/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
index 215c26d6..5b8d00ac 100644
--- a/metadata/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
@@ -32,31 +32,44 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJALQZLo4SG3IqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Rlc3Qtc3NjLmhyLmV2cnkuc2UwHhcNMTQxMTI1MTQ0ODU1WhcNMjQxMTIy
-MTQ0ODU1WjAeMRwwGgYDVQQDExN0ZXN0LXNzYy5oci5ldnJ5LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmMXETFuyDLH3w07c8NvkgzVuwzIXrCE
-Uvs7wZyT6ZxJBZUpv40E3hMjWD6H1HES5EReGn1Pz/N0WNwJgKwPSoXAKdIsarle
-JXT8tLnWh1VwxYwqJAWicIBEHg+wieZOtpx4bZWbuoawrmG4y+Sv2bQ4ysCGTv+e
-ldtBQDDg7AoYgKKNd7XTCvmpCFSRgsvKNlfcM7IqqbQGZXAjAdN8fE925NCwJAXD
-Ls1TkHuhdUDqonkpjeIcOknfl1MYHmabjICyStZapz+3/dwbkUxpR92FwaCg+RcQ
-S0rnS/PL9NXZYliFZp0Xh4ScDIma9psz2sE7slSRYuw1YVUiOu5iawIDAQABo2kw
-ZzBGBgNVHREEPzA9ghN0ZXN0LXNzYy5oci5ldnJ5LnNlhiZodHRwczovL3Rlc3Qt
-c3NjLmhyLmV2cnkuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyz73UbcUW2un96s
-oed1EtDPMQAwDQYJKoZIhvcNAQEFBQADggEBADlt8uXtd2pneWkOTEsnz1pjb9bi
-pirtJavI5AUPV2rK70VRG/jpSbagsZFJWQrw+fPZVEF5emKUyR49EUJRn0KCBNya
-SZg2n3AISr0f3QfubUAzCCHukIRnhGt4xeAAWN05X7ANzxwnGlvVFrY4LQmwYiyD
-8IUFY03HFM86DjGWnC7TfPA4sg12abLkRuWHRytlWSO61a6xXvFflQlAuwMlL6Vm
-gEhPDsDiKCgP+rtRfKirnUj/35G+bl+esZ9Nv4FQ3uEMxezo5IofzVjy92Xg4bxP
-tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIULEhwn+nwjqi+7Mw6zemniKD4DZgwDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIxNDA5MjQ1OFoXDTI3MDIxMzA5MjQ1
+OFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4+V01hg4pRWZoSX1t/X0mgKdp/010IwAK10pTs/tJ5HP4PX4Ak3G40FXnwx0
+EpHnacJMQM4acqr+Bo+dsu4mrTZ5hE1E6KHyROGu7RNdQPWtXoktucPaQArsPJcq
+4iQJauM6K0RDVHmOaSRHbY0i2zBFddN7Ua1U9RHGcEqktTUfZ5K6/igQjH0KvZaK
+Ia0Bd62Oe+reSo8xErzcQylZFl0EOI/2LHFGQuX6TFvTqrxzwhOMbhsPqNlVmWT2
+oazsCJxLHstscJH1X8JSa6Qn7BZVS+vS7sJaoFHE8rbVYmR1ionsMtTfOE8YDli5
+vFmzAA6fljY2dLGRYBPxe5SJ3Q6ZFdnqQ41NnkfnKMh6GofBUQOuB5xtg8JzxRjl
+JNE7GnZEELSBQtRJUWFGG5dIhY6ilRO2cDYKG5RvldY9H17BILf+AT82RmEURji4
+oNYgn+5QTlTHziQolMgapwtJhfce+GPO+ETD6abxWSCjtLYd/iE5uR/R21WhtasX
+RjEme6Irg9I1yRw+v/fLkTZl7h0nWcoDO9OvRg7qKBpVzkIOeV/tfyCIzTCnjZ34
+RWL4vOakkkChbLSCdjs1J//of2/FTHNEEr1SabzXtEVJRpHlpM08TXGmCNfStC8z
+CyLLzX1uqZ/yR49yweyXLUQJx4VVH2r30UAJ4MyKainZ/zECAwEAAaNTMFEwHQYD
+VR0OBBYEFKz7yUU34pXektL13SuAAEmAQlF+MB8GA1UdIwQYMBaAFKz7yUU34pXe
+ktL13SuAAEmAQlF+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+AIAGXVwGOYS+PcncZ+ZvaJZtOJam9MbIpdKVVBKTyYamTUg96HtckTexlYNA2Zbw
+wD3aUPpTGHvrZYiLobCqxjr2+GyUZR6Errs4ybDjT9bO/hewR7v6QWcVZwlMW3Cl
+BUsMoawN53baybVx4uFG+oKCSd0E1R8BXqRJi0+wK3quKTyAUgAT3bojHPBpKKU7
+MfIRQJV6UhNtkwacakpFlDKCZq14+Td9SuttDr4VnyH0/CrQy6/4QT2YW+Jorro/
+lIISw5aRscdcqB9n1dokOZY0+AHwvRr8ObMW4s8aEZvPLW3D4NdovciHjWskPwiD
+wFUcAl/mCDHdLb9LFUAw0IgJMWXJ7c46Wg69hb4Xyf4ozE3I09n7qNa5emfnDXW4
+50SDbwa7/eZF6K06PbLJXBG6LQEpTu8pAcBy4h9XY/NuFgkF/kuNNmXB1brIfbOD
+Gs+C8nYi6JEepF5k1rRKAY3ZGTHmOalvXO/RSMv5WsWxzGCSUaWI/o7XH22xTvVZ
+eWwx+18O5eY7z7TRJeASvS3qs4llFMSm2IDqTG7saZmLK54Z6rJH0QatrrDPwG9q
+NiqWpB6CKYic0z/oc5l/WUHyrVl9Gdt4s61ojvhGJlp2KADkPAfrcgWELme96/8q
+Rl9w0lJL52YpAeCfGZZdZ5VUfaIPIdWcRmL4srhuMNYG
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-kau.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-kau.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
diff --git a/metadata/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml
index 3bfa97c9..a00b17b6 100644
--- a/metadata/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml
@@ -32,7 +32,42 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJALQZLo4SG3IqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV BAMTE3Rlc3Qtc3NjLmhyLmV2cnkuc2UwHhcNMTQxMTI1MTQ0ODU1WhcNMjQxMTIy MTQ0ODU1WjAeMRwwGgYDVQQDExN0ZXN0LXNzYy5oci5ldnJ5LnNlMIIBIjANBgkq hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmMXETFuyDLH3w07c8NvkgzVuwzIXrCE Uvs7wZyT6ZxJBZUpv40E3hMjWD6H1HES5EReGn1Pz/N0WNwJgKwPSoXAKdIsarle JXT8tLnWh1VwxYwqJAWicIBEHg+wieZOtpx4bZWbuoawrmG4y+Sv2bQ4ysCGTv+e ldtBQDDg7AoYgKKNd7XTCvmpCFSRgsvKNlfcM7IqqbQGZXAjAdN8fE925NCwJAXD Ls1TkHuhdUDqonkpjeIcOknfl1MYHmabjICyStZapz+3/dwbkUxpR92FwaCg+RcQ S0rnS/PL9NXZYliFZp0Xh4ScDIma9psz2sE7slSRYuw1YVUiOu5iawIDAQABo2kw ZzBGBgNVHREEPzA9ghN0ZXN0LXNzYy5oci5ldnJ5LnNlhiZodHRwczovL3Rlc3Qt c3NjLmhyLmV2cnkuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyz73UbcUW2un96s oed1EtDPMQAwDQYJKoZIhvcNAQEFBQADggEBADlt8uXtd2pneWkOTEsnz1pjb9bi pirtJavI5AUPV2rK70VRG/jpSbagsZFJWQrw+fPZVEF5emKUyR49EUJRn0KCBNya SZg2n3AISr0f3QfubUAzCCHukIRnhGt4xeAAWN05X7ANzxwnGlvVFrY4LQmwYiyD 8IUFY03HFM86DjGWnC7TfPA4sg12abLkRuWHRytlWSO61a6xXvFflQlAuwMlL6Vm gEhPDsDiKCgP+rtRfKirnUj/35G+bl+esZ9Nv4FQ3uEMxezo5IofzVjy92Xg4bxP tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIULEhwn+nwjqi+7Mw6zemniKD4DZgwDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIxNDA5MjQ1OFoXDTI3MDIxMzA5MjQ1
+OFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4+V01hg4pRWZoSX1t/X0mgKdp/010IwAK10pTs/tJ5HP4PX4Ak3G40FXnwx0
+EpHnacJMQM4acqr+Bo+dsu4mrTZ5hE1E6KHyROGu7RNdQPWtXoktucPaQArsPJcq
+4iQJauM6K0RDVHmOaSRHbY0i2zBFddN7Ua1U9RHGcEqktTUfZ5K6/igQjH0KvZaK
+Ia0Bd62Oe+reSo8xErzcQylZFl0EOI/2LHFGQuX6TFvTqrxzwhOMbhsPqNlVmWT2
+oazsCJxLHstscJH1X8JSa6Qn7BZVS+vS7sJaoFHE8rbVYmR1ionsMtTfOE8YDli5
+vFmzAA6fljY2dLGRYBPxe5SJ3Q6ZFdnqQ41NnkfnKMh6GofBUQOuB5xtg8JzxRjl
+JNE7GnZEELSBQtRJUWFGG5dIhY6ilRO2cDYKG5RvldY9H17BILf+AT82RmEURji4
+oNYgn+5QTlTHziQolMgapwtJhfce+GPO+ETD6abxWSCjtLYd/iE5uR/R21WhtasX
+RjEme6Irg9I1yRw+v/fLkTZl7h0nWcoDO9OvRg7qKBpVzkIOeV/tfyCIzTCnjZ34
+RWL4vOakkkChbLSCdjs1J//of2/FTHNEEr1SabzXtEVJRpHlpM08TXGmCNfStC8z
+CyLLzX1uqZ/yR49yweyXLUQJx4VVH2r30UAJ4MyKainZ/zECAwEAAaNTMFEwHQYD
+VR0OBBYEFKz7yUU34pXektL13SuAAEmAQlF+MB8GA1UdIwQYMBaAFKz7yUU34pXe
+ktL13SuAAEmAQlF+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+AIAGXVwGOYS+PcncZ+ZvaJZtOJam9MbIpdKVVBKTyYamTUg96HtckTexlYNA2Zbw
+wD3aUPpTGHvrZYiLobCqxjr2+GyUZR6Errs4ybDjT9bO/hewR7v6QWcVZwlMW3Cl
+BUsMoawN53baybVx4uFG+oKCSd0E1R8BXqRJi0+wK3quKTyAUgAT3bojHPBpKKU7
+MfIRQJV6UhNtkwacakpFlDKCZq14+Td9SuttDr4VnyH0/CrQy6/4QT2YW+Jorro/
+lIISw5aRscdcqB9n1dokOZY0+AHwvRr8ObMW4s8aEZvPLW3D4NdovciHjWskPwiD
+wFUcAl/mCDHdLb9LFUAw0IgJMWXJ7c46Wg69hb4Xyf4ozE3I09n7qNa5emfnDXW4
+50SDbwa7/eZF6K06PbLJXBG6LQEpTu8pAcBy4h9XY/NuFgkF/kuNNmXB1brIfbOD
+Gs+C8nYi6JEepF5k1rRKAY3ZGTHmOalvXO/RSMv5WsWxzGCSUaWI/o7XH22xTvVZ
+eWwx+18O5eY7z7TRJeASvS3qs4llFMSm2IDqTG7saZmLK54Z6rJH0QatrrDPwG9q
+NiqWpB6CKYic0z/oc5l/WUHyrVl9Gdt4s61ojvhGJlp2KADkPAfrcgWELme96/8q
+Rl9w0lJL52YpAeCfGZZdZ5VUfaIPIdWcRmL4srhuMNYG
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/metadata/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml
index 4b847479..800e2fcc 100644
--- a/metadata/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml
@@ -32,31 +32,44 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJALQZLo4SG3IqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Rlc3Qtc3NjLmhyLmV2cnkuc2UwHhcNMTQxMTI1MTQ0ODU1WhcNMjQxMTIy
-MTQ0ODU1WjAeMRwwGgYDVQQDExN0ZXN0LXNzYy5oci5ldnJ5LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmMXETFuyDLH3w07c8NvkgzVuwzIXrCE
-Uvs7wZyT6ZxJBZUpv40E3hMjWD6H1HES5EReGn1Pz/N0WNwJgKwPSoXAKdIsarle
-JXT8tLnWh1VwxYwqJAWicIBEHg+wieZOtpx4bZWbuoawrmG4y+Sv2bQ4ysCGTv+e
-ldtBQDDg7AoYgKKNd7XTCvmpCFSRgsvKNlfcM7IqqbQGZXAjAdN8fE925NCwJAXD
-Ls1TkHuhdUDqonkpjeIcOknfl1MYHmabjICyStZapz+3/dwbkUxpR92FwaCg+RcQ
-S0rnS/PL9NXZYliFZp0Xh4ScDIma9psz2sE7slSRYuw1YVUiOu5iawIDAQABo2kw
-ZzBGBgNVHREEPzA9ghN0ZXN0LXNzYy5oci5ldnJ5LnNlhiZodHRwczovL3Rlc3Qt
-c3NjLmhyLmV2cnkuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyz73UbcUW2un96s
-oed1EtDPMQAwDQYJKoZIhvcNAQEFBQADggEBADlt8uXtd2pneWkOTEsnz1pjb9bi
-pirtJavI5AUPV2rK70VRG/jpSbagsZFJWQrw+fPZVEF5emKUyR49EUJRn0KCBNya
-SZg2n3AISr0f3QfubUAzCCHukIRnhGt4xeAAWN05X7ANzxwnGlvVFrY4LQmwYiyD
-8IUFY03HFM86DjGWnC7TfPA4sg12abLkRuWHRytlWSO61a6xXvFflQlAuwMlL6Vm
-gEhPDsDiKCgP+rtRfKirnUj/35G+bl+esZ9Nv4FQ3uEMxezo5IofzVjy92Xg4bxP
-tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIULEhwn+nwjqi+7Mw6zemniKD4DZgwDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIxNDA5MjQ1OFoXDTI3MDIxMzA5MjQ1
+OFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4+V01hg4pRWZoSX1t/X0mgKdp/010IwAK10pTs/tJ5HP4PX4Ak3G40FXnwx0
+EpHnacJMQM4acqr+Bo+dsu4mrTZ5hE1E6KHyROGu7RNdQPWtXoktucPaQArsPJcq
+4iQJauM6K0RDVHmOaSRHbY0i2zBFddN7Ua1U9RHGcEqktTUfZ5K6/igQjH0KvZaK
+Ia0Bd62Oe+reSo8xErzcQylZFl0EOI/2LHFGQuX6TFvTqrxzwhOMbhsPqNlVmWT2
+oazsCJxLHstscJH1X8JSa6Qn7BZVS+vS7sJaoFHE8rbVYmR1ionsMtTfOE8YDli5
+vFmzAA6fljY2dLGRYBPxe5SJ3Q6ZFdnqQ41NnkfnKMh6GofBUQOuB5xtg8JzxRjl
+JNE7GnZEELSBQtRJUWFGG5dIhY6ilRO2cDYKG5RvldY9H17BILf+AT82RmEURji4
+oNYgn+5QTlTHziQolMgapwtJhfce+GPO+ETD6abxWSCjtLYd/iE5uR/R21WhtasX
+RjEme6Irg9I1yRw+v/fLkTZl7h0nWcoDO9OvRg7qKBpVzkIOeV/tfyCIzTCnjZ34
+RWL4vOakkkChbLSCdjs1J//of2/FTHNEEr1SabzXtEVJRpHlpM08TXGmCNfStC8z
+CyLLzX1uqZ/yR49yweyXLUQJx4VVH2r30UAJ4MyKainZ/zECAwEAAaNTMFEwHQYD
+VR0OBBYEFKz7yUU34pXektL13SuAAEmAQlF+MB8GA1UdIwQYMBaAFKz7yUU34pXe
+ktL13SuAAEmAQlF+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+AIAGXVwGOYS+PcncZ+ZvaJZtOJam9MbIpdKVVBKTyYamTUg96HtckTexlYNA2Zbw
+wD3aUPpTGHvrZYiLobCqxjr2+GyUZR6Errs4ybDjT9bO/hewR7v6QWcVZwlMW3Cl
+BUsMoawN53baybVx4uFG+oKCSd0E1R8BXqRJi0+wK3quKTyAUgAT3bojHPBpKKU7
+MfIRQJV6UhNtkwacakpFlDKCZq14+Td9SuttDr4VnyH0/CrQy6/4QT2YW+Jorro/
+lIISw5aRscdcqB9n1dokOZY0+AHwvRr8ObMW4s8aEZvPLW3D4NdovciHjWskPwiD
+wFUcAl/mCDHdLb9LFUAw0IgJMWXJ7c46Wg69hb4Xyf4ozE3I09n7qNa5emfnDXW4
+50SDbwa7/eZF6K06PbLJXBG6LQEpTu8pAcBy4h9XY/NuFgkF/kuNNmXB1brIfbOD
+Gs+C8nYi6JEepF5k1rRKAY3ZGTHmOalvXO/RSMv5WsWxzGCSUaWI/o7XH22xTvVZ
+eWwx+18O5eY7z7TRJeASvS3qs4llFMSm2IDqTG7saZmLK54Z6rJH0QatrrDPwG9q
+NiqWpB6CKYic0z/oc5l/WUHyrVl9Gdt4s61ojvhGJlp2KADkPAfrcgWELme96/8q
+Rl9w0lJL52YpAeCfGZZdZ5VUfaIPIdWcRmL4srhuMNYG
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-kmh.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-kmh.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>