From 9f952055e1a49c4ffdf527f3913aea66c80989f3 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Thu, 24 Oct 2024 08:32:27 +0200
Subject: SWAMID-4855: Update betyg.uhr.se

---
 .../betyg.uhr.se-beda-inrapportering.xml           | 120 ++++++++++-----------
 1 file changed, 58 insertions(+), 62 deletions(-)

diff --git a/metadata/swamid-2.0/betyg.uhr.se-beda-inrapportering.xml b/metadata/swamid-2.0/betyg.uhr.se-beda-inrapportering.xml
index 85bc9bff..165e77ca 100644
--- a/metadata/swamid-2.0/betyg.uhr.se-beda-inrapportering.xml
+++ b/metadata/swamid-2.0/betyg.uhr.se-beda-inrapportering.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,19 +14,18 @@
     <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-07-31T15:11:33Z">
+      <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://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>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-07-31T15:11:33Z">
-      <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 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://betyg.uhr.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://betyg.uhr.se/Shibboleth.sso/Login" index="1"/>
@@ -49,33 +47,33 @@
         <ds:X509Data>
           <ds:X509SubjectName>CN=betyg.uhr.se</ds:X509SubjectName>
           <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUUTZ/GpOYLH7eo1MhLjG3S/pI/icwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMYmV0eWcudWhyLnNlMB4XDTIzMDYxOTExMDEzNFoXDTMz
