1 files changed, 83 insertions, 57 deletions
diff --git a/metadata/swamid-2.0/lab.uppmax.uu.se-saml-metadata.xml b/metadata/swamid-2.0/lab.uppmax.uu.se-saml-metadata.xml
index e55e7419..6828fe5a 100644
--- a/metadata/swamid-2.0/lab.uppmax.uu.se-saml-metadata.xml
+++ b/metadata/swamid-2.0/lab.uppmax.uu.se-saml-metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://lab.uppmax.uu.se/saml/metadata">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-11-27T11:06:46Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-11-27T11:06:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
     <md:Extensions>
@@ -28,33 +28,46 @@
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFCTCCAvGgAwIBAgIUYCurhnVgIC82fRcKAZM1XrBxa0wwDQYJKoZIhvcNAQEL
-                BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI0MTEyNzA5NDEwM1oXDTM0MTEy
-                NTA5NDEwM1owFDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF
-                AAOCAg8AMIICCgKCAgEAzdtHDctudVHxvNzCMtM/lm5/gzMiWpiBwr5LZXPPjA5N
-                szV9wFjsQkh8LcHFwDJrnWgrtw17ccqjWa/ey0eea6LZmswfyjKaIJUf1cZvvBW7
-                FOwkLyj4VVHmeRBGSGurfzb8ux6ioLQVfNp3vj8QlcnqmRCdkdddOMg0XJY7uJgF
-                OHtTDEu7MxgECjEA8G3J+18XgazvdFtq+uOEWk7dWkQE7L1D8W+Ye8hqZorlJIKC
-                l4fgKG3AJ2R0pZ9KvsPpUOKb8AyixJYfNvNLbBySWSVQ3zrd+uFkKrbe+aTqQMHC
-                np7OtZFbF66LihTUID/67SVI8Wp2rWClsYooagWG0845TZf8EEVmrJv2e8RffOkP
-                fCJ/ZZbPbOMm3yz1prlf1zOBptkwnYdJM8b0gbV0162CSfx62RaWraiCj0PtvwK8
-                PAg6lkC2oLtFc0PGhbrmGUQEFl+NA8l/43ifkJ/o48aodLYj3TJaPkU3j0CmwY/Y
-                r7euHhCzZnMXI/rECu7kj8UTBSBGHYT15Wo/JiDx34MTPO7yqWRiAhkWRILxARYO
-                SKFi8JchQCM+W52vjY892Ty1YErwqWqbguWM8yRIItr42wWGAl7w9WtO2HY8XMRB
-                QPL8wnjqW3l2DxmZdDonm8iRvfYXizt1eWDd62c438a8bk5IX75iSy9wjNjTTtkC
-                AwEAAaNTMFEwHQYDVR0OBBYEFLU4NqAPh1HWKL8PJV5zgMW+p+dfMB8GA1UdIwQY
-                MBaAFLU4NqAPh1HWKL8PJV5zgMW+p+dfMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-                hvcNAQELBQADggIBAHdZcJAKOqF2B3STbBiGY4trGQgCTXJDg3nEdi5dE1jrmwZr
-                +KyGq23J0oxdCj3JLvSe2/S2KbXcPeAmKpHgB0ty+1BUg2jvhvUN3pysbqEViR0Q
-                vtF0Gjed9/o1g53TEep4TYabvBNuZsr/7yct7yqAWL+E2KESjjWhCvK0Ie3IDuLE
-                iydOyt07UHFDqRZKvxegyGoazL0u9HzjFG4X7yb4Y7yk27zGBN9mKoj8z78Z/gjH
-                QJo0yOo4oRGe2fYqGJIvYk99LpF9p3BX9msWlTK5b7XL0Hesnme/7XDu1YjBaPgb
-                pmqwtAoakyEK81ginaYOi6lcRk3aNvvq0gL0HK9TgOP2X6ryMH9ltnUyfBKs0CRx
-                jfrPSsXT+qs4USLwbe5riQrgH+gvAarPdJRYq+iTmA8AgEx9jprAlZHTJnkrlNGU
-                9buT+TBFGtJxK+eMmjDUt6J0TFSS/lXI+Wj0id49xMXiQVbs23FaURD+hRfbHmma
-                pp7JqW+tebmXmSvAKq+pzB1Suzd4q7356gaqI5zTOgjuuNClDKhid6XSs5Y9HLms
-                9Lrfb6EWXtYi2XngRsW6icYvn9TxzHBkBCsfOhdVwCEAi2cSXtcnK0yv1Gjl3jRj
-                9FNE3UmQT/1SsltxVTlq3p4BuvmAL0MX784oefUdlrWuJTZiO7AF9ZkMGRXs</ds:X509Certificate>
+          <ds:X509Certificate>MIIHUTCCBTmgAwIBAgIRAOim3Y0IX1Cjas11EfKEEfMwDQYJKoZIhvcNAQEMBQAw
+              RDELMAkGA1UEBhMCTkwxGTAXBgNVBAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNV
+              BAMTEUdFQU5UIE9WIFJTQSBDQSA0MB4XDTI0MDkxODAwMDAwMFoXDTI1MDkxODIz
+              NTk1OVowXTELMAkGA1UEBhMCU0UxFTATBgNVBAgMDFVwcHNhbGEgbMOkbjEcMBoG
+              A1UEChMTVXBwc2FsYSB1bml2ZXJzaXRldDEZMBcGA1UEAxMQbGFiLnVwcG1heC51
+              dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8/tuRl1YsqICHm
+              0OuRbBqYAnZZvb21k48kYlhg6/8l8K8iIYh4hpp8MfkWSqdFRBzADMjZuc11oBrE
+              i6C2ZOycAiP4YDJikh+pASv9BEVQQjQp1C4mza+YkpbUd9ECYCI/7uZr3oA0Nw0C
+              dc5dCrJrqkYssedVnrpJwRJVt3Vfo24/+sw99zL2lvNfZ1IoHvj0vOiMOK9NtgiW
+              m52VaK+ly1h1BIpcEZSk5IckhF+VVdRhk8h+ayLXe3HbxVSHGs+ecQPimLAR+zed
+              5P22zNjPwZThaNJLA7Rof5xeIT4kYtDnPebUxZqjSSa9CLx05lX7RAnUMEJ9f5JJ
+              POvYeP8CAwEAAaOCAyMwggMfMB8GA1UdIwQYMBaAFG8dNUkQbDL6WaCevIroH5W+
+              cXoMMB0GA1UdDgQWBBQGzUk17wKNBHjFy1I1NuZ7rPfUVjAOBgNVHQ8BAf8EBAMC
+              BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+              SQYDVR0gBEIwQDA0BgsrBgEEAbIxAQICTzAlMCMGCCsGAQUFBwIBFhdodHRwczov
+              L3NlY3RpZ28uY29tL0NQUzAIBgZngQwBAgIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0
+              cDovL0dFQU5ULmNybC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0LmNybDB1Bggr
+              BgEFBQcBAQRpMGcwOgYIKwYBBQUHMAKGLmh0dHA6Ly9HRUFOVC5jcnQuc2VjdGln
+              by5jb20vR0VBTlRPVlJTQUNBNC5jcnQwKQYIKwYBBQUHMAGGHWh0dHA6Ly9HRUFO
+              VC5vY3NwLnNlY3RpZ28uY29tMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdwDd
+              3Mo0ldfhFgXnlTL6x5/4PRxQ39sAOhQSdgosrLvIKgAAAZIFCm9hAAAEAwBIMEYC
+              IQCbJ5YFkTH8ju3erxGBb6/k36fOKoUIhVZ/rFBAeA3AlwIhAOvv9uG1lGJm9PpT
+              w1acC6mzkgevtcu8YJ9b/PIlpudlAHYAzPsPaoVxCWX+lZtTzumyfCLphVwNl422
+              qX5UwP5MDbAAAAGSBQpvGwAABAMARzBFAiAom1mYt3lGsY9P9eA4enxQy7PTpszq
+              btxPoPojGUs14gIhAP7E2EnFwR9bXd04aK2+a0CQn2WYJcJePJlsLtDgVm1PAHUA
+              EvFONL1TckyEBhnDjz96E/jntWKHiJxtMAWE6+WGJjoAAAGSBQpu6wAABAMARjBE
+              AiBkgfsUceQ6ZqB8AJfzfSWk1XrKj9RFlqf2VogqoST6VQIgWFzCiuXKKqXpmaEL
+              xfFnJKB0ao+M6f/jjNLL5houpBcwGwYDVR0RBBQwEoIQbGFiLnVwcG1heC51dS5z
+              ZTANBgkqhkiG9w0BAQwFAAOCAgEAB/3mfu1DM7f2LgxAvF+meRAm2kTLGG0k2XSI
+              kT+GT48uTbD78aVCGV55RlHpn5r5V80QcW8Sx2kveCIRe9XvaMGs6pOtDmSq5vXy
+              bDODUkG0Yv2U4UGRLSqneXGM/3k+Uwh4H9yEfqEm7etr3+perMbfax7NYli35vEX
+              M8t7Q5j7S/dPxKdOncPF/vDDkaLys29BDpulqmJl4dnjwIIngbQOARUJDXLKvhmo
+              0fin9goy8YoCZIbJBmESaZivJ34SkPKKlLwdZqRDFSzNUsw0cSCXGhvWZ2TEYGsY
+              nm8uEg64wG/HDTbFRlGHA3YLJ1trJ41FCSyRz91qGS2eva4ZpmR0rMv6DVZaUhQU
+              OnguBM0wmMEgNttdJh55/QAdErWIfGfWNxyFgjs9LTBfsYwURmK1nzMWKm/0Myt7
+              gmkMPkZ0opoaH0DnqEWaSHvepaKQVrMuykClCT9gIgnfGXir201G0H0VZqFUPl7K
+              dXTG04eMSHwM8IAmx3rRINNxwMHGYHkPpZ4uZNnv/rL/76PTHGwtGgB1NrnLa9cQ
+              iMHqRaD5lWUf9mXBigvqrxhSJ3Uaj+co13hD1YEVzTSC46GTf4mUqbb106OMZDXK
+              lq8J1mFqwUH+O2krXEvI12/sSznm5CwT27vhG9ueLavmARfnpibveKsWpCsr6Br5
+              6JGAtZY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
@@ -65,33 +78,46 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFCTCCAvGgAwIBAgIUYCurhnVgIC82fRcKAZM1XrBxa0wwDQYJKoZIhvcNAQEL
-                  BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI0MTEyNzA5NDEwM1oXDTM0MTEy
-                  NTA5NDEwM1owFDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF
-                  AAOCAg8AMIICCgKCAgEAzdtHDctudVHxvNzCMtM/lm5/gzMiWpiBwr5LZXPPjA5N
-                  szV9wFjsQkh8LcHFwDJrnWgrtw17ccqjWa/ey0eea6LZmswfyjKaIJUf1cZvvBW7
-                  FOwkLyj4VVHmeRBGSGurfzb8ux6ioLQVfNp3vj8QlcnqmRCdkdddOMg0XJY7uJgF
-                  OHtTDEu7MxgECjEA8G3J+18XgazvdFtq+uOEWk7dWkQE7L1D8W+Ye8hqZorlJIKC
-                  l4fgKG3AJ2R0pZ9KvsPpUOKb8AyixJYfNvNLbBySWSVQ3zrd+uFkKrbe+aTqQMHC
-                  np7OtZFbF66LihTUID/67SVI8Wp2rWClsYooagWG0845TZf8EEVmrJv2e8RffOkP
-                  fCJ/ZZbPbOMm3yz1prlf1zOBptkwnYdJM8b0gbV0162CSfx62RaWraiCj0PtvwK8
-                  PAg6lkC2oLtFc0PGhbrmGUQEFl+NA8l/43ifkJ/o48aodLYj3TJaPkU3j0CmwY/Y
-                  r7euHhCzZnMXI/rECu7kj8UTBSBGHYT15Wo/JiDx34MTPO7yqWRiAhkWRILxARYO
-                  SKFi8JchQCM+W52vjY892Ty1YErwqWqbguWM8yRIItr42wWGAl7w9WtO2HY8XMRB
-                  QPL8wnjqW3l2DxmZdDonm8iRvfYXizt1eWDd62c438a8bk5IX75iSy9wjNjTTtkC
-                  AwEAAaNTMFEwHQYDVR0OBBYEFLU4NqAPh1HWKL8PJV5zgMW+p+dfMB8GA1UdIwQY
-                  MBaAFLU4NqAPh1HWKL8PJV5zgMW+p+dfMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-                  hvcNAQELBQADggIBAHdZcJAKOqF2B3STbBiGY4trGQgCTXJDg3nEdi5dE1jrmwZr
-                  +KyGq23J0oxdCj3JLvSe2/S2KbXcPeAmKpHgB0ty+1BUg2jvhvUN3pysbqEViR0Q
-                  vtF0Gjed9/o1g53TEep4TYabvBNuZsr/7yct7yqAWL+E2KESjjWhCvK0Ie3IDuLE
-                  iydOyt07UHFDqRZKvxegyGoazL0u9HzjFG4X7yb4Y7yk27zGBN9mKoj8z78Z/gjH
-                  QJo0yOo4oRGe2fYqGJIvYk99LpF9p3BX9msWlTK5b7XL0Hesnme/7XDu1YjBaPgb
-                  pmqwtAoakyEK81ginaYOi6lcRk3aNvvq0gL0HK9TgOP2X6ryMH9ltnUyfBKs0CRx
-                  jfrPSsXT+qs4USLwbe5riQrgH+gvAarPdJRYq+iTmA8AgEx9jprAlZHTJnkrlNGU
-                  9buT+TBFGtJxK+eMmjDUt6J0TFSS/lXI+Wj0id49xMXiQVbs23FaURD+hRfbHmma
-                  pp7JqW+tebmXmSvAKq+pzB1Suzd4q7356gaqI5zTOgjuuNClDKhid6XSs5Y9HLms
-                  9Lrfb6EWXtYi2XngRsW6icYvn9TxzHBkBCsfOhdVwCEAi2cSXtcnK0yv1Gjl3jRj
-                  9FNE3UmQT/1SsltxVTlq3p4BuvmAL0MX784oefUdlrWuJTZiO7AF9ZkMGRXs</ds:X509Certificate>
+          <ds:X509Certificate>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
+              6JGAtZY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>