From e1a1b93f7924fb8d25c9c39287daac2ecc0c1989 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Mon, 10 Jun 2024 22:33:34 +0200
Subject: SWAMID-4243, SWAMID-4244, SWAMID-4245, SWAMID-4246 and SWAMID-4247
 Updated graylog.sunet.se, halon-eu.sunet.se, kontrollpanelen.sunet.se,
 lookup.cert.sunet.se and misp.cert.sunet.se

---
 metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml         | 7 ++-----
 metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml        | 7 ++-----
 metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml | 7 ++-----
 metadata/swamid-2.0/lookup.cert.sunet.se-shibboleth.xml     | 4 +---
 metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml       | 7 ++-----
 5 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml b/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
index bfc83d01..a0a05299 100644
--- a/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
@@ -26,7 +26,7 @@
       </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://graylog.sunet.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://graylog.sunet.se/Shibboleth.sso/Login" index="1"/>
@@ -61,8 +61,7 @@ J817T6PPf8uhgDIpWCBAlFHyF32G7COCmpsGQJXp2R+rJUlbC79Q3EzjPMKUzmxD
 bkxvt+jLU+HUaLhcjv1URhOjf/bikMeFaYVzTZxUPN2GinQfvGtl7zXvItPOM0+D
 XfHHAag/oq7lu5zIGpdHeieaVls7ZzB3dFmf2M2MBtcM11gjuPIz4GeA70tSbNAy
 ODshQbDdE7k74c1Oy7ej2QXS8RTPc6ifS5BCTB/9iJKuUg60FxbIvPnkb6kwgdUW
-x642c5iHKr2d/SOMA05pL7Qz4RB2fDIgmPg6VzglrkKBYVHUIi3a1j5dBA==
-</ds:X509Certificate>
+x642c5iHKr2d/SOMA05pL7Qz4RB2fDIgmPg6VzglrkKBYVHUIi3a1j5dBA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -83,8 +82,6 @@ x642c5iHKr2d/SOMA05pL7Qz4RB2fDIgmPg6VzglrkKBYVHUIi3a1j5dBA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://graylog.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://graylog.sunet.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://graylog.sunet.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://graylog.sunet.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://graylog.sunet.se/Shibboleth.sso/SAML/Artifact" index="5"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Graylog Logservice</md:ServiceName>
       <md:ServiceName xml:lang="sv">Graylog Loggtjänst</md:ServiceName>
diff --git a/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml b/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
index 6a1de90c..47dbfd5d 100644
--- a/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
@@ -26,7 +26,7 @@
       </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>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Halon Kontrollpanel</mdui:DisplayName>
@@ -67,8 +67,7 @@ f0TqdCa5wlxhE+dnR243VR3fXLIDMwtDFC9T+wG6zFKNqMaPvaw0NheEKMr/P3xg
 9GUItvR+Q7pWCpR2+ES9CkhnWTxPA06fd4pPdJc8b3l5Gv1kTEEj6u5XhZ3cP7lv
 DHWP8cgwx2vtq4MKzdUdn0x/Hb9fT/MWszjyqJyuvxK0hmLxegcWXxLSypTarV7l
 xSxsRARlPrKztIbnHB4erd0hhaHcs/Mu1MkJq5TYJvTkCpky+QVf7dZcFhEMnEoi
-uQHAppDUMcAVcciXyqOjeW25eKnOv6Dnkg==
-</ds:X509Certificate>
+uQHAppDUMcAVcciXyqOjeW25eKnOv6Dnkg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -89,8 +88,6 @@ uQHAppDUMcAVcciXyqOjeW25eKnOv6Dnkg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Halon MSUI</md:ServiceName>
       <md:ServiceName xml:lang="sv">Halon Kontrollpanel</md:ServiceName>
diff --git a/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml b/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
index b3f02b9b..c860cd37 100644
--- a/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
@@ -27,7 +27,7 @@
       </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://kontrollpanelen.sunet.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kontrollpanelen.sunet.se/Shibboleth.sso/Login" index="1"/>