-MDYxNjExMDEzNFowFzEVMBMGA1UEAxMMYmV0eWcudWhyLnNlMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEArSpxyEntxAJgE3+zdDtwpBS3AmsKuYt+73/e
-IZGQ1y35ADnZKTPbfYT2DYFaAAY0oYE17cCqanu+w2T79c8+98F84qC+W1/HvoVl
-lt7LDqAslBZeLHaPezunUwVU20HlgK885G70gNcWTOQ1YGpUFhzy2kR0KYL4bgCh
-dokVseS+5+MhU/6EvLGxi6FVKMRwIe5g3BceYSiweQvZ6OAiMdiQMN+3wuXr2nGY
-X27+kDUeK/AuS6ehTtTdxfACfyWrq+pfKe69MC/hoacn28DiCuGD0yxd0n3fVBRw
-WJT6O1CXfrX9pQAwzsMC5G/ei0EqZY4DCDDSscbL+B86AmZkKLZWS74S3sEoFwpo
-B2wh2cjV6VfZBqLKzK7yOC9hcpEqe8v3u9zLQc1ljrOu7yry6s+hIm/Tlm2CBJML
-Wh0ITTEWi6pMa88DK2HA9Df+2G9jDwVv21hHyRxP5S7oQV0xjmqxHziDnZhRWhvY
-6/dQZNN8ULmCzMCQJssEBNEUTH4tuyG/iktkSseCt2AewtbWsz9ETt5wFiK8Jvu/
-aoAHarVrw5uLCh+FXcwQzbde1lxH9dpT8Bq2+FQmTg4fNFZ2dF/fveNMt61Rdcet
-/si154GVf/UWX9+smIQzp3TJCfNTueocCC8BhCPCmFe9UoyN0qT7GlHMzqTzE45d
-/uBaHckCAwEAAaNkMGIwQQYDVR0RBDowOIIMYmV0eWcudWhyLnNlhihodHRwczov
-L2JldHlnLnVoci5zZS9iZWRhLWlucmFwcG9ydGVyaW5nMB0GA1UdDgQWBBRLHJve
-qEesZfM5rDLew1gFw+l2VjANBgkqhkiG9w0BAQsFAAOCAgEADuZK20UGTK6xgD4C
-UOwLZsEIggOkvsm5zNZQevRRLHux1OQ5Si6RyuET6giBgQPxsc2UoK+hJR6zIQiv
-8U7BPiK01pVVvNHlR+EZDCIOyjVWjDOIl/Bpr0LhrW8f2UvP/qsxnr1QwwLhfnvw
-DuutYiWoRklgZA+a4nJhwMj2MUKX8xgebb3SK/GKR4apjVoyC08U2TvJU+ng9EAw
-xYjVJhFnvC22Atin1IJaVxWQEmNS7zvbzz2Icr8JXxZjPYVfLDxYzrp21CMeCgLA
-ZuS32LSGZPWYmo4QsescXxIvGoQTRuxTNankjnQPnOZOKsWEV88hH2nHYrPIfeqz
-gbZ7s2LxYQzn2uUULQHvOgbqQ348chf9bK49d1QVv0HwTcMTM5DKdO38Zp1n6m7X
-nMUXaqTNxAHhsACerrFWb+J52oL2bRSpkmQYEIRbhsxMaPs3HVxEGn+JhX70t4TT
-Hu9DL9AzdrW5oUYdzsYmJZ0N57AJfc280Nh+LT9BOZbIMLCSrsMOq6l40l/HW4Yc
-ZaSjGraWZ27AqWI78CbIPGk+vHS+fQQ2kJTV+xCmjzSz2FigCkEnEqRzrvJ0Vyvp
-/SubkFTYUNZa1mYgaqBQcGFSHClJ580XBmLobf9BCuLbXyhaHADRA7bdZqJylrmp
-eF2L7OikmmwsWMGAW0FbdmxLl2s=</ds:X509Certificate>
+          BQAwFzEVMBMGA1UEAxMMYmV0eWcudWhyLnNlMB4XDTIzMDYxOTExMDEzNFoXDTMz
+          MDYxNjExMDEzNFowFzEVMBMGA1UEAxMMYmV0eWcudWhyLnNlMIICIjANBgkqhkiG
+          9w0BAQEFAAOCAg8AMIICCgKCAgEArSpxyEntxAJgE3+zdDtwpBS3AmsKuYt+73/e
+          IZGQ1y35ADnZKTPbfYT2DYFaAAY0oYE17cCqanu+w2T79c8+98F84qC+W1/HvoVl
+          lt7LDqAslBZeLHaPezunUwVU20HlgK885G70gNcWTOQ1YGpUFhzy2kR0KYL4bgCh
+          dokVseS+5+MhU/6EvLGxi6FVKMRwIe5g3BceYSiweQvZ6OAiMdiQMN+3wuXr2nGY
+          X27+kDUeK/AuS6ehTtTdxfACfyWrq+pfKe69MC/hoacn28DiCuGD0yxd0n3fVBRw
+          WJT6O1CXfrX9pQAwzsMC5G/ei0EqZY4DCDDSscbL+B86AmZkKLZWS74S3sEoFwpo
+          B2wh2cjV6VfZBqLKzK7yOC9hcpEqe8v3u9zLQc1ljrOu7yry6s+hIm/Tlm2CBJML
+          Wh0ITTEWi6pMa88DK2HA9Df+2G9jDwVv21hHyRxP5S7oQV0xjmqxHziDnZhRWhvY
+          6/dQZNN8ULmCzMCQJssEBNEUTH4tuyG/iktkSseCt2AewtbWsz9ETt5wFiK8Jvu/
+          aoAHarVrw5uLCh+FXcwQzbde1lxH9dpT8Bq2+FQmTg4fNFZ2dF/fveNMt61Rdcet
+          /si154GVf/UWX9+smIQzp3TJCfNTueocCC8BhCPCmFe9UoyN0qT7GlHMzqTzE45d
+          /uBaHckCAwEAAaNkMGIwQQYDVR0RBDowOIIMYmV0eWcudWhyLnNlhihodHRwczov
+          L2JldHlnLnVoci5zZS9iZWRhLWlucmFwcG9ydGVyaW5nMB0GA1UdDgQWBBRLHJve
+          qEesZfM5rDLew1gFw+l2VjANBgkqhkiG9w0BAQsFAAOCAgEADuZK20UGTK6xgD4C
+          UOwLZsEIggOkvsm5zNZQevRRLHux1OQ5Si6RyuET6giBgQPxsc2UoK+hJR6zIQiv
+          8U7BPiK01pVVvNHlR+EZDCIOyjVWjDOIl/Bpr0LhrW8f2UvP/qsxnr1QwwLhfnvw
+          DuutYiWoRklgZA+a4nJhwMj2MUKX8xgebb3SK/GKR4apjVoyC08U2TvJU+ng9EAw
+          xYjVJhFnvC22Atin1IJaVxWQEmNS7zvbzz2Icr8JXxZjPYVfLDxYzrp21CMeCgLA
+          ZuS32LSGZPWYmo4QsescXxIvGoQTRuxTNankjnQPnOZOKsWEV88hH2nHYrPIfeqz
+          gbZ7s2LxYQzn2uUULQHvOgbqQ348chf9bK49d1QVv0HwTcMTM5DKdO38Zp1n6m7X
+          nMUXaqTNxAHhsACerrFWb+J52oL2bRSpkmQYEIRbhsxMaPs3HVxEGn+JhX70t4TT
+          Hu9DL9AzdrW5oUYdzsYmJZ0N57AJfc280Nh+LT9BOZbIMLCSrsMOq6l40l/HW4Yc
+          ZaSjGraWZ27AqWI78CbIPGk+vHS+fQQ2kJTV+xCmjzSz2FigCkEnEqRzrvJ0Vyvp
+          /SubkFTYUNZa1mYgaqBQcGFSHClJ580XBmLobf9BCuLbXyhaHADRA7bdZqJylrmp
+          eF2L7OikmmwsWMGAW0FbdmxLl2s=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -86,33 +84,33 @@ eF2L7OikmmwsWMGAW0FbdmxLl2s=</ds:X509Certificate>
         <ds:X509Data>
           <ds:X509SubjectName>CN=betyg.uhr.se</ds:X509SubjectName>
           <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUUTZ/GpOYLH7eo1MhLjG3S/pI/icwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMYmV0eWcudWhyLnNlMB4XDTIzMDYxOTExMDEzNFoXDTMz
