Merge branch 'master' of git.swamid.se:swamid-metadatamd-2023-12-08-v03

5 files changed, 48 insertions, 36 deletions

diff --git a/metadata/swamid-2.0/bankid.eduid.se-saml2-metadata.xml b/metadata/swamid-2.0/bankid.eduid.se-saml2-metadata.xml
index 35a71af2..51a9c085 100644
--- a/metadata/swamid-2.0/bankid.eduid.se-saml2-metadata.xml
+++ b/metadata/swamid-2.0/bankid.eduid.se-saml2-metadata.xml
@@ -135,7 +135,6 @@ GETOy+U=</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:Company>Vetenskapsrådet</md:Company>
     <md:GivenName>SUNET eduID team</md:GivenName>
-    <md:SurName/>
     <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/beli02.uhr.se-beda-administration.xml b/metadata/swamid-2.0/beli02.uhr.se-beda-administration.xml
index 77a625d8..7e3d7d28 100644
--- a/metadata/swamid-2.0/beli02.uhr.se-beda-administration.xml
+++ b/metadata/swamid-2.0/beli02.uhr.se-beda-administration.xml
@@ -37,8 +37,8 @@
         <mdui:DisplayName xml:lang="sv">Beda utveckling administration-sp</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://betyg.uhr.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://betyg.uhr.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://betyg.uhr.se/PrivacyPolicy/Eng</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://betyg.uhr.se/PrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://betyg.test.uhr.se/inrapportering/assets/privacy-policy/privacypolicyen.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://betyg.test.uhr.se/inrapportering/assets/privacy-policy/privacypolicysv.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/metadata/swamid-2.0/hhs-se.zoom.us.xml b/metadata/swamid-2.0/hhs-se.zoom.us.xml
index 085d0ec9..4fcf83b4 100644
--- a/metadata/swamid-2.0/hhs-se.zoom.us.xml
+++ b/metadata/swamid-2.0/hhs-se.zoom.us.xml
@@ -26,6 +26,43 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
+          <ds:X509Certificate>MIIG2TCCBcGgAwIBAgIQCclVIRdK/C35ZHiJ1nkyvzANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypEaWdpQ2VydCBHbG9iYWwgRzIg
+VExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjMxMjAxMDAwMDAwWhcNMjQxMjMxMjM1OTU5WjBx
+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIU2FuIEpvc2UxKDAm
+BgNVBAoTH1pvb20gVmlkZW8gQ29tbXVuaWNhdGlvbnMsIEluYy4xEDAOBgNVBAMTB3pvb20udXMw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7LrEtEBo3nruX9bS/bcx2w5gfVbAIdi/7
+cHEqbx8Nq68LR3glFRY4ImX5ZdZFDrKaNEMzHLo0qYGJhuvpaNnyPLkFFX0o3l1+6cvh7um4OlOY
+kZUobCoUpQvwgi9u1vXlbnKW8S2oAxeUKR6QYnJ9lFpCg7MvD6LgMQeVDsc6uRShGEumdm/6P+62
+LaK38Uk9MLt67c00ZqMG3plm/mw3Xqz8COg7I9b3e4kq4+QiHAlIE6lAK44UM3aJjARH2/9FE6r0
+Vm5cFndc0nTCPeB6qAVapcY9nwNmdV/1kUBh5nj9YDubFkVSzho58vfXbh9Rk6laozYFNZqoxZjR
+jQKBAgMBAAGjggODMIIDfzAfBgNVHSMEGDAWgBR0hYDAZsffN97PvSk3qgMdvu3NFzAdBgNVHQ4E
+FgQUChR+rkVSirenP0jfaWLSIMiLAMQwEgYDVR0RBAswCYIHem9vbS51czA+BgNVHSAENzA1MDMG
+BmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwDgYDVR0P
+AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBnwYDVR0fBIGXMIGUMEig
+RqBEhkJodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9iYWxHMlRMU1JTQVNIQTI1
+NjIwMjBDQTEtMS5jcmwwSKBGoESGQmh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEds
+b2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS0xLmNybDCBhwYIKwYBBQUHAQEEezB5MCQGCCsGAQUF
+BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wUQYIKwYBBQUHMAKGRWh0dHA6Ly9jYWNlcnRz
+LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS0xLmNydDAM
+BgNVHRMBAf8EAjAAMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdwDuzdBk1dsazsVct520zROi
+ModGfLzs3sNRSFlGcR+1mwAAAYwnHVfRAAAEAwBIMEYCIQDRMfWIpMJjvSxMfBq5gjh4UVm9StSg
+rb0e5rsAKRQj8gIhAJ1nch/ry0R/5kxXrbCaOwbNlwdUCncqL+h+Qs9QuPGlAHUA2ra/az+1tiKf
+m8K7XGvocJFxbLtRhIU0vaQ9MEjX+6sAAAGMJx1XRwAABAMARjBEAiBoGV7gedwjhZvO16ZJVNm6
+4cM6fr97Yxdhyg0jWSfi5QIgXsgee3f0dNf7ULr+SPruuYPiqX4fFOJ9TqK2uxfmjR8AdgA/F0tP
+1yJHWJQdZRyEvg0S7ZA3fx+FauvBvyiF7PhkbgAAAYwnHVd8AAAEAwBHMEUCIQDxUfQaKOMhClwa
+OHoJ5Y1Frielt3dFfbrDBvmZItBGCgIgTPeCtxtZ49tU8ZMlRkEjRP5D7o528Lujt88gCuVfVqgw
+DQYJKoZIhvcNAQELBQADggEBAGAVq+3/vBXXw6QvDE7OlqtJziSW2pu5NY+LSitcNKsMJrjCkvNP
+CbCmmIGxwZcWDSVVLfbox37f5z66Tz3p4R8ejTpNi6Kf5G93Mx1X4eZbLTnijBzj22q1K2sn0KQe
+s8oCaCb/EUWTg074lGdDq9wj9opkduWaZu2n3tmk5h1JLy2wRmQ0/URw81kBQiG+mRVn4+XGX60D
+mr9WtMhpEJ1Z+M2sRDUqWwmw2E1p2BkwxMNXDLlHN6jHSfwzzaB64oXZp3/ItwDaT4mlxVVXtqCd
+MIUL9QGKjl/wJiK/G6u5yPtsRtn5UIeY6qrodhhGc7pHuTFAmvTnP13CaCRR5y8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
           <ds:X509Certificate>MIIGtDCCBZygAwIBAgIQD6Z17ItDWQu0yyxAtAnrYjANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
 EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
 QTI1NiAyMDIwIENBMTAeFw0yMjEyMDIwMDAwMDBaFw0yNDAxMDIyMzU5NTlaMHExCzAJBgNVBAYT
