Merge branch 'master' of git.swamid.se:swamid-metadatamd-2023-04-19-v01

6 files changed, 132 insertions, 305 deletions

diff --git a/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml b/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
index 677033af..d63dd00d 100644
--- a/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
@@ -119,68 +119,6 @@ R8mUE5/GXIEDE+phas2nY8eQdQK4d9YRTiwXqhvyYE5KOCRp3gSf8QRCEbM=</ds:X509Certificate
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>uhrweb14.i.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhrweb14.i.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID+jCCAmKgAwIBAgIJAKjjMIlV2h5CMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXVocndlYjE0LmkudWhyLnNlMB4XDTE4MTEwMjA5NDI0OVoXDTI4MTAzMDA5
-NDI0OVowHDEaMBgGA1UEAxMRdWhyd2ViMTQuaS51aHIuc2UwggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDF1p7kl8WP5GY71+ushTf3wJTI7jXcHCU/0T8O
-C9TNNU7NAegyUMLfThMfkiA2aPpjTteItun7hEaT+LknonDEXnr8USk4hJGUAp3H
-bJ2VxSoLrZB36wbUwkI6OIzAIHxXfhWb8TRLbpXz0AtSb+HsFx78hqGhAScQS0TI
-LWzhyckWvy0AG0RiGd/b9+m8KyYwk2ikqAFKKX4ccXODTvc8uyTND2ImYN9yXQ1Z
-+ChXAgLD9yKsiuQPQarPg1Mt3OIKY1jMXDgWKW4FvgrnlaKEkMHjockX4QKKF7/D
-tr8XuNQHaeoUXblaLdANJuXWTKOFMyxZ5cyk5MdwDdU0f0nCiZ+wSXJeWhwk66Dn
-HyStYxfVeTuChtQHErMUIo+qC3zb8gmc90F4PJsMCcSP8OwrI+nOsx8aOnany6km
-Lad4CgpkmYtTxC+Q3RdzRe/p4wbaOnvy6pispsnMkCzBQ1G2ndG8NIqyNYGYKgWd
-9V9iZJf/VKa23wNgWkL6JxDHEkcCAwEAAaM/MD0wHAYDVR0RBBUwE4IRdWhyd2Vi
-MTQuaS51aHIuc2UwHQYDVR0OBBYEFAV4G9s/OFg4qz5avteNdXN+sblmMA0GCSqG
-SIb3DQEBCwUAA4IBgQBfW7wCRtaJfWsyh/1HKLYm6tM5s+RXTeXeSE3lpwp0JP5j
-eRvP06X8Vr1gJZIkLWiwgwRtKfTC8Tk4lfVzjXePncouHtxi/4bk0qf5lOSGLFYp
-Gw066DDOvHWdvJZFrZV238KOh0QzwxCf7SirsL4KgZZKoiJn9trI29USANS7dali
-/AP9H2JQCvViNKiojFIkhhPgdC6YxGaWDCkI3+0KS3LyiKLoQNgXt0NVWLC2apha
-H2Vd5U3Wem6+GceCkUMa0GwEJDc50jj45rWq1mXj0swofdSn32Pb/xGNyasy2/wI
-/ueMxTe9XdokuLJ094tnch63aT7dALRWBV8WKMe5fp3nt564d5yVFkFBfRKBGobE
-Lm0a8x/Fwc+gD0h3y6cprFlEjPq+1mqBjrkrzHIGCFgQQKPzLg9c1CQoRaE/tT7R
-GJU3Qc762Lt8F1xWTLw8+Bhxo75wjajp4guwTLbygbzXhMkTnO+dSSQT2QP+vmWy
-oUbivgET2z0Zfrcs8ss=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>bedomningshandboken.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bedomningshandboken.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIICxjCCAa4CCQCKyKhsQJuOvzANBgkqhkiG9w0BAQUFADAlMSMwIQYDVQQDExpi
-ZWRvbW5pbmdzaGFuZGJva2VuLnVoci5zZTAeFw0xMzA0MDQwNzU0MzVaFw0yMzA0
-MDIwNzU0MzVaMCUxIzAhBgNVBAMTGmJlZG9tbmluZ3NoYW5kYm9rZW4udWhyLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzkgQbPG77UHm5R1PUSqa
-RBOWDnSXEtXQriWKg/Rf760O1KOgqnlJ2rRoWjht38sO1/SeAb14KzEiZimO/9v1
-ZJgrV2FEq8zjVPRvYXSmMltzdx8UJ3jbz4SLNcASOnUoay3VxiegNQXAvtM4NP2E
-B+eEvNwr6MuUm2RULVHW2XAXD+TWtf3hSBlVL7fQPHXyngou9nqGmjKOSLpiYk/k
-TK8bPzd3Qh7q5rI3fpj9yGAyGFK5BCF/Fe/isQPk4bf/qv3N1gjR9NHeMDAZ6KVh
-POjzl2qd6h7VjRwWK4cSYB4KA/ERh9CIydnY1oEbK9h96ZmuzageLHiDoZsGnX/8
-+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC4KOo9PINl62jHOjoddC3key+qfFxD
-RIMJkRzDWRtkbEzmNOFdOxzAVZt56Ji8Cot05T7K6x9Vh+pLyeu2uGKT+9V247y1
-hwvA2QW0x8QqjtbUDkm9MEFhInCh3mNGRh9QFskMVK5fZNByXuSIJloQb19pB48D
-whnDlL5OLft7mLy8TGqK7cokIppZ55QnlAHSpuBh6Mm/hcfBBMLTDdj5ydLhV26I
-EGWYSrJbdzVpEMKEE2hlSsuq0rYXH0yk3MHEZbyjeontkh8bJt6PaCCnj817GcnA
-ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SLO/SOAP"/>
@@ -225,4 +163,9 @@ ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI</ds:X509Certificate>
     <md:SurName>Jakobsson</md:SurName>
     <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml b/metadata/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml
