SWAMID-3747 key rollover for login2.fhs.semd-2024-01-25-v01

1 files changed, 19 insertions, 12 deletions

diff --git a/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml b/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
index 147d3d89..60e3f8d0 100644
--- a/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
@@ -10,28 +10,28 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <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://myacademicid.org/entity-categories/esi</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://login2.fhs.se/adfs/services/trust">
     <md:Extensions>
-      <shibmd:Scope regexp="false">fhs.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">student.fhs.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">op.fhs.se</shibmd:Scope>
+      <shibmd:Scope regexp="0">fhs.se</shibmd:Scope>
+      <shibmd:Scope regexp="0">op.fhs.se</shibmd:Scope>
+      <shibmd:Scope regexp="0">student.fhs.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Försvarshögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Defence University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan - NEW</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Swedish Defence University - NEW</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.fhs.se/om-forsvarshogskolan/kontakta-oss/om-webbplatsen/swamid-service-definition.html</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan - NEW</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Swedish Defence University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Försvarshögskolan</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university/about-sedu/contact-us/swamid-service-definition.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="671" width="2494">https://login2.fhs.se/adfs/portal/logo/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="671" width="2494">https://login2.fhs.se/adfs/portal/logo/logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">fhs</mdui:Keywords>
+        <mdui:InformationURL xml:lang="sv">https://www.fhs.se/om-forsvarshogskolan/kontakta-oss/om-webbplatsen/swamid-service-definition.html</mdui:InformationURL>
         <mdui:Keywords xml:lang="en">fhs</mdui:Keywords>
