SWAMID-706, Cert-rollover for adfs.kb.se

1 files changed, 59 insertions, 57 deletions

diff --git a/swamid-2.0/adfs.kb.se-adfs-services-trust.xml b/swamid-2.0/adfs.kb.se-adfs-services-trust.xml
index 977feddd..261615bc 100644
--- a/swamid-2.0/adfs.kb.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.kb.se-adfs-services-trust.xml
@@ -5,14 +5,14 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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://adfs.kb.se/adfs/services/trust">
-    <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://adfs.kb.se/adfs/services/trust">
+    <md:Extensions>
       <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Kungliga biblioteket</mdui:DisplayName>
@@ -21,63 +21,65 @@
         <mdui:Description xml:lang="en">Identity Provider for the National Library of Sweden.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.kb.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.kb.se</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="516" width="488">https://idp.kb.se/idp/images/logga_FB.gif</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="516" width="488">https://idp.kb.se/idp/images/logga_FB.gif</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="516" width="488">https://stilguide.kb.se/vendor/assets/kb_logo_text_black.svg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="516" width="488">https://stilguide.kb.se/vendor/assets/kb_logo_text_black.svg</mdui:Logo>
         <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
         <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kb.se/om-oss/hantering-av-personuppgifter.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kb.se/om-oss/hantering-av-personuppgifter.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>kb.se</mdui:DomainHint>
         <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
         <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC1jCCAb6gAwIBAgIQK8vd6JBUMqtJdjoeKhZjhjANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLmtiLnNlMB4XDTE5MDIyNTEyMjg0MVoXDTIyMDIyNjEyMjg0MVowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5rYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMOj2fDH6EZN/l+7yQp2XS4FL+ZhIXIP0unySoqfEr5cVI1UtdHsn7qhfpBwQ8R7ho+wvHjyJWe2k3WewxgSJoARssUnsFUfjb++4EZTJA1BtZWD1qnodklOSHj9M/LF5ehggjEiBzNgvQOWO3yD1btWe0M6l60h8olxuMBIZaLkf41JuxPUvo21f1Jws2rct2KqWboSqknfBBRkhDA1mSgxp73KNA/aEcpOoJsTJ/UaVtPvZFydnQA1Gi+vW5vxjvFDj6XHtQsK4QRHXA2IAqOaeHuWxx7fTT2vdxlJqYnkoEiX9vzVSFYjS0ZOp7aitfnrWrqLSFf/WVCU4CgbpOsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAbK2rezohAyq72GqLGqOrbFRDqZdJxc5QFPDMkqw2VMuTgsEHEYM7Eb2sfUxrrY0+C0p9f1FbZBWuUaDTjNn7jBfwsuY5IOBPaGnIGJLnilhDemhxJQlQRqne/ap9bBjRst5uPCIxrVWYYZ6nSbtd+BA5NBVyhXOlZ0Qq6vGV3ZkR64cnkjZe0V36auzDZEx2ZWkimmIFFTWfYqYYOc9Ufuhg+KQ2/3Ax5K8U8c2ntdSU0fJphC0Z0jira3C8moex/82klDjU9aRoM4JC1lWBMAENW4rI1yDZLPLxEjHFamMsFjwj5AKxIYo0sM07eqjqLWI7yV5ClwyxRHuxMOVoNA==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0DCCAbigAwIBAgIQe6qQzwI3yqlCopIhJldnlzANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmtiLnNlMB4XDTE5MDIyNTEyMjg0MVoXDTIyMDIyNjEyMjg0MVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5rYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKppZVE6ibbIut/nCMpZEbBPZ1iArWbGNO3OY2OKCbwtBdN/59d6u3FpYGaxdI0Ed00//VuS0JEIpJfJa8BH5rnKlR0N1oq1yfOMcRNToJBxbTQsjiSFLaJsT3PhSZyjnk3Gp1ecd1wlfNFVOjuSRcfJbODtV/f9H7fP/wY+lMKmrmejl9nLrtbVAocRhI6vslaWAMqLi8imMRByOvkf9YQ5oUCoUZtbeCRnBV9ZwBgOT6eqzYLLdNCuKuhW/VBV05k1ZRs/0TiWgCKHwu7Y5aLGNGXzJ86F4JlHxNcso91HfkAK4nhdb8I9yKMOjpYYu1pFYMQb0vxz8p1ApVxx9nECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAn05eEsMlNCKYr+o03cKLbMlJetlSFOLpgf2Car7+EGe6xqa+HgNu7thBfJR40TSR0n5P4oFhZEfbVHdcT6R2pprwTDctzMbb2wV7s+4kzpdnAnxmkoeTATQhX3gOi5f1mZaPm075NSW2hs1sZ0J7LaAP5TW5m+j3+YXTsirJFGFuNjexZ2Aw/zdbJB8l4GHvOdcOPZc9vVdjh7c/Re4Bv1pPthcdLLkHnGvtwCR3yR0WUgr5p1DZg41iieWiYmsJqFkHR+AqBhKQC9WcwPngeL7VESXyVWeXyfA8KkifAwVCanS8cxcpNRNmyLuUn4HomlPzagJ84Lbuj8QNqRYGOA==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.kb.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.kb.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.kb.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.kb.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Kungliga Biblioteket</OrganizationName>