-MDYxNjExMDEzNFowFzEVMBMGA1UEAxMMYmV0eWcudWhyLnNlMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEArSpxyEntxAJgE3+zdDtwpBS3AmsKuYt+73/e
-IZGQ1y35ADnZKTPbfYT2DYFaAAY0oYE17cCqanu+w2T79c8+98F84qC+W1/HvoVl
-lt7LDqAslBZeLHaPezunUwVU20HlgK885G70gNcWTOQ1YGpUFhzy2kR0KYL4bgCh
-dokVseS+5+MhU/6EvLGxi6FVKMRwIe5g3BceYSiweQvZ6OAiMdiQMN+3wuXr2nGY
-X27+kDUeK/AuS6ehTtTdxfACfyWrq+pfKe69MC/hoacn28DiCuGD0yxd0n3fVBRw
-WJT6O1CXfrX9pQAwzsMC5G/ei0EqZY4DCDDSscbL+B86AmZkKLZWS74S3sEoFwpo
-B2wh2cjV6VfZBqLKzK7yOC9hcpEqe8v3u9zLQc1ljrOu7yry6s+hIm/Tlm2CBJML
-Wh0ITTEWi6pMa88DK2HA9Df+2G9jDwVv21hHyRxP5S7oQV0xjmqxHziDnZhRWhvY
-6/dQZNN8ULmCzMCQJssEBNEUTH4tuyG/iktkSseCt2AewtbWsz9ETt5wFiK8Jvu/
-aoAHarVrw5uLCh+FXcwQzbde1lxH9dpT8Bq2+FQmTg4fNFZ2dF/fveNMt61Rdcet
-/si154GVf/UWX9+smIQzp3TJCfNTueocCC8BhCPCmFe9UoyN0qT7GlHMzqTzE45d
-/uBaHckCAwEAAaNkMGIwQQYDVR0RBDowOIIMYmV0eWcudWhyLnNlhihodHRwczov
-L2JldHlnLnVoci5zZS9iZWRhLWlucmFwcG9ydGVyaW5nMB0GA1UdDgQWBBRLHJve
-qEesZfM5rDLew1gFw+l2VjANBgkqhkiG9w0BAQsFAAOCAgEADuZK20UGTK6xgD4C
-UOwLZsEIggOkvsm5zNZQevRRLHux1OQ5Si6RyuET6giBgQPxsc2UoK+hJR6zIQiv
-8U7BPiK01pVVvNHlR+EZDCIOyjVWjDOIl/Bpr0LhrW8f2UvP/qsxnr1QwwLhfnvw
-DuutYiWoRklgZA+a4nJhwMj2MUKX8xgebb3SK/GKR4apjVoyC08U2TvJU+ng9EAw
-xYjVJhFnvC22Atin1IJaVxWQEmNS7zvbzz2Icr8JXxZjPYVfLDxYzrp21CMeCgLA
-ZuS32LSGZPWYmo4QsescXxIvGoQTRuxTNankjnQPnOZOKsWEV88hH2nHYrPIfeqz
-gbZ7s2LxYQzn2uUULQHvOgbqQ348chf9bK49d1QVv0HwTcMTM5DKdO38Zp1n6m7X
-nMUXaqTNxAHhsACerrFWb+J52oL2bRSpkmQYEIRbhsxMaPs3HVxEGn+JhX70t4TT
-Hu9DL9AzdrW5oUYdzsYmJZ0N57AJfc280Nh+LT9BOZbIMLCSrsMOq6l40l/HW4Yc
-ZaSjGraWZ27AqWI78CbIPGk+vHS+fQQ2kJTV+xCmjzSz2FigCkEnEqRzrvJ0Vyvp
-/SubkFTYUNZa1mYgaqBQcGFSHClJ580XBmLobf9BCuLbXyhaHADRA7bdZqJylrmp
-eF2L7OikmmwsWMGAW0FbdmxLl2s=</ds:X509Certificate>
+          BQAwFzEVMBMGA1UEAxMMYmV0eWcudWhyLnNlMB4XDTIzMDYxOTExMDEzNFoXDTMz
+          MDYxNjExMDEzNFowFzEVMBMGA1UEAxMMYmV0eWcudWhyLnNlMIICIjANBgkqhkiG
+          9w0BAQEFAAOCAg8AMIICCgKCAgEArSpxyEntxAJgE3+zdDtwpBS3AmsKuYt+73/e
+          IZGQ1y35ADnZKTPbfYT2DYFaAAY0oYE17cCqanu+w2T79c8+98F84qC+W1/HvoVl
+          lt7LDqAslBZeLHaPezunUwVU20HlgK885G70gNcWTOQ1YGpUFhzy2kR0KYL4bgCh
+          dokVseS+5+MhU/6EvLGxi6FVKMRwIe5g3BceYSiweQvZ6OAiMdiQMN+3wuXr2nGY
+          X27+kDUeK/AuS6ehTtTdxfACfyWrq+pfKe69MC/hoacn28DiCuGD0yxd0n3fVBRw
+          WJT6O1CXfrX9pQAwzsMC5G/ei0EqZY4DCDDSscbL+B86AmZkKLZWS74S3sEoFwpo
+          B2wh2cjV6VfZBqLKzK7yOC9hcpEqe8v3u9zLQc1ljrOu7yry6s+hIm/Tlm2CBJML
+          Wh0ITTEWi6pMa88DK2HA9Df+2G9jDwVv21hHyRxP5S7oQV0xjmqxHziDnZhRWhvY
+          6/dQZNN8ULmCzMCQJssEBNEUTH4tuyG/iktkSseCt2AewtbWsz9ETt5wFiK8Jvu/
+          aoAHarVrw5uLCh+FXcwQzbde1lxH9dpT8Bq2+FQmTg4fNFZ2dF/fveNMt61Rdcet
+          /si154GVf/UWX9+smIQzp3TJCfNTueocCC8BhCPCmFe9UoyN0qT7GlHMzqTzE45d
+          /uBaHckCAwEAAaNkMGIwQQYDVR0RBDowOIIMYmV0eWcudWhyLnNlhihodHRwczov
+          L2JldHlnLnVoci5zZS9iZWRhLWlucmFwcG9ydGVyaW5nMB0GA1UdDgQWBBRLHJve
+          qEesZfM5rDLew1gFw+l2VjANBgkqhkiG9w0BAQsFAAOCAgEADuZK20UGTK6xgD4C
+          UOwLZsEIggOkvsm5zNZQevRRLHux1OQ5Si6RyuET6giBgQPxsc2UoK+hJR6zIQiv
+          8U7BPiK01pVVvNHlR+EZDCIOyjVWjDOIl/Bpr0LhrW8f2UvP/qsxnr1QwwLhfnvw
+          DuutYiWoRklgZA+a4nJhwMj2MUKX8xgebb3SK/GKR4apjVoyC08U2TvJU+ng9EAw
+          xYjVJhFnvC22Atin1IJaVxWQEmNS7zvbzz2Icr8JXxZjPYVfLDxYzrp21CMeCgLA
+          ZuS32LSGZPWYmo4QsescXxIvGoQTRuxTNankjnQPnOZOKsWEV88hH2nHYrPIfeqz
+          gbZ7s2LxYQzn2uUULQHvOgbqQ348chf9bK49d1QVv0HwTcMTM5DKdO38Zp1n6m7X
+          nMUXaqTNxAHhsACerrFWb+J52oL2bRSpkmQYEIRbhsxMaPs3HVxEGn+JhX70t4TT
+          Hu9DL9AzdrW5oUYdzsYmJZ0N57AJfc280Nh+LT9BOZbIMLCSrsMOq6l40l/HW4Yc
+          ZaSjGraWZ27AqWI78CbIPGk+vHS+fQQ2kJTV+xCmjzSz2FigCkEnEqRzrvJ0Vyvp
+          /SubkFTYUNZa1mYgaqBQcGFSHClJ580XBmLobf9BCuLbXyhaHADRA7bdZqJylrmp
+          eF2L7OikmmwsWMGAW0FbdmxLl2s=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -137,8 +135,6 @@ eF2L7OikmmwsWMGAW0FbdmxLl2s=</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://betyg.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://betyg.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://betyg.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://betyg.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://betyg.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Beda inrapportering</md:ServiceName>
       <md:ServiceName xml:lang="sv">Beda inrapportering</md:ServiceName>
-- 
cgit v1.2.3