SWAMID-705 Updated adfs.rkh.se, new signing-cert

1 files changed, 57 insertions, 53 deletions

diff --git a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
index e1dc3ebf..5d95cfc8 100644
--- a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
@@ -5,72 +5,76 @@
       <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: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:Attribute>
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <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: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.rkh.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.rkh.se/adfs/services/trust">
+    <md:Extensions>
       <shibmd:Scope regexp="false">rkh.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Röda Korsets Högskola</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Swedish Red Cross University College</mdui:DisplayName>
         <mdui:Description xml:lang="sv">ADFS Röda Korsets Högskola</mdui:Description>
         <mdui:Description xml:lang="en">ADFS Röda Korsets Högskola</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.rkh.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.rkh.se/information-in-english/</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC2DCCAcCgAwIBAgIQFkFnarXS36lHIDl2yABKdDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBhZGZzLnJraC5zZTAeFw0xOTAzMTEwOTA1MDVaFw0yMjAzMTAwOTA1MDVaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmb89WTgjzqT84VJAZJBpPhxfOgtInxI9bTm8lg270Sf2OjJalL6KwKSwSdXuUxKmmAE2lI37hjEzW0Szbl95revEe/uXi96piUs3utT2BWD3DxVyMoa1Iwweg+weIVy/ygTvJr81AngQfCfKEXH9lfBd+r69Stvy3TmaabelREZ9ctM38FzdsuMMJneQpdThVjrLx9Lhi3+78MmYvxGKaNKQbWS9rOEFMwPpiFxexoYNRHFoB6yhpxwEjttBHtxSOvToTW32tnvWfmntcEwMYzmy6F2VD0UtTSme2JFpVRwD8N72GXtoNA4tpOvl8Zj8gTWi+sX+Avdt2hYT4OxgOQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBO+A5TTkSeCb8SYu4MQw6CTeRZ7vQWQZvO7INZVoSKfsaQmIh9mVg+4epZ5wWzEjx92Mtq59NJ5kEsqgJ4hCUZQgwHieICvpXVWkUYOXnLjowkbtc3auQGUOTkpDKWabmvlCM29x66/qh/CAB0S+B4kJbIKRvgrhdtzhhFlTaPyXXGfia2rP+bYzjWnaQ4w1cvV2NhBEqOhmCaiDffELvV1vZp2BdJNfBHIETNQju/x83i0TvtpnbcR5qz76ynvU3jGpZ3XNM9WBbC1tK3qqqz58Km9SQy+/wjgllKSsbNG9APSy+NVbK8nj3B9HDxRWY18YGSH/hwpTqUmyDn88/k</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQTOvBukc0zoxBlP0hDta7QDANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xOTAzMTEwOTA0NDNaFw0yMjAzMTAwOTA0NDNaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq/TD9x7zmICN6zX9SJKXbP2MHrF4kJcHDAFo+deggRQAl4bYDAcEL/cR9mmaUbcdsXrgWgq9xteuOm6Myz6SKY4Q/QPYwF2MfNCTkLYRp4dq2xoS/m9HjnU3saCxvbQegKdp0gd/9maErlxKRZesRb+rvrbw6zNHv9J3JCdrLsVEfaj0+FBBFfy4eOEnjZ1YkI4syZlbDVvzRB/zdBkggJMCpYwwklhW+8fvWjm7MzuV42KTCWtlb1zWEcZSiAgvdZy1zN5+WlfTQe+2FbJ59IwJcDlTUxni9dcWn8gwBZQOBlp17peeF0lnYpM1cjXOknxWLds09Fo/kW9QgPn8aQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA2li7w6m27MVeVsTVye6cc4lGSzxxVu5F61Xib1sUPR93xBaraykqmgX3uteQevDyZecTYvdzKPZZvQdOw0Dh2Jvz1zoU29QVIkwFpdUP5jNVa64/zYO5cDyuRrTjqDuQxAdMm1j8CTrA57ZU8BA6iseVGVCMBvs8YTEVD8wI+8VhQuwRTwEmx+gjC+fHaHLgjm/s/Ih9FOhYN4CDW3+8zQNW0GPceMW0FDFsdlVa/dg6hVMUY9B2bNkYSHT9rjYGCbOeeRV1CvhIDf4SNuL9xNXDdlV8VDyHGMFughO/KebiXPrXYSQnyrfQ1tsDdPs+JcsKKOQ9xm9hnCRVVP0n5</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.rkh.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.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.rkh.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Röda Korsets Högskola</OrganizationName>