index eb428291..d4db89fc 100644
--- a/metadata/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml
@@ -119,68 +119,6 @@ R8mUE5/GXIEDE+phas2nY8eQdQK4d9YRTiwXqhvyYE5KOCRp3gSf8QRCEbM=</ds:X509Certificate
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>uhrweb14.i.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhrweb14.i.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID+jCCAmKgAwIBAgIJAKjjMIlV2h5CMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXVocndlYjE0LmkudWhyLnNlMB4XDTE4MTEwMjA5NDI0OVoXDTI4MTAzMDA5
-NDI0OVowHDEaMBgGA1UEAxMRdWhyd2ViMTQuaS51aHIuc2UwggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDF1p7kl8WP5GY71+ushTf3wJTI7jXcHCU/0T8O
-C9TNNU7NAegyUMLfThMfkiA2aPpjTteItun7hEaT+LknonDEXnr8USk4hJGUAp3H
-bJ2VxSoLrZB36wbUwkI6OIzAIHxXfhWb8TRLbpXz0AtSb+HsFx78hqGhAScQS0TI
-LWzhyckWvy0AG0RiGd/b9+m8KyYwk2ikqAFKKX4ccXODTvc8uyTND2ImYN9yXQ1Z
-+ChXAgLD9yKsiuQPQarPg1Mt3OIKY1jMXDgWKW4FvgrnlaKEkMHjockX4QKKF7/D
-tr8XuNQHaeoUXblaLdANJuXWTKOFMyxZ5cyk5MdwDdU0f0nCiZ+wSXJeWhwk66Dn
-HyStYxfVeTuChtQHErMUIo+qC3zb8gmc90F4PJsMCcSP8OwrI+nOsx8aOnany6km
-Lad4CgpkmYtTxC+Q3RdzRe/p4wbaOnvy6pispsnMkCzBQ1G2ndG8NIqyNYGYKgWd
-9V9iZJf/VKa23wNgWkL6JxDHEkcCAwEAAaM/MD0wHAYDVR0RBBUwE4IRdWhyd2Vi
-MTQuaS51aHIuc2UwHQYDVR0OBBYEFAV4G9s/OFg4qz5avteNdXN+sblmMA0GCSqG
-SIb3DQEBCwUAA4IBgQBfW7wCRtaJfWsyh/1HKLYm6tM5s+RXTeXeSE3lpwp0JP5j
-eRvP06X8Vr1gJZIkLWiwgwRtKfTC8Tk4lfVzjXePncouHtxi/4bk0qf5lOSGLFYp
-Gw066DDOvHWdvJZFrZV238KOh0QzwxCf7SirsL4KgZZKoiJn9trI29USANS7dali
-/AP9H2JQCvViNKiojFIkhhPgdC6YxGaWDCkI3+0KS3LyiKLoQNgXt0NVWLC2apha
-H2Vd5U3Wem6+GceCkUMa0GwEJDc50jj45rWq1mXj0swofdSn32Pb/xGNyasy2/wI
-/ueMxTe9XdokuLJ094tnch63aT7dALRWBV8WKMe5fp3nt564d5yVFkFBfRKBGobE
-Lm0a8x/Fwc+gD0h3y6cprFlEjPq+1mqBjrkrzHIGCFgQQKPzLg9c1CQoRaE/tT7R
-GJU3Qc762Lt8F1xWTLw8+Bhxo75wjajp4guwTLbygbzXhMkTnO+dSSQT2QP+vmWy
-oUbivgET2z0Zfrcs8ss=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>bedomningshandboken.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bedomningshandboken.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIICxjCCAa4CCQCKyKhsQJuOvzANBgkqhkiG9w0BAQUFADAlMSMwIQYDVQQDExpi
-ZWRvbW5pbmdzaGFuZGJva2VuLnVoci5zZTAeFw0xMzA0MDQwNzU0MzVaFw0yMzA0
-MDIwNzU0MzVaMCUxIzAhBgNVBAMTGmJlZG9tbmluZ3NoYW5kYm9rZW4udWhyLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzkgQbPG77UHm5R1PUSqa
-RBOWDnSXEtXQriWKg/Rf760O1KOgqnlJ2rRoWjht38sO1/SeAb14KzEiZimO/9v1
-ZJgrV2FEq8zjVPRvYXSmMltzdx8UJ3jbz4SLNcASOnUoay3VxiegNQXAvtM4NP2E
-B+eEvNwr6MuUm2RULVHW2XAXD+TWtf3hSBlVL7fQPHXyngou9nqGmjKOSLpiYk/k
-TK8bPzd3Qh7q5rI3fpj9yGAyGFK5BCF/Fe/isQPk4bf/qv3N1gjR9NHeMDAZ6KVh
-POjzl2qd6h7VjRwWK4cSYB4KA/ERh9CIydnY1oEbK9h96ZmuzageLHiDoZsGnX/8
-+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC4KOo9PINl62jHOjoddC3key+qfFxD
-RIMJkRzDWRtkbEzmNOFdOxzAVZt56Ji8Cot05T7K6x9Vh+pLyeu2uGKT+9V247y1
-hwvA2QW0x8QqjtbUDkm9MEFhInCh3mNGRh9QFskMVK5fZNByXuSIJloQb19pB48D
-whnDlL5OLft7mLy8TGqK7cokIppZ55QnlAHSpuBh6Mm/hcfBBMLTDdj5ydLhV26I
-EGWYSrJbdzVpEMKEE2hlSsuq0rYXH0yk3MHEZbyjeontkh8bJt6PaCCnj817GcnA
-ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta-NyAsidorna.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta-NyAsidorna.uhr.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta-NyAsidorna.uhr.se/Shibboleth.sso/SLO/SOAP"/>
@@ -217,4 +155,9 @@ ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI</ds:X509Certificate>
     <md:SurName>Jakobsson</md:SurName>
     <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml b/metadata/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml
