From 054b68849a2c9b743fc0a28b7924a9f99196d788 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Wed, 1 Feb 2023 12:23:28 +0100
Subject: SWAMID-2620: Updated idp-shib.slu.se

---
 swamid-edugain/idp-shib.slu.se-idp.xml | 41 +++++++++++++---------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/swamid-edugain/idp-shib.slu.se-idp.xml b/swamid-edugain/idp-shib.slu.se-idp.xml
index 0082596b..a61cd41a 100644
--- a/swamid-edugain/idp-shib.slu.se-idp.xml
+++ b/swamid-edugain/idp-shib.slu.se-idp.xml
@@ -16,6 +16,7 @@
         <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <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>
@@ -43,8 +44,7 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIEJzCCAo+gAwIBAgIUZwFc9nyrWtX7X0Z7VsMOHadCW18wDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUZwFc9nyrWtX7X0Z7VsMOHadCW18wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxNFoX
 DTQwMDkxODEyMzIxNFowGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
 BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsR3Ce/qb3iyn/SE0/4NBDez7pTv8
@@ -66,16 +66,14 @@ ft3olZwcny84Nx6Ql4Emmpwy5+UBth7tny+l3SeeaPIEcCYP3bMoODjOyhYu8zoo
 GJBaVeOOmSKCrscIVIjwF5gwJKjY8ewSHw+57Qk7oApOo2RHHy1+XCkd7djLxLeJ
 ufIV5d7gdyWrCh6cM53cqU5lJQF/UM/0QCtpeg6Ld8LpnX+qlfZLObzE+LN4lrcR
 SktSFtsAxKMkt86J5whFsuM11acH+UzNI38vNEzHhrlVPdqr9Wfi1kwn+sO3KMe4
-wPg6Xtq8Rb1EphE=
-                        </ds:X509Certificate>
+wPg6Xtq8Rb1EphE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIEJzCCAo+gAwIBAgIUC48PxjALn7sXgB/pTvkwu7185A4wDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUC48PxjALn7sXgB/pTvkwu7185A4wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxM1oX
 DTQwMDkxODEyMzIxM1owGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
 BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAip5MBDd8vgTvs9n2egO7WrcekJu8
@@ -97,16 +95,14 @@ i6MNP47jwhxYb5mSxS/ztV3bvVAESh6hzlgNUzvhfCkZqMvcYKbaOole6dNjK1mF
 Y3Dry6gqRyCsKHGJMm//vdtfLarTLv5y7H1ZHAGxRikyWS+Y/iziFPY2npJizkyI
 6HlPnaQZM1Vuy1Oreottr929cyUQqonWt6+b23G2WbAbOab9uKWPMLe4tOBiiDE7
 ujeic7u2uPDoyu8mYgS3r++bjQrfqRRo/wYI5VF/n3KSFkCXZPx3CxbkMJBG6JeA
-UgKStld+SURLHX8=
-                        </ds:X509Certificate>
+UgKStld+SURLHX8=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKDCCApCgAwIBAgIVAJFX5qhjYlrtgOfgtb57wSa/EhuQMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVAJFX5qhjYlrtgOfgtb57wSa/EhuQMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTAeFw0yMDA5MTgxMjMyMTRa
 Fw00MDA5MTgxMjMyMTRaMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTCCAaIw
 DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAI+DF3Vz6IlU5hxi+a3718iunTb7
@@ -128,8 +124,7 @@ SWe/AdSARRe4hxWBNwHSo1HlrpG/Gobhh/yluvSVLMd8BNdjKWWFaSwNCe0tw91U
 dt5jXfcmrDtr6sRuHoEmrm27lk9q4cj82Do1f5q79v51jYMtITNOpGZlx5Dskmgk
 cJo78+sWNUwKDrCtXE6e6hs8W/RD7VDZtP7OIvCVZpjCodjoiPdz8zOirIFcahPf
 jHiyDn2ImKKJdsVU8n21d7aEShNxDviRnRhiZaILmaqVZHvslZq32XNbgZTPySWL
