From 475da47e883ad8a210818f82bebca0264d965d36 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Thu, 24 Oct 2024 08:37:46 +0200
Subject: SWAMID-4859: Updated beli02.uhr.se

---
 .../beli02.uhr.se-beda-administration.xml          | 121 ++++++++++-----------
 1 file changed, 59 insertions(+), 62 deletions(-)

(limited to 'metadata/swamid-2.0')

diff --git a/metadata/swamid-2.0/beli02.uhr.se-beda-administration.xml b/metadata/swamid-2.0/beli02.uhr.se-beda-administration.xml
index 7e3d7d28..2ed1e47a 100644
--- a/metadata/swamid-2.0/beli02.uhr.se-beda-administration.xml
+++ b/metadata/swamid-2.0/beli02.uhr.se-beda-administration.xml
@@ -5,7 +5,6 @@
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
@@ -15,7 +14,6 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-03-30T13:50:55Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
@@ -23,16 +21,17 @@
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://beli02.uhr.se:461/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://beli02.uhr.se:461/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
         <mdui:Description xml:lang="en">Test for beda-administration login during Beda development</mdui:Description>
-        <mdui:Description xml:lang="sv">Test för beda-administration inloggning i Beda utveckling</mdui:Description>
+        <mdui:Description xml:lang="sv">Test för beda-administration inloggning under utveckling av Beda</mdui:Description>
         <mdui:DisplayName xml:lang="en">Beda development administration-sp</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Beda utveckling administration-sp</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://betyg.uhr.se/</mdui:InformationURL>
@@ -48,33 +47,33 @@
         <ds:X509Data>
           <ds:X509SubjectName>CN=beli02.uhr.se</ds:X509SubjectName>
           <ds:X509Certificate>MIIFJDCCAwygAwIBAgIUIsfnK7VFn4Sn+gaDF+7ahFZeu6gwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAxMNYmVsaTAyLnVoci5zZTAeFw0yMzA2MzAwNzQ3NDNaFw0z