diff --git a/metadata/swamid-2.0/hr.su.se-shibboleth.xml b/metadata/swamid-2.0/hr.su.se-shibboleth.xml
index fc18654e..6d247066 100644
--- a/metadata/swamid-2.0/hr.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/hr.su.se-shibboleth.xml
@@ -33,34 +33,10 @@
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>hr.su.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=hr.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3zCCAcegAwIBAgIJANTo9EQ1a/exMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMTCGhyLnN1LnNlMB4XDTEzMDQyMzEzNDgwOVoXDTIzMDQyMTEzNDgwOVowEzER
-MA8GA1UEAxMIaHIuc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC3CRsGCf/rcIKzBHKNz7faRCr0YGRmGayeX1E8wn5Dvc0S98kpl1AWwDSeTva0
-/bL0RTykVPoeRCUzb3Y2gpWvjA7vZp6Z+T3ovEdWYoiSyjytXejcEFjGhPRFMSm/
-oTwZ0GV603iXO80Xk6t6LSAA4WiWZzLJs5TsHP+BvhTIYzSgsnZjHRY4UDrA3tCj
-tbFGtMepuvrtahhQrPWJA2MPbkKoQy6fVH5sNVvUKFSMbcLfJ37P5k8k4FH7veub
-83AoWVCz5zGyOciHz63IkTYBZunnK11kzLK2wNtabMqz5CDF++HzohzyzlrDxPmL
-ajAR63tKbLK5rEm0pum3NaHjAgMBAAGjNjA0MBMGA1UdEQQMMAqCCGhyLnN1LnNl
-MB0GA1UdDgQWBBQn07JAhkAPp7OpVUGizezK8POxCzANBgkqhkiG9w0BAQUFAAOC
-AQEAYHKQjVhqWjeS8uFQGbqrvDef6AH0lXVnCOJf8WrDpmDTI/zmy9qayf2bbIXg
-M+8W79NkWdxirKImqAVFeYST4PXBONuXOgz5YMc8adiDv/6jeFZ8T1X3py8v15VR
-qL01A8lR0w7BLIVr+dh5bVznc0k2Bqb6OpXkhvs8Q3LuO0EJYScbLAPUPcF0m24B
-Yj4ybSzJjKJ38MxNnYWL2kjjzkgNdWVOd5Dnak3PqK9/2o9RJzqoWA9ZgEVFLdy/
-gwi5chzD+EG7sLZMZ+izxSBoFuMKIFfmz37zEafLh0z1YOBqLt20uxjw+ulMKLz4
-+Wt+7p+EmxcIvl5G19k9wtgesw==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo 7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7 2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1 DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <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://hr.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hr.su.se/Shibboleth.sso/SLO/SOAP"/>
diff --git a/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml b/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml
index a71f02d9..7527d37e 100644
--- a/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml
+++ b/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml
@@ -12,10 +12,10 @@
         <mdui:DisplayName xml:lang="en">Uppsala University Library</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Uppsala universitetsbiblioteks EZproxy.</mdui:Description>
         <mdui:Description xml:lang="en">EZproxy for the Uppsala University Library.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.ub.uu.se/?languageId=1</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.ub.uu.se/?languageId=3</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ub.uu.se/om-biblioteket/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ub.uu.se/about-the-library/Personal+data/</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://www.uu.se/en/library</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.uu.se/bibliotek</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uu.se/om-uu/dataskyddspolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.uu.se/en/about-uu/data-protection-policy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.ezproxy.its.uu.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
@@ -65,12 +65,12 @@ ySqAPd9hUwAFL5puOeLc3XKq</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ezproxy.its.uu.se/Shibboleth.sso/SAML/Artifact" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University Library</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University Library</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.ub.uu.se/?languageId=3</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.ub.uu.se/?languageId=1</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uu.se/bibliotek</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/library</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitetsbibliotek</md:Company>