From bd6bfa2f0063d9c05e4b708be359a2ba8686eb7d Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Mon, 22 May 2023 09:39:04 +0200
Subject: SWAMID-2891: Updated 4 SPs for UHR

---
 metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml  | 5 +++--
 metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml  | 2 ++
 metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml | 2 ++
 metadata/swamid-2.0/valda.uhr.se-shibboleth.xml      | 5 +++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
index 49ec51c7..a0ecfae3 100644
--- a/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
@@ -69,8 +69,7 @@ tH+l3JxvU+GhmCoWlO9DlVZlnWgj3+E0ztHicWGMwp/W1XlLPeE9trN8xl0PzhXL
 0w7toajxrTHbwic/udn9VPsOo4PQU9/CM7r+eJcGxKFfd+c8UFnh38xN3LRRBONZ
 nEZe2u2BUKKyW3Bny3AK0enVlnmqkw02xt8x8B4AHJIFaSk3bAeG7XgrBl1jQHfK
 gFk0V3eoVBSPe/jvSS8nfsbKV6k2dXkUZa8Z2u2h457H1ikxlLqEUKFyK1tDDFhT
-rLT94sn8cj6s7zqKnIBXqdrL/fL8Aw==
-</ds:X509Certificate>
+rLT94sn8cj6s7zqKnIBXqdrL/fL8Aw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -106,6 +105,8 @@ rLT94sn8cj6s7zqKnIBXqdrL/fL8Aw==
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" 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: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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
index 5a3ad763..2a65e596 100644
--- a/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
@@ -101,6 +101,8 @@ JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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: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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml
index 12992bf7..b7e381b2 100644
--- a/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml
@@ -102,6 +102,8 @@ BwquFopAQg==</ds:X509Certificate>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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: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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml
index 59e2b5b3..5dfe38cf 100644
--- a/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml
@@ -70,8 +70,7 @@ Ti04hluKrlA7T1wgPGcabe3MgMK3Tps9QLGJ9VGKJZO7wCSZlnW7syxGzwjMaCJ/
 s3RsLImcgbCPUhjEbn7UX/75TvnJj+NQJjwF4ONAqXOzUjEgcIW6NkteX0ktDySZ
 vmKhQu0BVyEAnNu7uO9Q3rddJsK2N5DSjhQDl+H/LR+VPGsqTSULKrQoHudsYeKP
 RrcgAwWR573F+C6Cqrt89uDpyQ8ZM2Z+LZdIvrhBYV/lO7Dk9uZF2d9f7ew48DeA
-/P6i510LqFmJvhvEmcc=
-</ds:X509Certificate>
+/P6i510LqFmJvhvEmcc=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -107,6 +106,8 @@ RrcgAwWR573F+C6Cqrt89uDpyQ8ZM2Z+LZdIvrhBYV/lO7Dk9uZF2d9f7ew48DeA
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" 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: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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-- 
cgit v1.2.3