-MzA2MjcwNzQ3NDNaMBgxFjAUBgNVBAMTDWJlbGkwMi51aHIuc2UwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQC5udGOSuScwiYeAS3oXfWlb7n/7ZnIXmzg
-SQw/DooRtbyGTOhUz4igWHVsySrqPAEZvspjmyMv/hoFE/aEoNobA+T0jILV6Stx
-hkaYTfuUcvgkuTt4/l7pknc9yVFsOvoKSoEpFL39/BtqeJUat8lYnqg+Uk/qUxCM
-MLi57Q1vvMvnf1i7uDQzOIwkfi1rZ96jms8ruQB1tgLp/AHfTLOS3n9dh4PFK9Vw
-dZJ6YXEN+48Tm6QgaOh4Lkp7IHu10KGF+8Bik9mEkHwNKdQrUZzSB3e+O1MBGmWe
-A9iS40ncA8yt2LReCeCifYPgxJQNgPgpvUXKKKGvP0xufxkItYB+8/3HpUm//YK4
-t3CiMtCWd9HCdEGI8kqpT2w5PyoSpX3mqqJe8LYjTf0vq6ADjTA9EUlkr9eScCmF
-FyWSinRoNlRavj8CRa3/uJpBm5JKWMWDo0dfd+mHHJVTvjl4R5W53L26yZBsEmV+
-AUv7le6VaWrO2VarNoqXpNdDrfBsblbBOt5X9i51qG6X1EelSLF8u3TyFlJCMj/y
-gDvoR5llEpWdo4kviMB99MGMhiiLIoELgkVMRoi5d7wYHSQ6G2Ka1ltw9d71B5Zv
-aqg7TVsiz+i7v1zVfV0EDjzc1xRVSA2KdVfbOByjPdFPsAE4qCKK+MQuyCpoMKMu
-pIPd/Fyw0wIDAQABo2YwZDBDBgNVHREEPDA6gg1iZWxpMDIudWhyLnNlhilodHRw
-czovL2JlbGkwMi51aHIuc2UvYmVkYS1hZG1pbmlzdHJhdGlvbjAdBgNVHQ4EFgQU
-+USOxONrOOjTg0vhVAtbGNt4aUowDQYJKoZIhvcNAQELBQADggIBAEQDeBuoxyOH
-vAzHEL8HTvOXxzS9di3W7MzmTzJ0vzjrX9ANtc3N65Rc92LhRLY9zLwJAqu/OS2s
-d3AE7S0IIGU1ie7C7U3FBbs8xdyBzWkxXiErrhOcGMBdIo120IV9Klc6Gl0N7LKe
-jQyG1i9e52R5jAhK/neMui0cWtJnpaNC5XqHM+eeGW88JwXKTeTckyNi9SINewA2
-3hy3fd6IbaHo45LMZCZr9TCJM0gG0FQ1Sw1rOdHa2g/Diwb28F9MMJqY0roU1j27
-UPf435uI6zpM3q4FQ0ZF8iUGHRRUMgJqr5hVwUYYZ2UVDrU4VKv7S9x0LRxTx45S
-Sin/5YzCsPfYaSSYxSd89E+MXVM5+It7JkOVcBBZdip5DGvasK5XBogdrqEtfdi/
-MPmJB5eoDQkqv8Lr+QwjBesSv3NsY+fKNEsE00oyEL186v0tH1/IT8jUD4qWYVLB
-f/SQwlNtaiNNoXfbgSRH5NrWskaP9cpPIM+2Ps2JZUhIhgzYC+Ksa71C8m3eHp0y
-zvZrPOO696y8V6//33u9C+qUjdjVCnmCyIWP5Xjg9R0I3AjlBAgnSusBjnNPvkw4
-Xul3Xu5zs9pHv65k78JdOYPSc93QlxWMp6k26e0gB780KeI64C7yBvq9n8f8v5/U
-cB9moY5RTmMK+1euGBClB1Pwtvo/fVPR</ds:X509Certificate>
+          BQAwGDEWMBQGA1UEAxMNYmVsaTAyLnVoci5zZTAeFw0yMzA2MzAwNzQ3NDNaFw0z
+          MzA2MjcwNzQ3NDNaMBgxFjAUBgNVBAMTDWJlbGkwMi51aHIuc2UwggIiMA0GCSqG
+          SIb3DQEBAQUAA4ICDwAwggIKAoICAQC5udGOSuScwiYeAS3oXfWlb7n/7ZnIXmzg
+          SQw/DooRtbyGTOhUz4igWHVsySrqPAEZvspjmyMv/hoFE/aEoNobA+T0jILV6Stx
+          hkaYTfuUcvgkuTt4/l7pknc9yVFsOvoKSoEpFL39/BtqeJUat8lYnqg+Uk/qUxCM
+          MLi57Q1vvMvnf1i7uDQzOIwkfi1rZ96jms8ruQB1tgLp/AHfTLOS3n9dh4PFK9Vw
+          dZJ6YXEN+48Tm6QgaOh4Lkp7IHu10KGF+8Bik9mEkHwNKdQrUZzSB3e+O1MBGmWe
+          A9iS40ncA8yt2LReCeCifYPgxJQNgPgpvUXKKKGvP0xufxkItYB+8/3HpUm//YK4
+          t3CiMtCWd9HCdEGI8kqpT2w5PyoSpX3mqqJe8LYjTf0vq6ADjTA9EUlkr9eScCmF
+          FyWSinRoNlRavj8CRa3/uJpBm5JKWMWDo0dfd+mHHJVTvjl4R5W53L26yZBsEmV+
+          AUv7le6VaWrO2VarNoqXpNdDrfBsblbBOt5X9i51qG6X1EelSLF8u3TyFlJCMj/y
+          gDvoR5llEpWdo4kviMB99MGMhiiLIoELgkVMRoi5d7wYHSQ6G2Ka1ltw9d71B5Zv
+          aqg7TVsiz+i7v1zVfV0EDjzc1xRVSA2KdVfbOByjPdFPsAE4qCKK+MQuyCpoMKMu
+          pIPd/Fyw0wIDAQABo2YwZDBDBgNVHREEPDA6gg1iZWxpMDIudWhyLnNlhilodHRw
+          czovL2JlbGkwMi51aHIuc2UvYmVkYS1hZG1pbmlzdHJhdGlvbjAdBgNVHQ4EFgQU
+          +USOxONrOOjTg0vhVAtbGNt4aUowDQYJKoZIhvcNAQELBQADggIBAEQDeBuoxyOH
+          vAzHEL8HTvOXxzS9di3W7MzmTzJ0vzjrX9ANtc3N65Rc92LhRLY9zLwJAqu/OS2s
+          d3AE7S0IIGU1ie7C7U3FBbs8xdyBzWkxXiErrhOcGMBdIo120IV9Klc6Gl0N7LKe
+          jQyG1i9e52R5jAhK/neMui0cWtJnpaNC5XqHM+eeGW88JwXKTeTckyNi9SINewA2
+          3hy3fd6IbaHo45LMZCZr9TCJM0gG0FQ1Sw1rOdHa2g/Diwb28F9MMJqY0roU1j27
+          UPf435uI6zpM3q4FQ0ZF8iUGHRRUMgJqr5hVwUYYZ2UVDrU4VKv7S9x0LRxTx45S
+          Sin/5YzCsPfYaSSYxSd89E+MXVM5+It7JkOVcBBZdip5DGvasK5XBogdrqEtfdi/
+          MPmJB5eoDQkqv8Lr+QwjBesSv3NsY+fKNEsE00oyEL186v0tH1/IT8jUD4qWYVLB
+          f/SQwlNtaiNNoXfbgSRH5NrWskaP9cpPIM+2Ps2JZUhIhgzYC+Ksa71C8m3eHp0y
+          zvZrPOO696y8V6//33u9C+qUjdjVCnmCyIWP5Xjg9R0I3AjlBAgnSusBjnNPvkw4
+          Xul3Xu5zs9pHv65k78JdOYPSc93QlxWMp6k26e0gB780KeI64C7yBvq9n8f8v5/U
+          cB9moY5RTmMK+1euGBClB1Pwtvo/fVPR</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -85,33 +84,33 @@ cB9moY5RTmMK+1euGBClB1Pwtvo/fVPR</ds:X509Certificate>
         <ds:X509Data>
           <ds:X509SubjectName>CN=beli02.uhr.se</ds:X509SubjectName>
           <ds:X509Certificate>MIIFJDCCAwygAwIBAgIUIsfnK7VFn4Sn+gaDF+7ahFZeu6gwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAxMNYmVsaTAyLnVoci5zZTAeFw0yMzA2MzAwNzQ3NDNaFw0z