-ffEVzH+iKOe5hd6R
-                        </ds:X509Certificate>
+ffEVzH+iKOe5hd6R</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -138,9 +133,9 @@ ffEVzH+iKOe5hd6R
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SLO"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SLO"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shib.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shib.slu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -149,8 +144,7 @@ ffEVzH+iKOe5hd6R
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIEJzCCAo+gAwIBAgIUZwFc9nyrWtX7X0Z7VsMOHadCW18wDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUZwFc9nyrWtX7X0Z7VsMOHadCW18wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxNFoX
 DTQwMDkxODEyMzIxNFowGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
 BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsR3Ce/qb3iyn/SE0/4NBDez7pTv8
@@ -172,16 +166,14 @@ ft3olZwcny84Nx6Ql4Emmpwy5+UBth7tny+l3SeeaPIEcCYP3bMoODjOyhYu8zoo
 GJBaVeOOmSKCrscIVIjwF5gwJKjY8ewSHw+57Qk7oApOo2RHHy1+XCkd7djLxLeJ
 ufIV5d7gdyWrCh6cM53cqU5lJQF/UM/0QCtpeg6Ld8LpnX+qlfZLObzE+LN4lrcR
 SktSFtsAxKMkt86J5whFsuM11acH+UzNI38vNEzHhrlVPdqr9Wfi1kwn+sO3KMe4
-wPg6Xtq8Rb1EphE=
-                        </ds:X509Certificate>
+wPg6Xtq8Rb1EphE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIEJzCCAo+gAwIBAgIUC48PxjALn7sXgB/pTvkwu7185A4wDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUC48PxjALn7sXgB/pTvkwu7185A4wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMB4XDTIwMDkxODEyMzIxM1oX
 DTQwMDkxODEyMzIxM1owGjEYMBYGA1UEAwwPaWRwLXNoaWIuc2x1LnNlMIIBojAN
 BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAip5MBDd8vgTvs9n2egO7WrcekJu8
@@ -203,16 +195,14 @@ i6MNP47jwhxYb5mSxS/ztV3bvVAESh6hzlgNUzvhfCkZqMvcYKbaOole6dNjK1mF
 Y3Dry6gqRyCsKHGJMm//vdtfLarTLv5y7H1ZHAGxRikyWS+Y/iziFPY2npJizkyI
 6HlPnaQZM1Vuy1Oreottr929cyUQqonWt6+b23G2WbAbOab9uKWPMLe4tOBiiDE7
 ujeic7u2uPDoyu8mYgS3r++bjQrfqRRo/wYI5VF/n3KSFkCXZPx3CxbkMJBG6JeA
-UgKStld+SURLHX8=
-                        </ds:X509Certificate>
+UgKStld+SURLHX8=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKDCCApCgAwIBAgIVAJFX5qhjYlrtgOfgtb57wSa/EhuQMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVAJFX5qhjYlrtgOfgtb57wSa/EhuQMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTAeFw0yMDA5MTgxMjMyMTRa
 Fw00MDA5MTgxMjMyMTRaMBoxGDAWBgNVBAMMD2lkcC1zaGliLnNsdS5zZTCCAaIw
 DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAI+DF3Vz6IlU5hxi+a3718iunTb7
@@ -234,8 +224,7 @@ SWe/AdSARRe4hxWBNwHSo1HlrpG/Gobhh/yluvSVLMd8BNdjKWWFaSwNCe0tw91U
 dt5jXfcmrDtr6sRuHoEmrm27lk9q4cj82Do1f5q79v51jYMtITNOpGZlx5Dskmgk
 cJo78+sWNUwKDrCtXE6e6hs8W/RD7VDZtP7OIvCVZpjCodjoiPdz8zOirIFcahPf
 jHiyDn2ImKKJdsVU8n21d7aEShNxDviRnRhiZaILmaqVZHvslZq32XNbgZTPySWL
-ffEVzH+iKOe5hd6R
-                        </ds:X509Certificate>
+ffEVzH+iKOe5hd6R</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-- 
cgit v1.2.3