Merge branch 'master' of git.swamid.se:swamid-metadatamd-2023-05-15-v02

2 files changed, 21 insertions, 60 deletions

diff --git a/metadata/swamid-2.0/client200-180.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/client200-180.its.umu.se-shibboleth.xml
index bacf4a7b..f8783119 100644
--- a/metadata/swamid-2.0/client200-180.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/client200-180.its.umu.se-shibboleth.xml
@@ -85,46 +85,6 @@ qscK/31PTSSGo33JG7zIlKjxqKlzxLZ8wBCJhQxcd/u3yw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>client200-180.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=client200-180.its.umu.se,OU=Its,O=Umea University,L=umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEHjCCAwagAwIBAgIJAO+6bhtdEJDzMA0GCSqGSIb3DQEBCwUAMIGjMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDAR1bWVhMRgw
-FgYDVQQKDA9VbWVhIFVuaXZlcnNpdHkxDDAKBgNVBAsMA0l0czEhMB8GA1UEAwwY
-Y2xpZW50MjAwLTE4MC5pdHMudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0b21teS5s
-YXJzc29uQHVtdS5zZTAeFw0yMDA2MzAxMjA4MjNaFw0yMzA1MTQxMjA4MjNaMIGj
-MQswCQYDVQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDAR1
-bWVhMRgwFgYDVQQKDA9VbWVhIFVuaXZlcnNpdHkxDDAKBgNVBAsMA0l0czEhMB8G
-A1UEAwwYY2xpZW50MjAwLTE4MC5pdHMudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0
-b21teS5sYXJzc29uQHVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMEQmp0ZyqP2v7SfvMdho7jsc5WjNSnimA58kcArO8EfwR3X9omh2p5JrU2+
-kK6pSi7t/go2RMUrIwh7J5qValnHOXrEcqV1YNdKVoGvpK2TfWbnPux5h9nLZrz7
-F+0qcTARoTXguWT9w1lyMlTXyKeOdBzt/GYn9QQdwsa3R54/0UbLaVrmMmw6Vd+x
-YLV+rgH1NtBgJoOs8T60MR7Dp5uUWsIiwzsg36nES+O4jwLK13QcULT7tHNjnCc9
-W1MobFiRygx1Q9jazu8M2pOYapdpzK/HW0TePUbralH/esE28G6+eyURW4Xn+HKM
-yRUfWWlRKlqJ7xhjiKIT6ep6zMkCAwEAAaNTMFEwHQYDVR0OBBYEFB0Jtm/vVvnu
-lMRVHWeIkP0UhSK3MB8GA1UdIwQYMBaAFB0Jtm/vVvnulMRVHWeIkP0UhSK3MA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAp50pKtGkrMQF9PF1VP
-jkvhVIcl3Y5d2q70Mx93D8WBJQ4SQQe69jrb46a0ibSwaLbB7HF7HQGxp4OyCFws
-fS5j4QzPQ0XadC/IOtImNw//5DeWrg1vfIcpUzZDHvLfJU/oBMoEn8rCAzeTMXb0
-SjwKHVcRVPOoySYkRM5fWua5YtYxwti/C4ImIbzi7GARUb38xYfiG++q1mh4FYXO
-Q675I1jKOy01pMekCFPZLm6D/aRXAKCn2p005ZijSzMpP3ANmmBGNXG+gCUl4AIU
-7ueK0/KDQXTKFbJAmunqMiY1ehllXiWLrJHPtzysbf1eEJRx2W3MOB6DM1I87Ara
-WjY=</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://client200-180.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://client200-180.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://client200-180.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
diff --git a/metadata/swamid-2.0/staging.ilabsolutions.com.xml b/metadata/swamid-2.0/staging.ilabsolutions.com.xml
index 476cb1bd..691d91a4 100644
--- a/metadata/swamid-2.0/staging.ilabsolutions.com.xml
+++ b/metadata/swamid-2.0/staging.ilabsolutions.com.xml
@@ -26,26 +26,27 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDszCCApugAwIBAgIJAOW6g/ZI7WPPMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
-            BAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMQ8wDQYDVQQHDAZCb3N0b24x
-            HDAaBgNVBAoME2lMYWIgU29sdXRpb25zLCBMTEMxGjAYBgNVBAMMEWlsYWJzb2x1
-            dGlvbnMuY29tMB4XDTE0MDEyMDE3MjcwM1oXDTIzMTIzMTE3MjcwM1owcDELMAkG
-            A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxDzANBgNVBAcMBkJvc3Rv
-            bjEcMBoGA1UECgwTaUxhYiBTb2x1dGlvbnMsIExMQzEaMBgGA1UEAwwRaWxhYnNv
-            bHV0aW9ucy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZU9um
-            7a49WYTc0MMT5oa471l/Z4vP7rW5uSO7DPqKljTWgeWJIh3mIRNLAZPevWAm9Oek
-            /ed0YwWrxfTjFyw1vZxTZnEJnj4YT1cWuIPZ6ySt8K64Ffpsp5b/Jh4w1WhIEX/Z
-            h4QL7mRn7bIHud5CxQUqkHYniQ7tOUUoMBrRqP5qeLRM5Z2N6NxitlY19HvgF+3c
-            g4VbG9qli9n2TosxT9Wi4JUzxOp+aZOTAd6ZoHZt2TmuBpmlXdSCyI7nJdL0IMuW
-            uKNBJv3kjWVBnaEy1sO7vTEqhU4BsyFhy5Vmmk45t6R60Jc6g3gwhYSf91g+HAex
-            acZH2w5mFoH09UnPAgMBAAGjUDBOMB0GA1UdDgQWBBR+jcWQ3PlQO19bpBHmiy0k
-            MvvPWjAfBgNVHSMEGDAWgBR+jcWQ3PlQO19bpBHmiy0kMvvPWjAMBgNVHRMEBTAD
-            AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQC4l4hxp8qI4aAAiefLfeNiYgtE450zp7gU
-            L34GclxOaxHKmIXWvfwo7j800sa1FKw6zzmTFLgl274PGv5wR7dJ+WHcobEVmebt
-            UJ6+5rH2YJT4+P+OzoTH2vE4s8Q2gUHXae/EElqBKzSg3do4JUhMM/XuUje9YAoC
-            rNrnY6VeTf0CZDjjjX2d/VuPFDurWhRGfg75GNH5Olim3M+Ij5EcWRzH78PHaXw6
-            Qa22dJ+S0lKD+9e5eALpRkY6bphMaKY4m3iv+LlKYWM2MmltJupH2JaNSB4Bd/O/
-            roIPWP/W+TmXHDWcfq1+TU3sWlCneIcDmtjZBfmVDWwCeYRvMML2</ds:X509Certificate>
+          <ds:X509Certificate>MIIDwTCCAqmgAwIBAgIUDIhodECrJO3Sbt7CowTbTxbmdQ8wDQYJKoZIhvcNAQEL
+BQAwcDELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxDzANBgNV
+BAcMBkJvc3RvbjEcMBoGA1UECgwTaUxhYiBTb2x1dGlvbnMsIExMQzEaMBgGA1UE
+AwwRaWxhYnNvbHV0aW9ucy5jb20wHhcNMjIxMTExMTgyMzQ2WhcNMzIxMTA4MTgy
+MzQ2WjBwMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVzZXR0czEPMA0G
+A1UEBwwGQm9zdG9uMRwwGgYDVQQKDBNpTGFiIFNvbHV0aW9ucywgTExDMRowGAYD
+VQQDDBFpbGFic29sdXRpb25zLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANlT26btrj1ZhNzQwxPmhrjvWX9ni8/utbm5I7sM+oqWNNaB5YkiHeYh
+E0sBk969YCb056T953RjBavF9OMXLDW9nFNmcQmePhhPVxa4g9nrJK3wrrgV+myn
+lv8mHjDVaEgRf9mHhAvuZGftsge53kLFBSqQdieJDu05RSgwGtGo/mp4tEzlnY3o
+3GK2VjX0e+AX7dyDhVsb2qWL2fZOizFP1aLglTPE6n5pk5MB3pmgdm3ZOa4GmaVd
+1ILIjucl0vQgy5a4o0Em/eSNZUGdoTLWw7u9MSqFTgGzIWHLlWaaTjm3pHrQlzqD
+eDCFhJ/3WD4cB7FpxkfbDmYWgfT1Sc8CAwEAAaNTMFEwHQYDVR0OBBYEFH6NxZDc
++VA7X1ukEeaLLSQy+89aMB8GA1UdIwQYMBaAFH6NxZDc+VA7X1ukEeaLLSQy+89a
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGuDA0I57hlgwQep
+JujO6yRiYmLvYaxvCE6Ha8A8McZKMkvVq/9VYSYJvNKC/Poq2C43xZdpDrL9ImVz
+8rlMNXnguoXPFqZC5cwDrztKVRKoFf4r3eJMX3HrDtaHKb2AHTf3FmZA3FdcLtVU
+U2t7/ZE48Tb7X/mltTUOBzSvXPNdriXHO7ux0zY70wB0eDachn2p3eRbDE8a/CE+
+c9LzmIZrLzlO/uVICJNUCwrEVcSl0Rewcte/gt0bmuSmImHEExIm9dvDS5NiLC5q
+yvMuqMFalTOM0LJLmdFL+255NSpfNITy0w5nRf3mhVu5HvPNl6SK1OSPMbDtrLx6
+BA0P+f0=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>