-    <OrganizationName xml:lang="en">KB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.kb.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.kb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>National Library of Sweden</Company>
-    <SurName>Mattias Olsson</SurName>
-    <EmailAddress>mailto:mattias.olsson@kb.se</EmailAddress>
-    <TelephoneNumber>+46700073534</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>National Library of Sweden</Company>
-    <SurName>Mattias Olsson</SurName>
-    <EmailAddress>mailto:swamid@kb.se</EmailAddress>
-    <TelephoneNumber>+46700073534</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>IT</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:ITsupport@kb.se</EmailAddress>
-    <TelephoneNumber>+46107093550</TelephoneNumber>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQGx3FcymVB7hIUNFb7wH82jANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLmtiLnNlMB4XDTIyMDIwMzEzNDk1N1oXDTI3MDIwNDEzNDk1N1owJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5rYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKql5PENjq2FyNy45XlKpggzEntcOegLtlLs/qAh3yptiAHNjGVs9OAt02HAkVJh0TjwPzvJOPVoxyRZG9m8x641BppEzziNlWAAylsg83/c/IUhvJV73Nj52/axkGDaqEckGRmmMBgAw5CnzUuUcNlwBJkMpbdT8/830uXOFgSATYeAoL3d6+ZyPv9cePP25pwzVptklkGz9DEOHQTEPu8GSfq867Jzxr5HnMts0yFSc1eZn/vLAcNog12fztXbYMjvvetbvaAAuPHI8HknQypL5xWdX/sWOwXbHSG1MXebkN2Rxt9UrwfPJ0y+s5DUPnRWF6MsJZG8FTiLX95eXoECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAToGYBYCw4m/C0UoYZh2J2n0dFSzSX1Ep8BqYGLvbOV8AZCM83OJIRPv0tG8HQPuKYJLGURX9uioNwFnUYSseOw5VjwZ3pal4870G3MrduBmrhcVDxt2/wvs3/TaGmKVzhMoa83ReEObN9Ahx+2JhgyCpNiFP2+bmDoqv/S+PJbqt+IF7lvI6uEjuO0KtCdf68CuOlZHUkJDULRvQYikRSTX0sN6cnHUG5FKB2U53347yyDbLHrSAcse1SY301f74P/YXbNgOgv6qzwTcp6N4A4cwFMo0wYI1iNLF6F/41cy3go9FdOlN68/t89ZpCTO8G+SzHRBNDLt+D5NvatNBtw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQPB83Bd3CI4xLBms/e9ci2jANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmtiLnNlMB4XDTIyMDIwMzEzNTAxOVoXDTI3MDIwNDEzNTAxOVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5rYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSMC9TXbY0yypoCmYkbdXnZs3eECc2zwLjWxO/dWAKUTMHhZJ3O90pOgTakwZCSYxB9c/fQNqQI+rtVhgV7FzXmExj1g0/UtLjxaw6OQ32ihHn96LBxUbJLj30gU+SU8YtsKkPDRGtrkqt1QH43gq7E4yxVHRd5QyTR27f/xXiY8roP1oJQaIXD8dJuFonDWeOZpn+7hVFLwkd6GmSQ+sumhFqWeOW2+18UOTT5S9k9B7zWLD8/d3Y9fDsA9yoWCjEeloHrf4gNZIn2bxUHhXFG+hE74P3jV7nXhu7jnM4eAjY2/FdjxL3JM6IG9Uzdh6UO8SgnoS4nVM3bTphdchcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAO5/PEzkEQci3FwZMWBLaohL2jtkNZxsKPpRAEpX/wdVZ9Wz0oTebOO2C3iSZmbGp1H3JSqaeW0Hq66FBP9l6lNTqAyeScka/EZowQvDtoRrLY7kcJyD3nx56/L846IGD29MIljXY1jr9A4YcbrhuTftzcKt047wMTWYtMjuiQWw4jTEBYMKLz5KIXXmRyO4SETUsvw9ju+kqWOybQTrLEmpYDTaPRUajnk8YZDrcAto7qOZnC7IOC5d5LqSsN4l7ib8mTUkVL6CkbiGL0pEoli3GPcH5APjmPZxgANaL/4+k8zPufYyIz+EeEhP1RYjcYkM8ACZh88c5ZrnlFGUGFQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.kb.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.kb.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.kb.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.kb.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Kungliga Biblioteket</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">KB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">National Library of Sweden</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.kb.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.kb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>National Library of Sweden</md:Company>
+    <md:SurName>Mattias Olsson</md:SurName>
+    <md:EmailAddress>mailto:mattias.olsson@kb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>National Library of Sweden</md:Company>
+    <md:SurName>Mattias Olsson</md:SurName>
+    <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:ITsupport@kb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46107093550</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>