index 8b806cd3..aeadbce6 100644
--- a/metadata/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml
@@ -119,68 +119,6 @@ R8mUE5/GXIEDE+phas2nY8eQdQK4d9YRTiwXqhvyYE5KOCRp3gSf8QRCEbM=</ds:X509Certificate
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>uhrweb14.i.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhrweb14.i.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID+jCCAmKgAwIBAgIJAKjjMIlV2h5CMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXVocndlYjE0LmkudWhyLnNlMB4XDTE4MTEwMjA5NDI0OVoXDTI4MTAzMDA5
-NDI0OVowHDEaMBgGA1UEAxMRdWhyd2ViMTQuaS51aHIuc2UwggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDF1p7kl8WP5GY71+ushTf3wJTI7jXcHCU/0T8O
-C9TNNU7NAegyUMLfThMfkiA2aPpjTteItun7hEaT+LknonDEXnr8USk4hJGUAp3H
-bJ2VxSoLrZB36wbUwkI6OIzAIHxXfhWb8TRLbpXz0AtSb+HsFx78hqGhAScQS0TI
-LWzhyckWvy0AG0RiGd/b9+m8KyYwk2ikqAFKKX4ccXODTvc8uyTND2ImYN9yXQ1Z
-+ChXAgLD9yKsiuQPQarPg1Mt3OIKY1jMXDgWKW4FvgrnlaKEkMHjockX4QKKF7/D
-tr8XuNQHaeoUXblaLdANJuXWTKOFMyxZ5cyk5MdwDdU0f0nCiZ+wSXJeWhwk66Dn
-HyStYxfVeTuChtQHErMUIo+qC3zb8gmc90F4PJsMCcSP8OwrI+nOsx8aOnany6km
-Lad4CgpkmYtTxC+Q3RdzRe/p4wbaOnvy6pispsnMkCzBQ1G2ndG8NIqyNYGYKgWd
-9V9iZJf/VKa23wNgWkL6JxDHEkcCAwEAAaM/MD0wHAYDVR0RBBUwE4IRdWhyd2Vi
-MTQuaS51aHIuc2UwHQYDVR0OBBYEFAV4G9s/OFg4qz5avteNdXN+sblmMA0GCSqG
-SIb3DQEBCwUAA4IBgQBfW7wCRtaJfWsyh/1HKLYm6tM5s+RXTeXeSE3lpwp0JP5j
-eRvP06X8Vr1gJZIkLWiwgwRtKfTC8Tk4lfVzjXePncouHtxi/4bk0qf5lOSGLFYp
-Gw066DDOvHWdvJZFrZV238KOh0QzwxCf7SirsL4KgZZKoiJn9trI29USANS7dali
-/AP9H2JQCvViNKiojFIkhhPgdC6YxGaWDCkI3+0KS3LyiKLoQNgXt0NVWLC2apha
-H2Vd5U3Wem6+GceCkUMa0GwEJDc50jj45rWq1mXj0swofdSn32Pb/xGNyasy2/wI
-/ueMxTe9XdokuLJ094tnch63aT7dALRWBV8WKMe5fp3nt564d5yVFkFBfRKBGobE
-Lm0a8x/Fwc+gD0h3y6cprFlEjPq+1mqBjrkrzHIGCFgQQKPzLg9c1CQoRaE/tT7R
-GJU3Qc762Lt8F1xWTLw8+Bhxo75wjajp4guwTLbygbzXhMkTnO+dSSQT2QP+vmWy
-oUbivgET2z0Zfrcs8ss=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>bedomningshandboken.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bedomningshandboken.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIICxjCCAa4CCQCKyKhsQJuOvzANBgkqhkiG9w0BAQUFADAlMSMwIQYDVQQDExpi
-ZWRvbW5pbmdzaGFuZGJva2VuLnVoci5zZTAeFw0xMzA0MDQwNzU0MzVaFw0yMzA0
-MDIwNzU0MzVaMCUxIzAhBgNVBAMTGmJlZG9tbmluZ3NoYW5kYm9rZW4udWhyLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzkgQbPG77UHm5R1PUSqa
-RBOWDnSXEtXQriWKg/Rf760O1KOgqnlJ2rRoWjht38sO1/SeAb14KzEiZimO/9v1
-ZJgrV2FEq8zjVPRvYXSmMltzdx8UJ3jbz4SLNcASOnUoay3VxiegNQXAvtM4NP2E
-B+eEvNwr6MuUm2RULVHW2XAXD+TWtf3hSBlVL7fQPHXyngou9nqGmjKOSLpiYk/k
-TK8bPzd3Qh7q5rI3fpj9yGAyGFK5BCF/Fe/isQPk4bf/qv3N1gjR9NHeMDAZ6KVh
-POjzl2qd6h7VjRwWK4cSYB4KA/ERh9CIydnY1oEbK9h96ZmuzageLHiDoZsGnX/8
-+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC4KOo9PINl62jHOjoddC3key+qfFxD
-RIMJkRzDWRtkbEzmNOFdOxzAVZt56Ji8Cot05T7K6x9Vh+pLyeu2uGKT+9V247y1
-hwvA2QW0x8QqjtbUDkm9MEFhInCh3mNGRh9QFskMVK5fZNByXuSIJloQb19pB48D
-whnDlL5OLft7mLy8TGqK7cokIppZ55QnlAHSpuBh6Mm/hcfBBMLTDdj5ydLhV26I
-EGWYSrJbdzVpEMKEE2hlSsuq0rYXH0yk3MHEZbyjeontkh8bJt6PaCCnj817GcnA
-ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.bedomningshandboken.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.bedomningshandboken.uhr.se/Shibboleth.sso/SLO/Artifact"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.bedomningshandboken.uhr.se/Shibboleth.sso/SLO/POST"/>
@@ -214,4 +152,9 @@ ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI</ds:X509Certificate>
     <md:SurName>Jakobsson</md:SurName>
     <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml b/metadata/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml
