Merge branch 'master' of git.swamid.se:swamid-metadatamd-2023-06-19-v03

5 files changed, 5 insertions, 38 deletions

diff --git a/metadata/swamid-2.0/hhs-se.zoom.us.xml b/metadata/swamid-2.0/hhs-se.zoom.us.xml
index c3ae2b20..085d0ec9 100644
--- a/metadata/swamid-2.0/hhs-se.zoom.us.xml
+++ b/metadata/swamid-2.0/hhs-se.zoom.us.xml
@@ -60,43 +60,6 @@ xFEIAakZ2fyywt4v69l48K9/2kWs8PBshSPhTExTT1Da3oEr/EkAoiPWnOrUZlqWd2otiND6r7+q
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIGtjCCBZ6gAwIBAgIQCf48SVwTzO89aW3TTSBUPTANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
-QTI1NiAyMDIwIENBMTAeFw0yMjAxMDUwMDAwMDBaFw0yMzAxMDQyMzU5NTlaMHExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEoMCYGA1UEChMfWm9v
-bSBWaWRlbyBDb21tdW5pY2F0aW9ucywgSW5jLjEQMA4GA1UEAxMHem9vbS51czCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMojahRTgictiNEB+fQXIFnxZEqgygvhCJn0Hov4IVM6e7a+
-dMJo1VQsgExMB1PSanNvbs5CSmnH4rOSdA3QZrLqV388aXXDYTnMaWj+sgFPlVWUTRGU7cg/v3gX
-NONYAjnspYkKPSevw9hogchfNKIb22oFhKqcEW6Om8l6uWoBuA5iOV6xD0pK5kz6tCQZT+/XgAkc
-RYflPyHSJcne50ETOltttnrronSf9mRDV3GuO6jinR3vrjoPBxJRHvCIzbwtrFFtxbJtZxvDDwoj
-W+1N0zxIKuqDDbNz2xV5ljc+O50MrrpNNAhrK43MhJFCnDnpVa7mD/hnhvjXDxakUJMCAwEAAaOC
-A2owggNmMB8GA1UdIwQYMBaAFLdrouqoqoSMeeq02g+YssWVdrn0MB0GA1UdDgQWBBTOCRYgvopA
-dEFLhLr0FUufc47Z7zASBgNVHREECzAJggd6b29tLnVzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NybDMu
-ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDBAoD6gPIY6aHR0
-cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDA+
-BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNv
-bS9DUFMwfwYIKwYBBQUHAQEEczBxMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
-b20wSQYIKwYBBQUHMAKGPWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU1JT
-QVNIQTI1NjIwMjBDQTEtMS5jcnQwDAYDVR0TAQH/BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIB
-agFoAHYA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4AAAF+KAVBygAABAMARzBFAiEA
-rtfeQ99OhmoaWWW6C+cEOoOwXwrZMDaJXhsoGdOy1jgCICAfL+l2WkJ9B1lKb6D93rWANj2voiga
-BEy6CCj+fI7/AHUANc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAF+KAVCFQAABAMA
-RjBEAiBOxbNBm8bHEcz+AJiSLW6RP2pZUzxJRmUjwaJlXN44sQIgJDKdCUMn4GFo80idD135JaqJ
-LorDPfSBDvL73t+Yu6cAdwCzc3cH4YRQ+GOG1gWp3BEJSnktsWcMC4fc8AMOeTalmgAAAX4oBUI0
-AAAEAwBIMEYCIQDbkQO7Uq7yq+s2zHu++WzuhtKVEDkeVzfStZVWDBHgBgIhAMcTpkfrd/b9RI8/
-k48BrNXLnVJX1o4Qw5tTuPvAvmk2MA0GCSqGSIb3DQEBCwUAA4IBAQAog8XzmWnid9A/wtsn6abK
-yPNFFss7YhPgWY0PnBpbnvxQVeP5oCDU/3YecyaXbm0CiY4dEH22EV5nNVgSVLPcZud75W3VVYlV
-DhZtmTIEGF6FnYv1Q1tek0Okgf03XdKWwODqYSY+3FwaBa6cON6Vw7bhVRVl3KuMtuH5vSJP2rAE
-lYhdyaErrG3nwskUpqIZ9wwmjXRQW6705G5yk3Y6vRqoRefSbO7QqTxABvwGh23GDhyiW+rkibU2
-VKj5OfOwlyK5N91EbZUfLsO2U9hg//ZdOJMmxvpO6UgZBmd7TjOdYM8Nkr9CBB1Jm1+CgfqrQgeL
-mYIp+qov+EzUDeCQ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hhs-se.zoom.us/saml/SingleLogout" ResponseLocation="https://hhs-se.zoom.us/saml/SingleLogout"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hhs-se.zoom.us/saml/SingleLogout" ResponseLocation="https://hhs-se.zoom.us/saml/SingleLogout"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
diff --git a/metadata/swamid-testing/idportal-test.slu.se-sp.xml b/metadata/swamid-2.0/idportal-test.slu.se-sp.xml
index 0f383ea0..11a7eb39 100644
--- a/metadata/swamid-testing/idportal-test.slu.se-sp.xml
+++ b/metadata/swamid-2.0/idportal-test.slu.se-sp.xml
@@ -48,6 +48,9 @@
       <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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" 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="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="mailLocalAddress" Name="urn:oid:2.16.840.1.113730.3.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml b/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
index 1a4fc966..26911231 100644
--- a/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
@@ -15,6 +15,7 @@
         <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:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/metadata/swamid-sp-2.0.mxml b/metadata/swamid-sp-2.0.mxml
index 2d41886d..52a9feb1 100644
--- a/metadata/swamid-sp-2.0.mxml
+++ b/metadata/swamid-sp-2.0.mxml
@@ -144,6 +144,7 @@
   <xi:include href="swamid-2.0/id.statenssc.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp-proxy-social-test.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/idp-proxy-social.sunet.se-sp.xml"/>
+  <xi:include href="swamid-2.0/idportal-test.slu.se-sp.xml"/>
   <xi:include href="swamid-2.0/idpproxy.dev.eduid.se-eduidsp.xml"/>
   <xi:include href="swamid-2.0/idpproxy.dev.eduid.se-sp.xml"/>
   <xi:include href="swamid-2.0/ids-test.mau.se-.xml"/>
diff --git a/metadata/swamid-testing-sp-1.0.mxml b/metadata/swamid-testing-sp-1.0.mxml
index ed510b75..7465cad5 100644
--- a/metadata/swamid-testing-sp-1.0.mxml
+++ b/metadata/swamid-testing-sp-1.0.mxml
@@ -5,7 +5,6 @@
   <xi:include href="swamid-testing/devrb.lbic.lu.se-.xml"/>
   <xi:include href="swamid-testing/id.test.easyvote.se-Saml2.xml"/>
   <xi:include href="swamid-testing/idp-proxy.test.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-testing/idportal-test.slu.se-sp.xml"/>
   <xi:include href="swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-testing/konto-test.test.hb.se-Shibboleth.xml"/>
   <xi:include href="swamid-testing/konto.test.uu.se-shibboleth.xml"/>