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

1 files changed, 5 insertions, 62 deletions

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>