@@ -68,8 +68,7 @@ Qh2Bq3mRN3wJkeZxzndekIo57rOVL+NMBFpsDjFmk39nnyjAoum7zIMs048dukBW
 ZwLpUhCcdrCRo73MxFasvz4lSj8+1y1z/Fs9gLBs95tdjRFw/9TBLD3v8Pi9SAbf
 Xjyx1kb+Uxf0D+FhHXK2o4NPuZKZpp6GFvIfCxjI3B5rj9NpfRyS++iEd8Nacyzp
 iwGo/TqTT5u0WBmEbv41WKYpqfeaOw8wGnkg8qSarChrIBXNJkfZmxAz8P6Xp0Ig
-4CQzHnVY3eDUhqI1jEgOLgP6M3rcwSYfxhV3MS7dVEvHBR3eXZNFNqwQEVotSA==
-</ds:X509Certificate>
+4CQzHnVY3eDUhqI1jEgOLgP6M3rcwSYfxhV3MS7dVEvHBR3eXZNFNqwQEVotSA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -90,8 +89,6 @@ iwGo/TqTT5u0WBmEbv41WKYpqfeaOw8wGnkg8qSarChrIBXNJkfZmxAz8P6Xp0Ig
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kontrollpanelen.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kontrollpanelen.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kontrollpanelen.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kontrollpanelen.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kontrollpanelen.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Halon MSUI</md:ServiceName>
       <md:ServiceName xml:lang="sv">Halon Kontrollpanel</md:ServiceName>
diff --git a/metadata/swamid-2.0/lookup.cert.sunet.se-shibboleth.xml b/metadata/swamid-2.0/lookup.cert.sunet.se-shibboleth.xml
index 7a719703..55da8a55 100644
--- a/metadata/swamid-2.0/lookup.cert.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lookup.cert.sunet.se-shibboleth.xml
@@ -26,7 +26,7 @@
       </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://lookup.cert.sunet.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lookup.cert.sunet.se/Shibboleth.sso/Login" index="1"/>
@@ -88,8 +88,6 @@ fnhrbIJZk17LO1uBkDd6DCG3AXHvOufHGIi+pzM9epF91CkEUiEHag==</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lookup.cert.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lookup.cert.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lookup.cert.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lookup.cert.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lookup.cert.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
diff --git a/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml b/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
index 97baa545..da9c14b9 100644
--- a/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
@@ -26,7 +26,7 @@
       </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://misp.cert.sunet.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://misp.cert.sunet.se/Shibboleth.sso/Login" index="1"/>
@@ -66,8 +66,7 @@ FCA61G7sEVWGoWzv/7DZ7T14XH+Es27FStvLD0A3S0zSmYizDR4LeJzwXPnn7KZj
 4TQHrHSuFkqFcLI7UG1GdDxGhDg7iPgsqI1WtrmZirU06CIareCdhZHRzBUCjNEc
 Inzj6jHKqKFrjId0q9CIyDfhp9AQPenCH3/Sf7GZt5i+Hx2n25BLqT+bZ0fotRwH
 +/lrLRE3FFh431AARR9UbkG0rKkSlEo9qEJtrjbMVOCAj8O3kDNbyvdfzzcUOzQJ
-pVHC0z9N3EFKt9RGKKG/Jbk4mSpbYCU=
-</ds:X509Certificate>
+pVHC0z9N3EFKt9RGKKG/Jbk4mSpbYCU=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -88,8 +87,6 @@ pVHC0z9N3EFKt9RGKKG/Jbk4mSpbYCU=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://misp.cert.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://misp.cert.sunet.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://misp.cert.sunet.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://misp.cert.sunet.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://misp.cert.sunet.se/Shibboleth.sso/SAML/Artifact" index="5"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">CIRCL MISP</md:ServiceName>
       <md:ServiceName xml:lang="sv">CIRCL MISP</md:ServiceName>
-- 
cgit v1.2.3