index 8eb5899c..eadc053a 100644
--- a/metadata/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml
@@ -119,68 +119,6 @@ R8mUE5/GXIEDE+phas2nY8eQdQK4d9YRTiwXqhvyYE5KOCRp3gSf8QRCEbM=</ds:X509Certificate
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>uhrweb14.i.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhrweb14.i.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID+jCCAmKgAwIBAgIJAKjjMIlV2h5CMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXVocndlYjE0LmkudWhyLnNlMB4XDTE4MTEwMjA5NDI0OVoXDTI4MTAzMDA5
-NDI0OVowHDEaMBgGA1UEAxMRdWhyd2ViMTQuaS51aHIuc2UwggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDF1p7kl8WP5GY71+ushTf3wJTI7jXcHCU/0T8O
-C9TNNU7NAegyUMLfThMfkiA2aPpjTteItun7hEaT+LknonDEXnr8USk4hJGUAp3H
-bJ2VxSoLrZB36wbUwkI6OIzAIHxXfhWb8TRLbpXz0AtSb+HsFx78hqGhAScQS0TI
-LWzhyckWvy0AG0RiGd/b9+m8KyYwk2ikqAFKKX4ccXODTvc8uyTND2ImYN9yXQ1Z
-+ChXAgLD9yKsiuQPQarPg1Mt3OIKY1jMXDgWKW4FvgrnlaKEkMHjockX4QKKF7/D
-tr8XuNQHaeoUXblaLdANJuXWTKOFMyxZ5cyk5MdwDdU0f0nCiZ+wSXJeWhwk66Dn
-HyStYxfVeTuChtQHErMUIo+qC3zb8gmc90F4PJsMCcSP8OwrI+nOsx8aOnany6km
-Lad4CgpkmYtTxC+Q3RdzRe/p4wbaOnvy6pispsnMkCzBQ1G2ndG8NIqyNYGYKgWd
-9V9iZJf/VKa23wNgWkL6JxDHEkcCAwEAAaM/MD0wHAYDVR0RBBUwE4IRdWhyd2Vi
-MTQuaS51aHIuc2UwHQYDVR0OBBYEFAV4G9s/OFg4qz5avteNdXN+sblmMA0GCSqG
-SIb3DQEBCwUAA4IBgQBfW7wCRtaJfWsyh/1HKLYm6tM5s+RXTeXeSE3lpwp0JP5j
-eRvP06X8Vr1gJZIkLWiwgwRtKfTC8Tk4lfVzjXePncouHtxi/4bk0qf5lOSGLFYp
-Gw066DDOvHWdvJZFrZV238KOh0QzwxCf7SirsL4KgZZKoiJn9trI29USANS7dali
-/AP9H2JQCvViNKiojFIkhhPgdC6YxGaWDCkI3+0KS3LyiKLoQNgXt0NVWLC2apha
-H2Vd5U3Wem6+GceCkUMa0GwEJDc50jj45rWq1mXj0swofdSn32Pb/xGNyasy2/wI
-/ueMxTe9XdokuLJ094tnch63aT7dALRWBV8WKMe5fp3nt564d5yVFkFBfRKBGobE
-Lm0a8x/Fwc+gD0h3y6cprFlEjPq+1mqBjrkrzHIGCFgQQKPzLg9c1CQoRaE/tT7R
-GJU3Qc762Lt8F1xWTLw8+Bhxo75wjajp4guwTLbygbzXhMkTnO+dSSQT2QP+vmWy
-oUbivgET2z0Zfrcs8ss=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>bedomningshandboken.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bedomningshandboken.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIICxjCCAa4CCQCKyKhsQJuOvzANBgkqhkiG9w0BAQUFADAlMSMwIQYDVQQDExpi
-ZWRvbW5pbmdzaGFuZGJva2VuLnVoci5zZTAeFw0xMzA0MDQwNzU0MzVaFw0yMzA0
-MDIwNzU0MzVaMCUxIzAhBgNVBAMTGmJlZG9tbmluZ3NoYW5kYm9rZW4udWhyLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzkgQbPG77UHm5R1PUSqa
-RBOWDnSXEtXQriWKg/Rf760O1KOgqnlJ2rRoWjht38sO1/SeAb14KzEiZimO/9v1
-ZJgrV2FEq8zjVPRvYXSmMltzdx8UJ3jbz4SLNcASOnUoay3VxiegNQXAvtM4NP2E
-B+eEvNwr6MuUm2RULVHW2XAXD+TWtf3hSBlVL7fQPHXyngou9nqGmjKOSLpiYk/k
-TK8bPzd3Qh7q5rI3fpj9yGAyGFK5BCF/Fe/isQPk4bf/qv3N1gjR9NHeMDAZ6KVh
-POjzl2qd6h7VjRwWK4cSYB4KA/ERh9CIydnY1oEbK9h96ZmuzageLHiDoZsGnX/8
-+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC4KOo9PINl62jHOjoddC3key+qfFxD
-RIMJkRzDWRtkbEzmNOFdOxzAVZt56Ji8Cot05T7K6x9Vh+pLyeu2uGKT+9V247y1
-hwvA2QW0x8QqjtbUDkm9MEFhInCh3mNGRh9QFskMVK5fZNByXuSIJloQb19pB48D
-whnDlL5OLft7mLy8TGqK7cokIppZ55QnlAHSpuBh6Mm/hcfBBMLTDdj5ydLhV26I
-EGWYSrJbdzVpEMKEE2hlSsuq0rYXH0yk3MHEZbyjeontkh8bJt6PaCCnj817GcnA
-ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.nyaanvandarstod.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.nyaanvandarstod.uhr.se/Shibboleth.sso/SLO/Artifact"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.nyaanvandarstod.uhr.se/Shibboleth.sso/SLO/POST"/>
@@ -214,4 +152,9 @@ ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI</ds:X509Certificate>
     <md:SurName>Jakobsson</md:SurName>
     <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/metadata/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 009ab894..8a1df54e 100644