-    <OrganizationName xml:lang="en">Swedish Red Cross University College</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.rkh.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.rkh.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Röda Korsets Högskola</Company>
-    <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Röda Korsets Högskola</Company>
-    <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Röda Korsets Högskola</Company>
-    <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <Company>Röda Korsets Högskola</Company>
-    <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC2DCCAcCgAwIBAgIQFkFnarXS36lHIDl2yABKdDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBhZGZzLnJraC5zZTAeFw0xOTAzMTEwOTA1MDVaFw0yMjAzMTAwOTA1MDVaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmb89WTgjzqT84VJAZJBpPhxfOgtInxI9bTm8lg270Sf2OjJalL6KwKSwSdXuUxKmmAE2lI37hjEzW0Szbl95revEe/uXi96piUs3utT2BWD3DxVyMoa1Iwweg+weIVy/ygTvJr81AngQfCfKEXH9lfBd+r69Stvy3TmaabelREZ9ctM38FzdsuMMJneQpdThVjrLx9Lhi3+78MmYvxGKaNKQbWS9rOEFMwPpiFxexoYNRHFoB6yhpxwEjttBHtxSOvToTW32tnvWfmntcEwMYzmy6F2VD0UtTSme2JFpVRwD8N72GXtoNA4tpOvl8Zj8gTWi+sX+Avdt2hYT4OxgOQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBO+A5TTkSeCb8SYu4MQw6CTeRZ7vQWQZvO7INZVoSKfsaQmIh9mVg+4epZ5wWzEjx92Mtq59NJ5kEsqgJ4hCUZQgwHieICvpXVWkUYOXnLjowkbtc3auQGUOTkpDKWabmvlCM29x66/qh/CAB0S+B4kJbIKRvgrhdtzhhFlTaPyXXGfia2rP+bYzjWnaQ4w1cvV2NhBEqOhmCaiDffELvV1vZp2BdJNfBHIETNQju/x83i0TvtpnbcR5qz76ynvU3jGpZ3XNM9WBbC1tK3qqqz58Km9SQy+/wjgllKSsbNG9APSy+NVbK8nj3B9HDxRWY18YGSH/hwpTqUmyDn88/k</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE0jCCArqgAwIBAgIQHLgssm3RkbdJaFiguhagjjANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0yMjAyMTEwOTIwMThaFw0yNTAyMTAwOTIwMThaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArgVhtwqgkGz9Pm90shIDc6qaN2gJkfAAOiIZuFnekW94/fBERYApAyCQ/YLjFr0BwsaMAxf8uEal9STwwggXIXpFuQPNN+nc1TTB/t/KIbMLn4nYDRZTaZXm8gDk7nF0OwOVfq0AnozY0r5yeuzmA3fKLkPfHdTpZdxhXq+453L0pwpNvJQYYQ34FPr0figLO85TAIGpqa5my7N7Jz/X7Noamb0p51qCzbMs1zo4KcYplVP2xb5fX8CHh4rWBVLF1VoiLddBwRM47GLDSnt2Z5ZuH61ve0UzZNb31MHUeeqVy5F99D0BG8HxVe64zpVUZUQBNmqi8G15rHh1+9ge80izhSstY12/Rgfs9ollSPXRkrDwZtkTUh2NUovTnbj99zj2CyF3XmHYa3NevPuYYzvXAFxhx1cey5BPv8DPt0+aNA6vrQYkgRL/NKCybap1wGPKlwc1XAdP/lKHZzhBA5X+TyaCKn5mLiHjjNHUvJ3JwE2yd5NSEGxPgSLcKoLnsHvAj5JDiYR9RNI01yb6Tk4V6vAN0bOkTzOf6v85jflr4gTZI20NVbJgpdBZHXTtbjO+D9IVoQ7nZgwWDsN6j1iva34LcPThY5fJ9ZR3kz4m6TDlUpIIgJx50H1trfhhkTW+tc1OBtX4FcPyeb/j6lR9KaexbalPo0JPPfz0VgUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAB5OSsMUSRnS1QxvIW6CdUDxuKekFS7dhht0DB3/DVKMRqkP2gQyggWLO5W7wVfiVec6fjwRsx2547Kt4hYLKGNWHYO6fRv0iOrx0dPqPphn6TMgb5OwUs+4wBkR0BeiZsi+p7xAGXvaBdPhIq1Im3+lWuLcXtq+dRjxYsKpM1jmMPBJt+FaJHmjYCL/XYvR8Xpfjthbcv7r1FAtozxoJtn6c3WzvSMUi1MXbuSdmYyzrbx24lceAZy1YkV/v+8GiUpLhwqKFgyCQs//PadFjoyKbYkc4A37UhL9YCehz4u/NVHRsvmCAUR/ltk7Z4SR7IULQEiLuqt5Wxsrpp+pq9m9blNuLrKCsHirod3taiyWX9Aqovr2uARijqpTjLt+GOrCi4h4pNyCGIFW24qxt5N1kpzfMXcqlM0P5izxvsWEF7ACCufoNEPzzDgSHutgQHKNvdZBG5M1sZ9EUZKuu7HErFX6sf1UHaSQvaqSJNueOsEx/AOyLqLp5BavYdSQAl8O5yQaNWZgle+dEXD88YOgeTY4h0xmK9/+ctkNg2oO74T9wOgDXmGpg5CccecrTX5l1qc00oL4x1rXS0YQRneQZiXpUn4C6wP06VFiHoJhh28cFxJjl2d7upCkRyUlujGWyT6AeN8gcn+rxyZojtFx3dyF72u4yfFcPB3XMcuQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.rkh.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.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.rkh.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Röda Korsets Högskola</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish Red Cross University College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.rkh.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.rkh.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Röda Korsets Högskola</md:Company>
+    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Röda Korsets Högskola</md:Company>
+    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Röda Korsets Högskola</md:Company>
+    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>RKH Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@rkh.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>