-MzA2MjcwNzQ3NDNaMBgxFjAUBgNVBAMTDWJlbGkwMi51aHIuc2UwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQC5udGOSuScwiYeAS3oXfWlb7n/7ZnIXmzg
-SQw/DooRtbyGTOhUz4igWHVsySrqPAEZvspjmyMv/hoFE/aEoNobA+T0jILV6Stx
-hkaYTfuUcvgkuTt4/l7pknc9yVFsOvoKSoEpFL39/BtqeJUat8lYnqg+Uk/qUxCM
-MLi57Q1vvMvnf1i7uDQzOIwkfi1rZ96jms8ruQB1tgLp/AHfTLOS3n9dh4PFK9Vw
-dZJ6YXEN+48Tm6QgaOh4Lkp7IHu10KGF+8Bik9mEkHwNKdQrUZzSB3e+O1MBGmWe
-A9iS40ncA8yt2LReCeCifYPgxJQNgPgpvUXKKKGvP0xufxkItYB+8/3HpUm//YK4
-t3CiMtCWd9HCdEGI8kqpT2w5PyoSpX3mqqJe8LYjTf0vq6ADjTA9EUlkr9eScCmF
-FyWSinRoNlRavj8CRa3/uJpBm5JKWMWDo0dfd+mHHJVTvjl4R5W53L26yZBsEmV+
-AUv7le6VaWrO2VarNoqXpNdDrfBsblbBOt5X9i51qG6X1EelSLF8u3TyFlJCMj/y
-gDvoR5llEpWdo4kviMB99MGMhiiLIoELgkVMRoi5d7wYHSQ6G2Ka1ltw9d71B5Zv
-aqg7TVsiz+i7v1zVfV0EDjzc1xRVSA2KdVfbOByjPdFPsAE4qCKK+MQuyCpoMKMu
-pIPd/Fyw0wIDAQABo2YwZDBDBgNVHREEPDA6gg1iZWxpMDIudWhyLnNlhilodHRw
-czovL2JlbGkwMi51aHIuc2UvYmVkYS1hZG1pbmlzdHJhdGlvbjAdBgNVHQ4EFgQU
-+USOxONrOOjTg0vhVAtbGNt4aUowDQYJKoZIhvcNAQELBQADggIBAEQDeBuoxyOH
-vAzHEL8HTvOXxzS9di3W7MzmTzJ0vzjrX9ANtc3N65Rc92LhRLY9zLwJAqu/OS2s
-d3AE7S0IIGU1ie7C7U3FBbs8xdyBzWkxXiErrhOcGMBdIo120IV9Klc6Gl0N7LKe
-jQyG1i9e52R5jAhK/neMui0cWtJnpaNC5XqHM+eeGW88JwXKTeTckyNi9SINewA2
-3hy3fd6IbaHo45LMZCZr9TCJM0gG0FQ1Sw1rOdHa2g/Diwb28F9MMJqY0roU1j27
-UPf435uI6zpM3q4FQ0ZF8iUGHRRUMgJqr5hVwUYYZ2UVDrU4VKv7S9x0LRxTx45S
-Sin/5YzCsPfYaSSYxSd89E+MXVM5+It7JkOVcBBZdip5DGvasK5XBogdrqEtfdi/
-MPmJB5eoDQkqv8Lr+QwjBesSv3NsY+fKNEsE00oyEL186v0tH1/IT8jUD4qWYVLB
-f/SQwlNtaiNNoXfbgSRH5NrWskaP9cpPIM+2Ps2JZUhIhgzYC+Ksa71C8m3eHp0y
-zvZrPOO696y8V6//33u9C+qUjdjVCnmCyIWP5Xjg9R0I3AjlBAgnSusBjnNPvkw4
-Xul3Xu5zs9pHv65k78JdOYPSc93QlxWMp6k26e0gB780KeI64C7yBvq9n8f8v5/U
-cB9moY5RTmMK+1euGBClB1Pwtvo/fVPR</ds:X509Certificate>
+          BQAwGDEWMBQGA1UEAxMNYmVsaTAyLnVoci5zZTAeFw0yMzA2MzAwNzQ3NDNaFw0z
+          MzA2MjcwNzQ3NDNaMBgxFjAUBgNVBAMTDWJlbGkwMi51aHIuc2UwggIiMA0GCSqG
+          SIb3DQEBAQUAA4ICDwAwggIKAoICAQC5udGOSuScwiYeAS3oXfWlb7n/7ZnIXmzg
+          SQw/DooRtbyGTOhUz4igWHVsySrqPAEZvspjmyMv/hoFE/aEoNobA+T0jILV6Stx
+          hkaYTfuUcvgkuTt4/l7pknc9yVFsOvoKSoEpFL39/BtqeJUat8lYnqg+Uk/qUxCM
+          MLi57Q1vvMvnf1i7uDQzOIwkfi1rZ96jms8ruQB1tgLp/AHfTLOS3n9dh4PFK9Vw
+          dZJ6YXEN+48Tm6QgaOh4Lkp7IHu10KGF+8Bik9mEkHwNKdQrUZzSB3e+O1MBGmWe
+          A9iS40ncA8yt2LReCeCifYPgxJQNgPgpvUXKKKGvP0xufxkItYB+8/3HpUm//YK4
+          t3CiMtCWd9HCdEGI8kqpT2w5PyoSpX3mqqJe8LYjTf0vq6ADjTA9EUlkr9eScCmF
+          FyWSinRoNlRavj8CRa3/uJpBm5JKWMWDo0dfd+mHHJVTvjl4R5W53L26yZBsEmV+
+          AUv7le6VaWrO2VarNoqXpNdDrfBsblbBOt5X9i51qG6X1EelSLF8u3TyFlJCMj/y
+          gDvoR5llEpWdo4kviMB99MGMhiiLIoELgkVMRoi5d7wYHSQ6G2Ka1ltw9d71B5Zv
+          aqg7TVsiz+i7v1zVfV0EDjzc1xRVSA2KdVfbOByjPdFPsAE4qCKK+MQuyCpoMKMu
+          pIPd/Fyw0wIDAQABo2YwZDBDBgNVHREEPDA6gg1iZWxpMDIudWhyLnNlhilodHRw
+          czovL2JlbGkwMi51aHIuc2UvYmVkYS1hZG1pbmlzdHJhdGlvbjAdBgNVHQ4EFgQU
+          +USOxONrOOjTg0vhVAtbGNt4aUowDQYJKoZIhvcNAQELBQADggIBAEQDeBuoxyOH
+          vAzHEL8HTvOXxzS9di3W7MzmTzJ0vzjrX9ANtc3N65Rc92LhRLY9zLwJAqu/OS2s
+          d3AE7S0IIGU1ie7C7U3FBbs8xdyBzWkxXiErrhOcGMBdIo120IV9Klc6Gl0N7LKe
+          jQyG1i9e52R5jAhK/neMui0cWtJnpaNC5XqHM+eeGW88JwXKTeTckyNi9SINewA2
+          3hy3fd6IbaHo45LMZCZr9TCJM0gG0FQ1Sw1rOdHa2g/Diwb28F9MMJqY0roU1j27
+          UPf435uI6zpM3q4FQ0ZF8iUGHRRUMgJqr5hVwUYYZ2UVDrU4VKv7S9x0LRxTx45S
+          Sin/5YzCsPfYaSSYxSd89E+MXVM5+It7JkOVcBBZdip5DGvasK5XBogdrqEtfdi/
+          MPmJB5eoDQkqv8Lr+QwjBesSv3NsY+fKNEsE00oyEL186v0tH1/IT8jUD4qWYVLB
+          f/SQwlNtaiNNoXfbgSRH5NrWskaP9cpPIM+2Ps2JZUhIhgzYC+Ksa71C8m3eHp0y
+          zvZrPOO696y8V6//33u9C+qUjdjVCnmCyIWP5Xjg9R0I3AjlBAgnSusBjnNPvkw4
+          Xul3Xu5zs9pHv65k78JdOYPSc93QlxWMp6k26e0gB780KeI64C7yBvq9n8f8v5/U
+          cB9moY5RTmMK+1euGBClB1Pwtvo/fVPR</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -136,11 +135,9 @@ cB9moY5RTmMK+1euGBClB1Pwtvo/fVPR</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beli02.uhr.se:461/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beli02.uhr.se:461/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beli02.uhr.se:461/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beli02.uhr.se:461/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beli02.uhr.se:461/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Beda development proxy-IdP</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Beda utveckling proxy-IdP</md:ServiceName>
+      <md:ServiceName xml:lang="en">Beda development administration-sp</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Beda utveckling administration-sp</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
-- 
cgit v1.2.3