+        <mdui:Keywords xml:lang="sv">fhs</mdui:Keywords>
+        <mdui:Logo xml:lang="en" height="671" width="2494">https://login2.fhs.se/adfs/portal/logo/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="671" width="2494">https://login2.fhs.se/adfs/portal/logo/logo.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university/about-sedu/contact-us/identity-provider-policy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.fhs.se/om-forsvarshogskolan/kontakta-oss/om-webbplatsen/identity-provider-policy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
@@ -42,7 +42,7 @@
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQRBjHJZJ1L7ZL2Lqhx4XGfzANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBsb2dpbjIuZmhzLnNlMB4XDTIxMDIwODEzNTEyN1oXDTI0MDIwODEzNTEyN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gbG9naW4yLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6CvoZweCA/01FxYUPFPslb/ifhi4Mkh842rUrPX7Iy6GOwG1cgx0NruHR7cDVzteVJoOnhMcewr8Kw2Qz6+wjEq9Q5KsWmJ/ijqhMMTnl6Ku6W6aiB+WyeM3+o/cHor40rQTXWdnPBOJ/SxQufvmQtkTTPZpXmYKPzY12m5cLXlDMWhMBXj0psYFt/RmfkdMcQ15ZioMVTybTIQ2AvCtyP1tOZcouYaueGRa0X1aEa2abVY8RBzHyfhNgH9Ondt48qG4NXQX78iNWEENGTxNGX1qsSCZ9OncGd/zV7UT8q0JPjcfl4WYd4aaWQSGL1n7iL0rUcWvOj6XbUJZCsPVkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAnRGUTC6JbHljdWDhJO8y+S0PXdMbZuIgnaSmQl50sU95tfwCH9JGTMGsS5XdysZdI8bCRhJ019XxVoyfA45PgsdIpg+tcBvBxL31OddPb/n6HLY/EhJSL15W9zphStWZkOSzoC+VBt10tBCQCpa8MCq0YQwFKh4PwdSXESkSvQ+ASpCZ0ALim5tg10tAwNIW5M98+GGTwc+Tv2c8iPs9bKQVkwyYzn53x9bplUOCt5AL2oVZnBHFiOPk+j10gDhu+aR8Ypzw7I8XwRI3xG2x1tVDUB5vVEBgG3usA+HD83KA+a9yRZNYjkpG9bouCAD/rrij9qN6u7molHCeXs/pNA==</ds:X509Certificate>
+          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQMjDr+97QMq5NF6LVQPu6azANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBsb2dpbjIuZmhzLnNlMB4XDTI0MDExOTIzMjQzNloXDTI3MDExODIzMjQzNlowKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gbG9naW4yLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwnmdIxwdna5y//MZzy6WSTWzZ6L91F+/x46Xz8wWFiPvu7X3xkDD850zq7VCm04Ox9iV7Sox0Loso/siUhrtXsx5O5KolX9NwP9+zQ6hS842p7tvYnB/sT8c+RcLzof4qo/tR58/vmTSqIxXDs2Gp49eCNNi1+eZfKVw4gg9jbYJttogaFmrwEmfLeZoGgZLhuLPYjjcBfyxXZd60lR/x2m+sB/hAVVy5eDoaVTrkhMjgmaMLU8fmQlqmjsUmDi+FILR+ao/m4sHxDB4zxFZZhDr11An6Gk4zKa0JjKr7jDas8Mn4VXERb5/TEPN5mckHb7URpiuNvjlIbr5tMTbECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAYVmFhmGFaeVbQDCJAuvI6hJOIbVgkx34ivEAZSuerEbQgjJofykeohg0F4bmkkdh7ej4W+WcGO5B6HhSKgqlDjA6XSYXZ9IXKjdVmyktz6E6Ip3IjG826f1jq2cVo+F11SAGGbnJz3/pVj3TTDihteYNH5qqNrKY1NZQR5amJCezSwgM3qCMXnpyjIAEC5KSFPdDXag7wXFVBSqrkjgITb3gpvuWo3pFGqPiPotODFEAjS1tlK/8+3P3XtPRuwo3G8183uYWjzsIFU2/Rlv9IMMcbWqAEmx8AJtPI33gcAGnHs18Y1iNcWaXxA9UvQEX/IK3wAUiFHJHlowzZZcN9g==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -53,6 +53,13 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQTNYnCI5ivLRJj2xb4TIt8jANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBsb2dpbjIuZmhzLnNlMB4XDTI0MDExOTIzMjQzN1oXDTI3MDExODIzMjQzN1owJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gbG9naW4yLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXxiWKWm2VrEo9KAMCRBIVj21aBmraMZjhnbIqCfHtA+n/9MXcGUE9GVzes2DVrtahPh3vOvTCJajOVTRXzQ+mz3ybk7hoBZFdzD+n/QieRcwlDcRClJ2kNJfMjq46TSWfXj0Ewz7NTgDhq16bhWXXEqyHloMZkh1J2oei31o7lPtt7gbcp+ttLJiJwa5BApcHFkF81IhXmGPDpVTr4UMgZFeJurU4AT9zUpf657t6PjeXZQXwoTWFibWqUk7HZPWPi/iIftOwwlxP7Z7g0yCj1S3Op++BWx/A79koS7Yef84nQEt1beoyGnBxU/AJtbRelEtRSxZlFcitzqAaW/RkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAIGDig83XECIrRRW8QxDcN3LxQVQMGgRxELhDjjm5LmFMk5bG+9GxEPzS5ASp3383BsSW3h8oL7ylVGWZkpSqFV2mrp7LmgsBoWv8QRG8PbNnqAjT+v6f0q4oCWQIBUGk//dw71LwDMBuT3VLVPQ8iuMYAeW8NQI1INnKwmOd4E9sBTC4gYxnQq0mmBEgwPrtrkT5WOf/u9D6uv9spwGCuKJnZJ5WNavtxPr5USekrTsSe1qFO7cyTv5C9lfIr6nV/m5Gh7gwHxmcqEBMxlGfX5bMa40s5e9uhIjMDLIJCFw0qOMjYk4uzdcBHrYBi4a+qQLHdMmP5iZfQPf6KQz5MA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.fhs.se/adfs/services/trust/artifactresolution" index="0"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.fhs.se/adfs/ls/"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.fhs.se/adfs/ls/"/>