SWAMID-3800 Updated https://du.hr.evry.se/shibboleth, https://hr.su.se/shibboleth, https://kau.hr.evry.se/shibboleth, https://ki.hr.evry.se/shibboleth, https://kmh.hr.evry.se/shibboleth, https://ltu.hr.evry.se/shibbolet and https://primula.lnu.se/shibboleth

7 files changed, 252 insertions, 157 deletions

diff --git a/metadata/swamid-2.0/du.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/du.hr.evry.se-shibboleth.xml
index 1079cf09..21463967 100644
--- a/metadata/swamid-2.0/du.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/du.hr.evry.se-shibboleth.xml
@@ -32,34 +32,44 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
-MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
-EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
-B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
-MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
-MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
-QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
-CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
-ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
-gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
-zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
-hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
-7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
-uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
-GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
-NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
-2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
-fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIUUskEIZ1It7Z+Gwx6Y49GwY+UKa8wDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIwOTE1MDEyMFoXDTI3MDIwODE1MDEy
+MFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4Z24QpF2Ldg9WXonihz2KOwEhzKpX3Ru2ykqJVsspwDbOn9458KsLlMBgT+t
+nLfLuikyUIhczQjJqIEV+WM1JCZv2OuQPGxxF8BdOe6t15YX1Qv42Fo3fn2nsAaR
+WeKLRLX7HkP7dLLmwu7e3QI96Knhx2jEh//WMKn+JPume7n0FC4u+Xl9+sDUce+Y
+77s9qQyIbs8GhepB8oCkFAnEw/yD1xJtjqqNRxlGZ1BtdjiF+Vkvu1pRowBLqSkX
+RVaTZksJ3Xn4aV3LYV4JoG0LGoEKg5ckMy2rhZaztDPh1YOL3C3HSmv1z7k1Xayx
+obS8qEgjEEtEomFJS6Yu6twdzCSCYltWe0U9n8jQvTnvfm2Z5YZl7YRh7sr9PC6f
+WYRlK+Lh4lV1OaWbTixTdaKLP/RTgldg7yND+g9FziJP6PeKx9Nsom7YMN3Yyoc+
+xTLWKvvR9M2xwBx7WPMtV4qo4WcTU0RPk0J3+csO0PqN56r7Lz/A+eN+x1xkoudz
+2a61b1O/omoChjRlqq/376c1wkfxAReyZiDMIBpuDmmc+Nj4nA75XaEZudk/N2DS
+hB103+T/OOebjm4UCKnsa+MqXr0Zi6TVF3ib9QnJK137ZXgMqAjjGI7NEPOelXsP
+lKAb/gnsj9ZrZ1k9r9GK3x0AF1qEjr6oY3l7+loodEK1sOMCAwEAAaNTMFEwHQYD
+VR0OBBYEFHWl4UdXYgF5TlednNbPGouWiAfzMB8GA1UdIwQYMBaAFHWl4UdXYgF5
+TlednNbPGouWiAfzMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+ADPz3k5mr5BqX+MA60XxyfGAr2wd33KidzDaK0MO2tK1+KckXBPQh2nUJ5T8fkpA
+zs8GO/ia5HdLewWjsB//rBos62GgFMiIca/ngxPEjmrl7lqSka45cqObrOq9nlOF
+XV+a/drzHwAca6JvZoaoTfC4dE6T0Ic81RPZ81Xn5+TlraE3gRP4+cdzzxTaw2HO
+m04pnlXhyq3LAGauuVFZnxcvPvD04mdinp3b+3l8WO4pD7gNzcYlK7NBmmfAJA44
+WJZLx4/dh1rX6ZFtUJXiT/tiyFKAlK3Cz3v+N/oqqWipRaBhXSHphsm9Yb/J25pv
+AuoqXnavFn0FxXoTGtUD4BfLWcQdIy+ZU6r6llRRv4dym4wBN/o6iv7sU1xFjQsQ
+7ll0wO4FOusyaYHVQyyjkkSbOykbM0cm+3KmAyustLLLHAo3jV4gmkXC98nuzESK
+HgmAjpc72DpkKHhZZ27GfnZLy0d7fQMOP69xlqYKpqFgA2YEbNIJAtFTODQJM360
+d8iSo7rh+vow1UZmLPGNHsGcJDzax18VbQWgDIR+FOHz3il2U7Vx7teMwAaz3+jm
+wfR4nusecrUtoK2PtudwsNKXj6NtWn9TI/L9BijXqnJlPlH953VqftYj7IQrdZ84
+uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv
+</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://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://du.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
diff --git a/metadata/swamid-2.0/hr.su.se-shibboleth.xml b/metadata/swamid-2.0/hr.su.se-shibboleth.xml
index 6d247066..413fd0e5 100644
--- a/metadata/swamid-2.0/hr.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/hr.su.se-shibboleth.xml
@@ -34,7 +34,42 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo 7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7 2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1 DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIUUskEIZ1It7Z+Gwx6Y49GwY+UKa8wDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIwOTE1MDEyMFoXDTI3MDIwODE1MDEy
+MFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4Z24QpF2Ldg9WXonihz2KOwEhzKpX3Ru2ykqJVsspwDbOn9458KsLlMBgT+t
+nLfLuikyUIhczQjJqIEV+WM1JCZv2OuQPGxxF8BdOe6t15YX1Qv42Fo3fn2nsAaR
+WeKLRLX7HkP7dLLmwu7e3QI96Knhx2jEh//WMKn+JPume7n0FC4u+Xl9+sDUce+Y
+77s9qQyIbs8GhepB8oCkFAnEw/yD1xJtjqqNRxlGZ1BtdjiF+Vkvu1pRowBLqSkX
+RVaTZksJ3Xn4aV3LYV4JoG0LGoEKg5ckMy2rhZaztDPh1YOL3C3HSmv1z7k1Xayx
+obS8qEgjEEtEomFJS6Yu6twdzCSCYltWe0U9n8jQvTnvfm2Z5YZl7YRh7sr9PC6f
+WYRlK+Lh4lV1OaWbTixTdaKLP/RTgldg7yND+g9FziJP6PeKx9Nsom7YMN3Yyoc+
+xTLWKvvR9M2xwBx7WPMtV4qo4WcTU0RPk0J3+csO0PqN56r7Lz/A+eN+x1xkoudz
+2a61b1O/omoChjRlqq/376c1wkfxAReyZiDMIBpuDmmc+Nj4nA75XaEZudk/N2DS
+hB103+T/OOebjm4UCKnsa+MqXr0Zi6TVF3ib9QnJK137ZXgMqAjjGI7NEPOelXsP
+lKAb/gnsj9ZrZ1k9r9GK3x0AF1qEjr6oY3l7+loodEK1sOMCAwEAAaNTMFEwHQYD
+VR0OBBYEFHWl4UdXYgF5TlednNbPGouWiAfzMB8GA1UdIwQYMBaAFHWl4UdXYgF5
+TlednNbPGouWiAfzMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+ADPz3k5mr5BqX+MA60XxyfGAr2wd33KidzDaK0MO2tK1+KckXBPQh2nUJ5T8fkpA
+zs8GO/ia5HdLewWjsB//rBos62GgFMiIca/ngxPEjmrl7lqSka45cqObrOq9nlOF
+XV+a/drzHwAca6JvZoaoTfC4dE6T0Ic81RPZ81Xn5+TlraE3gRP4+cdzzxTaw2HO
+m04pnlXhyq3LAGauuVFZnxcvPvD04mdinp3b+3l8WO4pD7gNzcYlK7NBmmfAJA44
+WJZLx4/dh1rX6ZFtUJXiT/tiyFKAlK3Cz3v+N/oqqWipRaBhXSHphsm9Yb/J25pv
+AuoqXnavFn0FxXoTGtUD4BfLWcQdIy+ZU6r6llRRv4dym4wBN/o6iv7sU1xFjQsQ
+7ll0wO4FOusyaYHVQyyjkkSbOykbM0cm+3KmAyustLLLHAo3jV4gmkXC98nuzESK
+HgmAjpc72DpkKHhZZ27GfnZLy0d7fQMOP69xlqYKpqFgA2YEbNIJAtFTODQJM360
+d8iSo7rh+vow1UZmLPGNHsGcJDzax18VbQWgDIR+FOHz3il2U7Vx7teMwAaz3+jm
+wfR4nusecrUtoK2PtudwsNKXj6NtWn9TI/L9BijXqnJlPlH953VqftYj7IQrdZ84
+uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/metadata/swamid-2.0/kau.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/kau.hr.evry.se-shibboleth.xml
index 4dd2a2da..790ce518 100644
--- a/metadata/swamid-2.0/kau.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kau.hr.evry.se-shibboleth.xml
@@ -32,34 +32,44 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
-MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
-EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
-B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
-MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
-MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
-QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
-CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
-ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
-gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
-zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
-hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
-7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
-uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
-GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
-NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
-2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
-fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIUUskEIZ1It7Z+Gwx6Y49GwY+UKa8wDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIwOTE1MDEyMFoXDTI3MDIwODE1MDEy
+MFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4Z24QpF2Ldg9WXonihz2KOwEhzKpX3Ru2ykqJVsspwDbOn9458KsLlMBgT+t
+nLfLuikyUIhczQjJqIEV+WM1JCZv2OuQPGxxF8BdOe6t15YX1Qv42Fo3fn2nsAaR
+WeKLRLX7HkP7dLLmwu7e3QI96Knhx2jEh//WMKn+JPume7n0FC4u+Xl9+sDUce+Y
+77s9qQyIbs8GhepB8oCkFAnEw/yD1xJtjqqNRxlGZ1BtdjiF+Vkvu1pRowBLqSkX
+RVaTZksJ3Xn4aV3LYV4JoG0LGoEKg5ckMy2rhZaztDPh1YOL3C3HSmv1z7k1Xayx
+obS8qEgjEEtEomFJS6Yu6twdzCSCYltWe0U9n8jQvTnvfm2Z5YZl7YRh7sr9PC6f
+WYRlK+Lh4lV1OaWbTixTdaKLP/RTgldg7yND+g9FziJP6PeKx9Nsom7YMN3Yyoc+
+xTLWKvvR9M2xwBx7WPMtV4qo4WcTU0RPk0J3+csO0PqN56r7Lz/A+eN+x1xkoudz
+2a61b1O/omoChjRlqq/376c1wkfxAReyZiDMIBpuDmmc+Nj4nA75XaEZudk/N2DS
+hB103+T/OOebjm4UCKnsa+MqXr0Zi6TVF3ib9QnJK137ZXgMqAjjGI7NEPOelXsP
+lKAb/gnsj9ZrZ1k9r9GK3x0AF1qEjr6oY3l7+loodEK1sOMCAwEAAaNTMFEwHQYD
+VR0OBBYEFHWl4UdXYgF5TlednNbPGouWiAfzMB8GA1UdIwQYMBaAFHWl4UdXYgF5
+TlednNbPGouWiAfzMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+ADPz3k5mr5BqX+MA60XxyfGAr2wd33KidzDaK0MO2tK1+KckXBPQh2nUJ5T8fkpA
+zs8GO/ia5HdLewWjsB//rBos62GgFMiIca/ngxPEjmrl7lqSka45cqObrOq9nlOF
+XV+a/drzHwAca6JvZoaoTfC4dE6T0Ic81RPZ81Xn5+TlraE3gRP4+cdzzxTaw2HO
+m04pnlXhyq3LAGauuVFZnxcvPvD04mdinp3b+3l8WO4pD7gNzcYlK7NBmmfAJA44
+WJZLx4/dh1rX6ZFtUJXiT/tiyFKAlK3Cz3v+N/oqqWipRaBhXSHphsm9Yb/J25pv
+AuoqXnavFn0FxXoTGtUD4BfLWcQdIy+ZU6r6llRRv4dym4wBN/o6iv7sU1xFjQsQ
+7ll0wO4FOusyaYHVQyyjkkSbOykbM0cm+3KmAyustLLLHAo3jV4gmkXC98nuzESK
+HgmAjpc72DpkKHhZZ27GfnZLy0d7fQMOP69xlqYKpqFgA2YEbNIJAtFTODQJM360
+d8iSo7rh+vow1UZmLPGNHsGcJDzax18VbQWgDIR+FOHz3il2U7Vx7teMwAaz3+jm
+wfR4nusecrUtoK2PtudwsNKXj6NtWn9TI/L9BijXqnJlPlH953VqftYj7IQrdZ84
+uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv
+</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://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://kau.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
diff --git a/metadata/swamid-2.0/ki.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/ki.hr.evry.se-shibboleth.xml
index b913a901..c11c9f75 100644
--- a/metadata/swamid-2.0/ki.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/ki.hr.evry.se-shibboleth.xml
@@ -32,34 +32,44 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
-MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
-EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
-B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
-MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
-MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
-QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
-CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
-ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
-gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
-zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
-hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
-7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
-uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
-GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
-NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
-2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
-fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIUUskEIZ1It7Z+Gwx6Y49GwY+UKa8wDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIwOTE1MDEyMFoXDTI3MDIwODE1MDEy
+MFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4Z24QpF2Ldg9WXonihz2KOwEhzKpX3Ru2ykqJVsspwDbOn9458KsLlMBgT+t
+nLfLuikyUIhczQjJqIEV+WM1JCZv2OuQPGxxF8BdOe6t15YX1Qv42Fo3fn2nsAaR
+WeKLRLX7HkP7dLLmwu7e3QI96Knhx2jEh//WMKn+JPume7n0FC4u+Xl9+sDUce+Y
+77s9qQyIbs8GhepB8oCkFAnEw/yD1xJtjqqNRxlGZ1BtdjiF+Vkvu1pRowBLqSkX
+RVaTZksJ3Xn4aV3LYV4JoG0LGoEKg5ckMy2rhZaztDPh1YOL3C3HSmv1z7k1Xayx
+obS8qEgjEEtEomFJS6Yu6twdzCSCYltWe0U9n8jQvTnvfm2Z5YZl7YRh7sr9PC6f
+WYRlK+Lh4lV1OaWbTixTdaKLP/RTgldg7yND+g9FziJP6PeKx9Nsom7YMN3Yyoc+
+xTLWKvvR9M2xwBx7WPMtV4qo4WcTU0RPk0J3+csO0PqN56r7Lz/A+eN+x1xkoudz
+2a61b1O/omoChjRlqq/376c1wkfxAReyZiDMIBpuDmmc+Nj4nA75XaEZudk/N2DS
+hB103+T/OOebjm4UCKnsa+MqXr0Zi6TVF3ib9QnJK137ZXgMqAjjGI7NEPOelXsP
+lKAb/gnsj9ZrZ1k9r9GK3x0AF1qEjr6oY3l7+loodEK1sOMCAwEAAaNTMFEwHQYD
+VR0OBBYEFHWl4UdXYgF5TlednNbPGouWiAfzMB8GA1UdIwQYMBaAFHWl4UdXYgF5
+TlednNbPGouWiAfzMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+ADPz3k5mr5BqX+MA60XxyfGAr2wd33KidzDaK0MO2tK1+KckXBPQh2nUJ5T8fkpA
+zs8GO/ia5HdLewWjsB//rBos62GgFMiIca/ngxPEjmrl7lqSka45cqObrOq9nlOF
+XV+a/drzHwAca6JvZoaoTfC4dE6T0Ic81RPZ81Xn5+TlraE3gRP4+cdzzxTaw2HO
+m04pnlXhyq3LAGauuVFZnxcvPvD04mdinp3b+3l8WO4pD7gNzcYlK7NBmmfAJA44
+WJZLx4/dh1rX6ZFtUJXiT/tiyFKAlK3Cz3v+N/oqqWipRaBhXSHphsm9Yb/J25pv
+AuoqXnavFn0FxXoTGtUD4BfLWcQdIy+ZU6r6llRRv4dym4wBN/o6iv7sU1xFjQsQ
+7ll0wO4FOusyaYHVQyyjkkSbOykbM0cm+3KmAyustLLLHAo3jV4gmkXC98nuzESK
+HgmAjpc72DpkKHhZZ27GfnZLy0d7fQMOP69xlqYKpqFgA2YEbNIJAtFTODQJM360
+d8iSo7rh+vow1UZmLPGNHsGcJDzax18VbQWgDIR+FOHz3il2U7Vx7teMwAaz3+jm
+wfR4nusecrUtoK2PtudwsNKXj6NtWn9TI/L9BijXqnJlPlH953VqftYj7IQrdZ84
+uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv
+</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://ki.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ki.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
diff --git a/metadata/swamid-2.0/kmh.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/kmh.hr.evry.se-shibboleth.xml
index 304309a6..fa21c654 100644
--- a/metadata/swamid-2.0/kmh.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kmh.hr.evry.se-shibboleth.xml
@@ -32,34 +32,44 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
-MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
-EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
-B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
-MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
-MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
-QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
-CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
-ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
-gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
-zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
-hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
-7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
-uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
-GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
-NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
-2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
-fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIUUskEIZ1It7Z+Gwx6Y49GwY+UKa8wDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIwOTE1MDEyMFoXDTI3MDIwODE1MDEy
+MFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4Z24QpF2Ldg9WXonihz2KOwEhzKpX3Ru2ykqJVsspwDbOn9458KsLlMBgT+t
+nLfLuikyUIhczQjJqIEV+WM1JCZv2OuQPGxxF8BdOe6t15YX1Qv42Fo3fn2nsAaR
+WeKLRLX7HkP7dLLmwu7e3QI96Knhx2jEh//WMKn+JPume7n0FC4u+Xl9+sDUce+Y
+77s9qQyIbs8GhepB8oCkFAnEw/yD1xJtjqqNRxlGZ1BtdjiF+Vkvu1pRowBLqSkX
+RVaTZksJ3Xn4aV3LYV4JoG0LGoEKg5ckMy2rhZaztDPh1YOL3C3HSmv1z7k1Xayx
+obS8qEgjEEtEomFJS6Yu6twdzCSCYltWe0U9n8jQvTnvfm2Z5YZl7YRh7sr9PC6f
+WYRlK+Lh4lV1OaWbTixTdaKLP/RTgldg7yND+g9FziJP6PeKx9Nsom7YMN3Yyoc+
+xTLWKvvR9M2xwBx7WPMtV4qo4WcTU0RPk0J3+csO0PqN56r7Lz/A+eN+x1xkoudz
+2a61b1O/omoChjRlqq/376c1wkfxAReyZiDMIBpuDmmc+Nj4nA75XaEZudk/N2DS
+hB103+T/OOebjm4UCKnsa+MqXr0Zi6TVF3ib9QnJK137ZXgMqAjjGI7NEPOelXsP
+lKAb/gnsj9ZrZ1k9r9GK3x0AF1qEjr6oY3l7+loodEK1sOMCAwEAAaNTMFEwHQYD
+VR0OBBYEFHWl4UdXYgF5TlednNbPGouWiAfzMB8GA1UdIwQYMBaAFHWl4UdXYgF5
+TlednNbPGouWiAfzMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+ADPz3k5mr5BqX+MA60XxyfGAr2wd33KidzDaK0MO2tK1+KckXBPQh2nUJ5T8fkpA
+zs8GO/ia5HdLewWjsB//rBos62GgFMiIca/ngxPEjmrl7lqSka45cqObrOq9nlOF
+XV+a/drzHwAca6JvZoaoTfC4dE6T0Ic81RPZ81Xn5+TlraE3gRP4+cdzzxTaw2HO
+m04pnlXhyq3LAGauuVFZnxcvPvD04mdinp3b+3l8WO4pD7gNzcYlK7NBmmfAJA44
+WJZLx4/dh1rX6ZFtUJXiT/tiyFKAlK3Cz3v+N/oqqWipRaBhXSHphsm9Yb/J25pv
+AuoqXnavFn0FxXoTGtUD4BfLWcQdIy+ZU6r6llRRv4dym4wBN/o6iv7sU1xFjQsQ
+7ll0wO4FOusyaYHVQyyjkkSbOykbM0cm+3KmAyustLLLHAo3jV4gmkXC98nuzESK
+HgmAjpc72DpkKHhZZ27GfnZLy0d7fQMOP69xlqYKpqFgA2YEbNIJAtFTODQJM360
+d8iSo7rh+vow1UZmLPGNHsGcJDzax18VbQWgDIR+FOHz3il2U7Vx7teMwAaz3+jm
+wfR4nusecrUtoK2PtudwsNKXj6NtWn9TI/L9BijXqnJlPlH953VqftYj7IQrdZ84
+uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv
+</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://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://kmh.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
diff --git a/metadata/swamid-2.0/ltu.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
index 27be1d4d..d6f61685 100644
--- a/metadata/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
@@ -32,34 +32,44 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
-MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
-EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
-B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
-MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
-MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
-QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
-CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
-ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
-gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
-zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
-hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
-7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
-uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
-GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
-NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
-2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
-fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIUUskEIZ1It7Z+Gwx6Y49GwY+UKa8wDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIwOTE1MDEyMFoXDTI3MDIwODE1MDEy
+MFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4Z24QpF2Ldg9WXonihz2KOwEhzKpX3Ru2ykqJVsspwDbOn9458KsLlMBgT+t
+nLfLuikyUIhczQjJqIEV+WM1JCZv2OuQPGxxF8BdOe6t15YX1Qv42Fo3fn2nsAaR
+WeKLRLX7HkP7dLLmwu7e3QI96Knhx2jEh//WMKn+JPume7n0FC4u+Xl9+sDUce+Y
+77s9qQyIbs8GhepB8oCkFAnEw/yD1xJtjqqNRxlGZ1BtdjiF+Vkvu1pRowBLqSkX
+RVaTZksJ3Xn4aV3LYV4JoG0LGoEKg5ckMy2rhZaztDPh1YOL3C3HSmv1z7k1Xayx
+obS8qEgjEEtEomFJS6Yu6twdzCSCYltWe0U9n8jQvTnvfm2Z5YZl7YRh7sr9PC6f
+WYRlK+Lh4lV1OaWbTixTdaKLP/RTgldg7yND+g9FziJP6PeKx9Nsom7YMN3Yyoc+
+xTLWKvvR9M2xwBx7WPMtV4qo4WcTU0RPk0J3+csO0PqN56r7Lz/A+eN+x1xkoudz
+2a61b1O/omoChjRlqq/376c1wkfxAReyZiDMIBpuDmmc+Nj4nA75XaEZudk/N2DS
+hB103+T/OOebjm4UCKnsa+MqXr0Zi6TVF3ib9QnJK137ZXgMqAjjGI7NEPOelXsP
+lKAb/gnsj9ZrZ1k9r9GK3x0AF1qEjr6oY3l7+loodEK1sOMCAwEAAaNTMFEwHQYD
+VR0OBBYEFHWl4UdXYgF5TlednNbPGouWiAfzMB8GA1UdIwQYMBaAFHWl4UdXYgF5
+TlednNbPGouWiAfzMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+ADPz3k5mr5BqX+MA60XxyfGAr2wd33KidzDaK0MO2tK1+KckXBPQh2nUJ5T8fkpA
+zs8GO/ia5HdLewWjsB//rBos62GgFMiIca/ngxPEjmrl7lqSka45cqObrOq9nlOF
+XV+a/drzHwAca6JvZoaoTfC4dE6T0Ic81RPZ81Xn5+TlraE3gRP4+cdzzxTaw2HO
+m04pnlXhyq3LAGauuVFZnxcvPvD04mdinp3b+3l8WO4pD7gNzcYlK7NBmmfAJA44
+WJZLx4/dh1rX6ZFtUJXiT/tiyFKAlK3Cz3v+N/oqqWipRaBhXSHphsm9Yb/J25pv
+AuoqXnavFn0FxXoTGtUD4BfLWcQdIy+ZU6r6llRRv4dym4wBN/o6iv7sU1xFjQsQ
+7ll0wO4FOusyaYHVQyyjkkSbOykbM0cm+3KmAyustLLLHAo3jV4gmkXC98nuzESK
+HgmAjpc72DpkKHhZZ27GfnZLy0d7fQMOP69xlqYKpqFgA2YEbNIJAtFTODQJM360
+d8iSo7rh+vow1UZmLPGNHsGcJDzax18VbQWgDIR+FOHz3il2U7Vx7teMwAaz3+jm
+wfR4nusecrUtoK2PtudwsNKXj6NtWn9TI/L9BijXqnJlPlH953VqftYj7IQrdZ84
+uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv
+</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://ltu.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ltu.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
diff --git a/metadata/swamid-2.0/primula.lnu.se-shibboleth.xml b/metadata/swamid-2.0/primula.lnu.se-shibboleth.xml
index 0a27d16a..aa3efa66 100644
--- a/metadata/swamid-2.0/primula.lnu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/primula.lnu.se-shibboleth.xml
@@ -32,34 +32,44 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
-MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
-EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
-B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
-MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
-MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
-QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
-CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
-ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
-gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
-zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
-hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
-7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
-uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
-GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
-NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
-2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
-fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
+          <ds:X509Certificate>MIIGfTCCBGWgAwIBAgIUUskEIZ1It7Z+Gwx6Y49GwY+UKa8wDQYJKoZIhvcNAQEL
+BQAwgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMB4XDTI0MDIwOTE1MDEyMFoXDTI3MDIwODE1MDEy
+MFowgc0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdV
+cHBzYWxhMRwwGgYDVQQKDBNUaWV0b2V2cnkgU3dlZGVuIEFCMTowOAYDVQQLDDFQ
+cmltdWxhL2VtYWlsQWRkcmVzcz1wcmltdWxhc3VwcG9ydEB0aWV0b2V2cnkuY29t
+MRMwEQYDVQQDDApoci5ldnJ5LnNlMSswKQYJKoZIhvcNAQkBFhxwcmltdWxhc3Vw
+cG9ydEB0aWV0b2V2cnkuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4Z24QpF2Ldg9WXonihz2KOwEhzKpX3Ru2ykqJVsspwDbOn9458KsLlMBgT+t
+nLfLuikyUIhczQjJqIEV+WM1JCZv2OuQPGxxF8BdOe6t15YX1Qv42Fo3fn2nsAaR
+WeKLRLX7HkP7dLLmwu7e3QI96Knhx2jEh//WMKn+JPume7n0FC4u+Xl9+sDUce+Y
+77s9qQyIbs8GhepB8oCkFAnEw/yD1xJtjqqNRxlGZ1BtdjiF+Vkvu1pRowBLqSkX
+RVaTZksJ3Xn4aV3LYV4JoG0LGoEKg5ckMy2rhZaztDPh1YOL3C3HSmv1z7k1Xayx
+obS8qEgjEEtEomFJS6Yu6twdzCSCYltWe0U9n8jQvTnvfm2Z5YZl7YRh7sr9PC6f
+WYRlK+Lh4lV1OaWbTixTdaKLP/RTgldg7yND+g9FziJP6PeKx9Nsom7YMN3Yyoc+
+xTLWKvvR9M2xwBx7WPMtV4qo4WcTU0RPk0J3+csO0PqN56r7Lz/A+eN+x1xkoudz
+2a61b1O/omoChjRlqq/376c1wkfxAReyZiDMIBpuDmmc+Nj4nA75XaEZudk/N2DS
+hB103+T/OOebjm4UCKnsa+MqXr0Zi6TVF3ib9QnJK137ZXgMqAjjGI7NEPOelXsP
+lKAb/gnsj9ZrZ1k9r9GK3x0AF1qEjr6oY3l7+loodEK1sOMCAwEAAaNTMFEwHQYD
+VR0OBBYEFHWl4UdXYgF5TlednNbPGouWiAfzMB8GA1UdIwQYMBaAFHWl4UdXYgF5
+TlednNbPGouWiAfzMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+ADPz3k5mr5BqX+MA60XxyfGAr2wd33KidzDaK0MO2tK1+KckXBPQh2nUJ5T8fkpA
+zs8GO/ia5HdLewWjsB//rBos62GgFMiIca/ngxPEjmrl7lqSka45cqObrOq9nlOF
+XV+a/drzHwAca6JvZoaoTfC4dE6T0Ic81RPZ81Xn5+TlraE3gRP4+cdzzxTaw2HO
+m04pnlXhyq3LAGauuVFZnxcvPvD04mdinp3b+3l8WO4pD7gNzcYlK7NBmmfAJA44
+WJZLx4/dh1rX6ZFtUJXiT/tiyFKAlK3Cz3v+N/oqqWipRaBhXSHphsm9Yb/J25pv
+AuoqXnavFn0FxXoTGtUD4BfLWcQdIy+ZU6r6llRRv4dym4wBN/o6iv7sU1xFjQsQ
+7ll0wO4FOusyaYHVQyyjkkSbOykbM0cm+3KmAyustLLLHAo3jV4gmkXC98nuzESK
+HgmAjpc72DpkKHhZZ27GfnZLy0d7fQMOP69xlqYKpqFgA2YEbNIJAtFTODQJM360
+d8iSo7rh+vow1UZmLPGNHsGcJDzax18VbQWgDIR+FOHz3il2U7Vx7teMwAaz3+jm
+wfR4nusecrUtoK2PtudwsNKXj6NtWn9TI/L9BijXqnJlPlH953VqftYj7IQrdZ84
+uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv
+</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://primula.lnu.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primula.lnu.se/Shibboleth.sso/SAML2/POST" index="2"/>