From d74eeb4bfd62290f9ef8230cd14e1bfa27da8dc1 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Mon, 19 Dec 2022 13:02:45 +0100
Subject: SWAMID-2383: Updated account.hh.se

---
 swamid-2.0/account.hh.se-Shibboleth.xml | 58 +++++++++++++++++----------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/swamid-2.0/account.hh.se-Shibboleth.xml b/swamid-2.0/account.hh.se-Shibboleth.xml
index 815b7b03..0fdd07b1 100644
--- a/swamid-2.0/account.hh.se-Shibboleth.xml
+++ b/swamid-2.0/account.hh.se-Shibboleth.xml
@@ -44,37 +44,36 @@
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>account.hh.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=account.hh.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJANrRd35k7LpWMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWFjY291bnQuaGguc2UwHhcNMTUxMjA3MDkxODEzWhcNMjUxMjA0MDkxODEz
-WjAYMRYwFAYDVQQDEw1hY2NvdW50LmhoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA2HB+aZke+IC6XxLw2ZzHyJLBQhw/rgIUvdGOcTuU5ypQbKAO
-V1BQwBf/rt+BXg4pmms0zyGXZdwmmWTtdSmyVAWTIBHLigzbC15kjHBWNa7anCtU
-Dvs4ufdcc9H9dzaJ3l3rMnNUTtMWB4ejl8I2iJ/KGJxLr/WjG/Bqdd9vHC1vy6qk
-4EhsGdlEG9wGKex8zbd/ZfEW2BURpu6QzhVDOSxN9tmEjCqZgBdGeCS0eIYiSWou
-sLGHmsHuFkbj3N/X/C/liPNsrkZlRZTo7771P5ZXpCGPiUhy55c9w8DVJH3v/Eck
-MPn09RTv/07q4c+/KT44KTjPSbE/ViMO7z8mmwIDAQABozswOTAYBgNVHREEETAP
-gg1hY2NvdW50LmhoLnNlMB0GA1UdDgQWBBQNLv4rShYW33jjJr4ktO8USse3NjAN
-BgkqhkiG9w0BAQUFAAOCAQEAUbSIeQhGhRVh4WiAUQHC5YXG5bM2za7Ypwr01OtS
-10rGvweXYu0i5lTsuXDvkoZG3f16guXytmRnq0TT5maRJvfrWvVFbzaPCMOpXwFb
-Jiy+4HsIFEdqFrwUbCu5Q3KKXkTl+VZQb0GooFiZSdKGdA7Ij/uNU6U8ZnLKDJqq
-1rhu4mDXbyGP/9Mxhw62QMn9SDXFv/8t0XdM8nHu+Ai65BdSLmVwIo8V+Dcuf9cZ
-vw4SWII7yvqumgRvNcDvdMSYHvI3sxwtGMFz2FV4MKl9k6R46tt6kgnynyUThn4t
-bK0IFZ5apkn9N3YME8KiyAf5bSY31fBoQVszf+Gm2wN+qw==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIE+TCCAuGgAwIBAgIUUu9RlYuVKrvsC6QovKtTDmL2RiYwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAxMNYWNjb3VudC5oaC5zZTAeFw0yMjEyMTkwOTU5MjhaFw0z
+MjEyMTYwOTU5MjhaMBgxFjAUBgNVBAMTDWFjY291bnQuaGguc2UwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQDBernc+U3ySBcL3ifwormKvMI8CJOop3Eq
++Cmlw7fcrWTkfa8MYCtplhA/dxWg22tAKGCs4d3DomChRITyzF0xS4chFJ0FL6et
+RJrsrp9Yzxy7qhW47qAh0EB8M3b4sKN8CfhMQGi5UuMAcVJyzOMULaNZk34IvSet
+bSYfFzERJpPMuNMTyrrP27zCwMjdP5U4lkOSqmL15ZOk+aldj6Gf6p6vFahQH9px
+j5BVXAq+pzxQY7zvY4flpQs8bxcS86uS44pH51jtQmBoUcCUPSaRdM4voFvp5RqY
+E0T9VoLCU6B7vQ+Vg5uPEV7ywkduWg3n0IpKKckcmEnLDY9u7HX4xr1tgZU5CjCm
+tfNHlBIi2J0BbXXsdrBytrrp2+6oKdTHwYPg83Dl+BhPpHIb09dbGUsn71n6A7EP
+qzanvanLoQFifTdIKuRGQxTXT+S8BtNscEB2krkCGC9y+bw39g1vQfLDUtDG2JCH
+wHC2/MUcOM+hVMyr88nVHtBQEcfH0bWLGhtrD4irp7jS1urLHBYuQLe+SGrj/t65
+4xtdDGICIRT7mLPA6OdaC2T1Sg6SAfHVfgqacAWiGah9awu5TnAswFMJUAvBQ+pG
+ko0zbL4SjrJ6zeofR4uCbLpN7iJJRx4StlY1AC2LMM1VQAjtZrOYAP6EokB5z64f
+NmCCXdw+pwIDAQABozswOTAYBgNVHREEETAPgg1hY2NvdW50LmhoLnNlMB0GA1Ud
+DgQWBBQjaaPeEgsYdAaxBYxTJpMl3cbX3TANBgkqhkiG9w0BAQsFAAOCAgEAub02
+i0jSuPwwvLps1H0WTxa7JkwtzZYtZIIEP+9W/cuT/S6wPVQ20/Vz/KDAFezl1D2F
+Tg3/OssBPNtNELGq9FF3k3bcjy16lKg6H4UX8Ofsk0lyJSQdYKiTXid1hnnx7Wgv
+CaDGknyNr8SakO5TRpzXo8eSLr7Dj7kxjQal3XoNzuNmcpclanAOngHmQTd98aeF
+kq/GGebDsjZrkOKFN8homy5ty5h9zA3KCBBrt6wu0N01gG06tMcZ0yDM3JpSshGO
+YxypG6s+KIKC855AmK8Kdo8JkG2XJ4uMKl0fV3Ig9WfKisio7BqyATsamNE2+IH/
+jdPJEUg7hrlXHaX8DXIIl1XZqmlCDgFPdTYEiRR5vyivJJGnsxMk/m+u7VGsnxOd
++Dixhqut9LC6iFHZadxnU9dkbMG3wyr3ywIBKkE6bY1ThmizLiHnVt7Z4XitZOH7
+lxytIr3/a7uwQVizQzvR1ykZ3ISVhZzdZhtKprTh6lfZ22m9FsIv7IRBv3Lythr1
+MJj3i1oxxYcWGU+QMal+HujZVM0I1Fqhh9ecoYR7+TmKmjuq6LrE0ZkReh+QxWQi
+KsIs0VvRHVX6+G0CvyIMrZPDzUWH7yVoDz+U/xeDRq6o6Lf/n+Xedhlw/WQXGjQK
+10Tx6TFpPjIpKhWXkvcrtg++Bj/DjuPIpJNGqX4=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/SLO/SOAP"/>
@@ -92,6 +91,9 @@ bK0IFZ5apkn9N3YME8KiyAf5bSY31fBoQVszf+Gm2wN+qw==
       <md:ServiceName xml:lang="en">Halmstad University, account activation and password reset</md:ServiceName>
       <md:ServiceName xml:lang="sv">Högskolan i Halmstad, kontoaktivering och lösenordsåterställning</md:ServiceName>
       <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="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="givenName" Name="urn:oid:2.5.4.42" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-- 
cgit v1.2.3