--- a/metadata/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -26,14 +26,39 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://box-idp.nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
+          <ds:X509Certificate>MIIEtDCCApwCCQC4IVr+uQQuQjANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDDBFi
+b3gtaWRwLm5vcmR1Lm5ldDAeFw0yMzA0MTcwODEzMTZaFw0zMzA0MTQwODEzMTZa
+MBwxGjAYBgNVBAMMEWJveC1pZHAubm9yZHUubmV0MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEAt4jNjYzRt6Ljqma3G+Z03rivSGGsVC1kYmMAE6/U+n6j
+LT9zL+m8L+Sc6hZYInA/STvrGCNCvk4KCveO3ZFbWjANicTwOxzsYxgGH8AddO+4
+KVmxfGjjkiOHZ1JuNUG8xQKMaL288kye7ueZQs7gvPT2P7J0TUcif7mgQfTjrsNv
+oNdCMRqHnYJUpxqdFpWNX9mDUJgxG+DeFkn4DuVE4UfSpkg3VCtq3TPRcr0+adrT
+C/0dtFd/ocw956ATOuUqXQtrSqWrIA1bFJePmWughAfGYob+W2tJe3PCsy2uiJew
+Osz/KkK/Di+fFsZXGL4NOwwFww2gglnbjmQbTGxgYTFtEWmHa5rN6NBR9+YQkdQv
+AaH21jgpB7fxNuUrzLX38WV/O3abYAv0ndJxgR72AR8rD/lI2dNVglNK+JLtSDrg
+sehhdJQYICyAOsg/+EKvB84V+f8g5MnHsDaq+ztiQYx1xF9K5qV0NgqRnDBoBsIW
+CPWnFU2Hujd9ua+6hCMp3QFXjb6PJXnWbXJR71+U0xHlwLUV+BDDzxm4XPn3VGCp
+WiH5WIf9gRdiwO4CUWjBHbHqrkJDfl4/qGzUFSdDSxoNvior82QfYLGj2UlDmey7
+GpFZatwWxGvyk226qComY0YRddD0WDEkjzKSiF0BIv1PAEyYWjaUyst4dfULUr8C
+AwEAATANBgkqhkiG9w0BAQsFAAOCAgEABC9jC22UPFbcwIOCSbBPfnbztm4rywbi
+xbtoZzpwV2tb0XKSjtVMobuoKhQIO7rQ73VkqZWvM199msZ63TEQiKaFYZU5K4er
+Ffh6e0FXh4N86CSGIeveXxOwJHKAzgOTHKWTuoSbJjMnzlTkqIs0xhWn39n11mz5
+YXxWwTWdz/+Om8aGt3IPSTpYhMgVSXMWBMf7qnWDkmT93hNQobWZRmINVsxuHLke
+Poi+/ATtBjsX1X8B7tZUYbSNrnWhVqqcuY8APmWDdCfcbDMrEkyhzQH6Rc/NKvE9
+jQRdj4FP2KTTNbUr2WNIzAFDi+Ob7zr8olaSBOgrdX+GGopsyUdJnaP7NYk9QUfs
+U9e7c4yPKi/JzNtRg1/XjRQrbsso+sQUz44T0SX79cupLBF0v4UI7Rxe47p7cDND
+Kr1uWiRowvv8rr1ulviclpMre94+HX6SiVtYNc1Kr6DznJX9Kw+rFKRgTK49NIt5
+XYW11X9JRbQHE70hDBR73kFDxzgs7DXyVDi9IqAteFxhluzrzj8AYFt6tfonH9HK
+0oYU7JRdwtwdMvBbsTTxN5H2gp4iED98u9nhk7XFMCTnJCSO+FrQ7ZS4udNP5vTH
+ihiRBKiRcgah+zDpDdvXr7ltKiSZSZ4HkLOJnPG4sN3Pbp58yCqAerAvxW7UN5Wa
+fbypb1DOrVI=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
diff --git a/metadata/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml b/metadata/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml
index 3aa3bb5c..c3a08699 100644
--- a/metadata/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml
@@ -176,72 +176,102 @@ wg==</ds:X509Certificate>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIVALH78yF625WD24SZwiOcGOOvPZ27MA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwHhcNMTYwMjA4MTMw
-MDU0WhcNMzYwMjA4MTMwMDU0WjAeMRwwGgYDVQQDDBN3ZWJsb2dpbi50ZXN0LnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0IVKOwzztzBHho99
-3f30KUTepy2rO3rbZCjrLRKmFwXE2+1jXN5Ox6xvwcJxgt4UYMkyu2bEBV2fhJgc
-nKYZ79jn/LRY6SuqII+IjDPluAbJJpWDkjMkE4gaWjgGa6+Smc083cKeDYor3qH3
-crvFPyOHAh8G7NedEvx/n6Q/lgkwcYzVNTH3lObA+IkpCmfwgrWklZZuFruItbR8
-WpNcdV2ZVb85IPSiFRNUAM2YmlXoF82hcwowNQXwORF4QVzj/KaB/LTp/ptVL4Fp
-YJseNRuGk8ZFbDFRUzzIt4l62AYJwUJ1ELoKtI9nR2VTrcAg1XML2EN8SypcWvmu
-es4cfQIDAQABo20wazAdBgNVHQ4EFgQUrFYCH0GaHu1iWwdjpRXQZ6nUi/gwSgYD
-VR0RBEMwQYITd2VibG9naW4udGVzdC51dS5zZYYqaHR0cHM6Ly93ZWJsb2dpbi50
-ZXN0LnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBkE+0t
-2NdsLrAFltZxcaR8fBcgH6Ps4qY4jCAHcXtvj/XZ6oW6R/8V7LLRMhhfkkwEVfwP
-dxGQzFzjn+XdFEKf1AF4d7kma6GnCAexYUggEDnc3RHlE33MvZHhMUa+qgidb5Nc
-z0XSLb/uZVeguusT0lBnVj/4ZChA4nd/JIkTP75XMKJ51b+TS9+i5sQLPVR4D/+e
-pFe422nJTV+yciVwKsuHmu3br2DEtgSSFWGilvGDdlfBAYtUDKG1DL2AVdI3ikZa
-kCyta/hzhS30XO24ZrWeaPKGQri48PsZufzaHcjcVw8IRY8HI226xFya7F8AbGZQ
-qK8gNoxLpQOHlY2i</ds:X509Certificate>
+          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIVAOozXeL6OV8Cp5Hn+Ypqd26TK1YiMA0GCSqGSIb3DQEB
+CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwIBcNMjIxMjEyMDk0
+OTAzWhgPMjEyMjEyMTIwOTQ5MDNaMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3Qu
+dXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDB3cxJLYBJFYie
++hyGm9AL4qGTd6QgshYPVsNDsOZkQmGrZJf+u4oJ1zZzPyGg6fuVYkNz6VibmSO1
+jtK9ZjgW/Vq+ovV7gODux2OphZK3ghq96C3zuMw/oKarlHvrIH92rZR4slYBnbhZ
+3ox0kpOjQpiOqw8nHXLfWgrkEnSfdEPZyygleYUXdlu5sLVKJmuWtdmCtxAxFjOF
+I2cKNQ2ha7HIMK0Pn84opmGDa1akSF5xnKq69IdM6gXMRl4CR5aD1NykAT3txKGp
+L5FrsEOQ8z5wlrQEqDxfpOiAaIoyppnXw+hmk+qvGuyvVp3xTzIZUxWE15o0iu/e
+0GIxwt4axPsxeEE2+pc/MzRTb59v77uonDjacA8p+S38WL7s9Mnf+/RhdL85c3Eu
+ZwdYpM2Jq0ylhUxVzotC4s0ainJXZux5R9iE0vibl0/DdCLaM6u0MJA51xyCvSft
+Wk4dtMVGURMekycmK58M1rbEk6AB/EoqGuf/FDjCJAFESaSCSUXTmZPBLeDqXw0x
+nmsIJ6fGbw11nCUBAAem0Rxgem+QbCTJ5uGL97B5T1GkuWCeWfJygm1nyO6Ooq/G
+B6rILemZMxaO8LXPJYFG/J8/y5OgHlngUypMUBYSETknMW7LxisfUmcR29TSm+aC
+7oMzvBl9IdMwxrspHqgFUFn/BXPllwIDAQABo0EwPzAdBgNVHQ4EFgQUnVNUm7R3
+YqjmTZVTXk8Y3LuU0d4wHgYDVR0RBBcwFYITd2VibG9naW4udGVzdC51dS5zZTAN
+BgkqhkiG9w0BAQsFAAOCAgEAA0lDX5UhY9+QnUBusyhRFRZayfrPbtmUz18Q17IA
+t+tx6N1rxY0Tz1QQR0Mn5UNgIguN1bK64Q0I83P9Nf90IlWh0Grn6RZGD8y/ugVA
+r3DmvzsNLL+IPd2VBYUvxH0Wnple0L8qtd75FncFSflXPUrfaGSSMRqCdXZkMJRg
+HC1zZ54JKm6amGpl6Y8GoxmdlKrz1IPyBMzJtwg+n2HBcTCBj+I6vu29Ay5EIQF5
+Ll3Mu5h74lEw6YGvZJXQerKQHqeSjZzNV3z/nglx7jRRniDsLNoajHivfS4HZ+Sf
+Yzf2s8t+o+S4ynznFef14teuvcEm1oTXrVDaTQGkt+rikAGc6oiW8B3nTNBOSqwc
+XIp5PRBG3hI+GYITWin0vlOd3nGjpcFdAmwIv3WMXNCdbEnSB0sFGJ95ETe1wpRy
+Fbh5HopSoyG4ZwWALsMF7McxWchcXMn5HVDMow9l24bZgZ6O82q2iVSxV9sede0m
+zwXL4xZC4+BCEpN4Qou6NOwIcNiJe6ht9XR7GJi4CmkOIm29SJYSaTCIiI9s63Nn
+kf+gk1HWIZNC2UoCEnKreFyBik0/PlVMQCnRsCJ75i27auZQ2H1Xxlvi1dUGRX/k
+5Q5UDC04tj4SPHIGX/mBTRSqhHq9KEr752HtZ97X32AV/QvvGPgDKJAD9y8Xjl+/
+pvM=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUcIyPpnhtGppaMvJ1n+26SdVOQRkwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTd2VibG9naW4udGVzdC51dS5zZTAeFw0xNjAyMDgxMzAw
-NTFaFw0zNjAyMDgxMzAwNTFaMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUu
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMszKAiwTx/7loe8kP
-nDObgCx1N3RgE4X5Eau8e+cPXIeUZGO7MFidEH5jWV0/ZYAUQN+dy+pSpstyZ3MX
-pW7XkJi9t4ttj8CtFa3sZTrzjsrIiOcmFqHYoKzzZ6b0EKdFyGKORNE5flHrVpUG
-6P709YzxpzMLLEcESpmQwtpm/ILxBM4IPhkvOk6f8v0QbZYC4jo0BTHWgdVgyju9
-CzozhQcCuCU4UVwNgen2P+kIFoXiQybUE/yxgBih7bHFto5Mn5oBsE3mOLe0wHA5
-nL6ZLR8Atzi8nC8YOsV3UB86BIoYWgHBJKPRg2z6UhCgbMJxMfCXtYAGxUM7kTKi
-7kJ9AgMBAAGjbTBrMB0GA1UdDgQWBBR5vMupHMEppHPF0vcF7zsykH9LujBKBgNV
-HREEQzBBghN3ZWJsb2dpbi50ZXN0LnV1LnNlhipodHRwczovL3dlYmxvZ2luLnRl
-c3QudXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBABY3Iinr
-k2pjQFB9VhWb0g/nS2NCU0ipnPmHNEBIXIHhwBe1W3QT2tEcSuF2K4G50v5tjUnY
-DfLVqbWtEfwUG0dz25K5Me4S2Zm6AIITYulVv6j0fdIAiLgDwj/Hpg3fvZtbVtkb
-QHOEryJY6wvvI/zwpyOSkOSTt3qFQ3ZnS40wCs34wP/Hj6cHtkrl2OF0XA5M6yU4
-1kAk9gpaiX2Rhapn4W9V3p6CgpXthk+b8nwQeZ22KeG3ompceHJ/+nmS8G63pq56
-efRdH5xJNjTPu6mVHW9W+lW83i7mGlmMJAgl+qjTECSKXe9LcyYMsy6IphbVsDbX
-zMHQwjf5evdJ6lo=</ds:X509Certificate>
+          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIVAICbe3fw3n2RGDHeB9OH0RlskUMCMA0GCSqGSIb3DQEB
+CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwIBcNMjIxMjA5MTMz
+NjE2WhgPMjEyMjEyMDkxMzM2MTZaMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3Qu
+dXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyWTJfQh39HiWi
+6azP70SmmDbxD8U3Z89mvEy3tiZihNmb/Hb2Jcqp8E41QzPDjTx9j/6scUsHWmcZ
+0Sq4FozzjH0KOO0KxCt26zib5p0ue5auVnGLoRuRxFZMPO4qN3nOUITf8GM7H1PF
+MsD/HLJ0XlCqbSIqw9563t5u3vxrj/FomBEMe1HbzYTnJgoYE5E6dXXVpC/LrsQB
+WCAR+1yyR/eA8U2/HL6P6TGW8++QqvS2SbRPO4VwD68v8NWPLuCfBCEQ7KlrfHJs
+W1tAveHp/N8+BR+lqvScNuY8ghVPySo2t/UsEJlhEzIOEAuVygX8NTqFVL8TdMYa
+nGM8xXAKce30fi+XlxEc6m9yDAPSmqCL71ilqKib2f9vuNSvIOmVhxf4FKRwbQ+0
+ck4AoxAZj5+fpTTWo6gMDvKlsZ5zEXD7Oj5sAmtYfc0MzGPZMiq9XVkTh0sjkj6b
+zueHbdYd5/hC+482pO3wdz+jYiII4G1Pdg9PKtvc3m8U2JdvQCQ1RzHxWvi8vNAM
+Bw6UbHHLc9Rewn1X9/h/ZYw0ONCilm5sGMTLBZ4+MWHiCaapzlgbzWOci5JrOBsX
+Q4AbsMmpOyXEZToSossEDWGX8KGk/d18VXYcNz4cICADzcEcq/Ss5ebrr6Gas4AP
+yXkCmm2paQ1J6XYzUP9UTKNh4Q7l0wIDAQABo0EwPzAdBgNVHQ4EFgQUD69sMRfP
+2s/Gwjt4Xgbn8xSD4ucwHgYDVR0RBBcwFYITd2VibG9naW4udGVzdC51dS5zZTAN
+BgkqhkiG9w0BAQsFAAOCAgEAqSAOUB90iJUUz/4e2SWzPAY8/g2Um2y9aLMPJ+Zk
+NjrvPxtdhMIpT7eTUgUbj0MGDpfb9ivH//GNUBmu4Po7xFbeURZYxP9UyZTzCsBe
+sEIEGGwrgzEzs24dfAHZ98Ywsmnbt6on52JKyxW+pI4a4M4EbwV5oDGy30LEcUFZ
+zTF2d6jQ+wz/jMYXv3n/3sGWdyLgACgao0uOwLcNSCJrEcjBUA/AYuzz69krSXrv
++8MvBrCsNSzznO36JeaNnxP+6td+7SKZeziz5PRk7FMw7iPd6qgCBGPXA7J3thh9
+WuT+mOW63xvMe4zKrw4LdrU0ITFdmaWt8kbDg3kpaSFarKq4YAYZQEIWBRkOxMr5
+dS3BMhve/brs4Ipm1RdQg5qbJ1Xt2PhyaLw2PO1GZexljJw7PFCMsAid2aCAC/8l
+ttE3+f9gVp/hBjPYRTKp3m4iizjqksuGt/kLMyQNNM6RrkIM271IkjRL6ZJLgRHB
+lEAGnbWyYxK9CP+ra633OhBXhpuvl0pNgM5YslCvzklEgrSjjBqf5bVhoap2pvWc
+yHCvcq0zI+vfLe6LO/baWYcQ4C8Ch8GSwi3ocuWGolZryzqYm+4Af4z3DzOuvtrk
+wxWO4Lb1VkqJEMDN50c7o4X0V83icIAiiGliuWjQo7B26TyV8QPvJH89Iqsp76kP
+Mlc=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIVAKxjuWw/YZpjuyfHWcbrDOP8tYnkMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwHhcNMTYwMjA4MTMw
-MDU0WhcNMzYwMjA4MTMwMDU0WjAeMRwwGgYDVQQDDBN3ZWJsb2dpbi50ZXN0LnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiF3dhy69bCTFrcPd
-MOKrp8e8XH5jld7KhPAplQQHg79oAzAE/1tn6a8pD0ZqTVqBXTeZKyvKwICa2kbw
-ZcqBQfyqI7IWmgc2u+PWal0JXod5oDXQ1Uw/6xq5InTuoIlNLIpKolaJtr1cANRg
-acTrgIrV1B3cM9PbkcP6EuQpxenWT0fvh3kxesZraBTyy/LBhPZgqsKRcyTX8dOk
-yKLY+bfUCXidlI2juymQ7x0kenDF09B8khRkYr4rmV14wULzWVHfsT9wQEJvlIbx
-ajz5DCqX6wB/a8ik77GdLJP7h7BkStd4+kJ2aCdnsn4qvhXwCCC0oz1um0rNpP1g
-xcxEXQIDAQABo20wazAdBgNVHQ4EFgQUK2d6JMehLr6T8WAM1I9i+rz9Wh0wSgYD
-VR0RBEMwQYITd2VibG9naW4udGVzdC51dS5zZYYqaHR0cHM6Ly93ZWJsb2dpbi50
-ZXN0LnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA18KzE
-t7EuR1DEmAKtqndUPWuKnds2qhur2HRyETgdXh3qfczvgZLnnhNXI0c/M54CYJb+
-7Tc0f5Pv1cV0GmKkfRadEzc0qSiFrn1t/GhRTakzRprh3JxtT++ZstJzf2/nD1PK
-Oktly7qvWX0Qrh0yYfHJaI/WPVxH4jI/1jDwa9Am/jJbOW/uy6s14zjXswi1ZKd0
-EPzW8pfIR9H1gDAU5hoLuGjWF7NIqmRCfYE6n9/oEZfET1dG3zUpBG2EacmZDv8o
-CIpvN4bSlO9wP5fnymBLt+DxfMdmN973aeU529su8I3uj3Q4qaDBk8zGTKFx82Ae
-dqPteAxhBzLEflg+</ds:X509Certificate>
+          <ds:X509Certificate>MIIFDTCCAvWgAwIBAgIUH7lJvGXYI1T2xTTamSsNEYnQLFAwDQYJKoZIhvcNAQEL
+BQAwHjEcMBoGA1UEAwwTd2VibG9naW4udGVzdC51dS5zZTAgFw0yMjEyMDkxMzM2
+MTNaGA8yMTIyMTIwOTEzMzYxM1owHjEcMBoGA1UEAwwTd2VibG9naW4udGVzdC51
+dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJnMN90M31UULC/+
+v65NZlHGfPV+ZaA4zkfKLDDeb6RXN0lYf5B0c44NoBWsYz2lw03ybOnS7kHnFoP7
+tOWbV7k1F89OxfEFQBPEtBDDAVnAFVDziiKVa+MSNJTw+zIquIkIMrQSpt6SOGtT
+DceouMbSugIfSkDjMwxU9/riqD2OX2Qrcq2GYrjktPcJMW0117BWhuiri98Xwwnp
+QT0/ocJ80+TD6JjwLQMQHK2dnwxD2iuo6zJ08Ta8/yHjG1Ba+HfONv/tZh8Ws+U+
+HBOFqu1JDdqQ5j7Dq/IpsIbUPdalq8gGezfhuKNpQo5gfU6/lR2RcVwMn7LFcvPY
+WBXorxw5E3O5kNrIikkpkF9XeT9BCM9qe5nNhWGUdi+meNUDc6bk8PQDc4SGpAaZ
+HkbMTK2SaF+lfahptK26N/tGOm9NJw2GdxxrAD5BV/TEntEP65o2DoYQiwH48oal
+YEhjBACxaTIJ0ABAnu84ALVc3fnkr+Ut1KpThBBlShgHhTTkTtb8ePvY4cSNM7JT
+oz3SHrC6euOU0ymylriL5l3/Ykbrmj30R0CODqEpS3H86QayTlFsbEfEBspyt4A6
+DCG6T/ffv7rFuZA9g8KI7Ij66DKVN0qNGjpzrDJ7vXHSvQWF8Nmks6C5ObG86urm
+kCw8XInhwZWfKl5P2do+9k4ZrNsNAgMBAAGjQTA/MB0GA1UdDgQWBBTT3CR5Xgq8
+arikWESjPOeScbtzZzAeBgNVHREEFzAVghN3ZWJsb2dpbi50ZXN0LnV1LnNlMA0G
+CSqGSIb3DQEBCwUAA4ICAQApfZe9FHb9J167742VpvyAeqAjoLmhZ/ntNnGRuKJX
+zvBjpT3Sd6jV/si1NWOJhHwKZfO/clzeb9KD/ev1HzlXrjebUqEEqN7IHoKilKik
+HDqmmy14fZQDNziynZOr21Yjl7vCvnFPJar2OkvEHvaCcgyPffC4RxsudSazmdCG
+lmpGxu1q3lmo98jcJ95wQZaHDazf+vHazggFZ7bsJIOWoFjez/+f55hbcmgK9maa
+I1txAnCv+YFR9QdDqlhBkRFzQh50O/3H0QtIR1GpMQvxu6D5boHer52H58sl0Fjs
+qDdtWrVt2BgG1SvV0tIGmIsYhYOTyFMbx7GC2xKeAlzPmWG8YkxWVMbV2UW2mLdf
+m7nInJ+xjzkhXWnTNhAiJ0N6lRkL+qM3/Op++Kvosm85rNir0a+EQfmHo24OeGFB
+NQ5TG6nRm/lgJZYi+qR/wrUCcMgcVUskR/5kx8yfpNo/nCRRLtN7gBLQ9i9cWgOM
+MBsmL/gYjA6iL3I4pJI45Whf/GpQeScVy5r0dZ+7nm1RDVeu3yQSi48w5pNw7iwP
+CZ482+s9c86tsyhICoAzgxnDZi7k/Ryeo1WPBMQpoA3t6PsBmzWosKPROoQgE4Hm
+yA69eCEPQ00mQIVuVC1wY66PHwO7wPgTvqE0UIgTOEAewX4iHT6VY0VSpmGFL5kH
+wg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>