Resolved SWAMID-586

1 files changed, 13 insertions, 48 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 6fe256d3..1ded6d54 100644
--- a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
@@ -297,29 +297,7 @@
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQaSSS4YxptKVG3RUlliWcizANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xNzA0MTAwNjI2NDhaFw0xODA0MTAwNjI2NDhaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz2C5vMszlVP70ZPTWY2fbTfDSGG+yVpZoJmYFM+gUmXmELL93mQ0yeCbqb8HnZtm45hEXvBGvzQwUpaD3HSPPV9PF02YFZgz/rrjlQJQ70l0V7ybZzgH64yM45qIKGPXlXIw6qtOl0mNpwR4xqu7/E7e+wlZLB7TSAchT7vhESqOxKbWB4D49mqQZDNK0GbQmNEokkxMR3nxqbFwVh8MwJ5QyQtEifNi9FqiPqF9I/N0bVErqFVENj5WAXPCFQ0hYSH4ulLbAsByRbM4a0J3p2xta/Y/CbvkCnPRrtcEqSd6wk3Ya0qllhDN45rglc9MKDnDtx2zuBQkdLyJMkCAwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCPtKzEQH5cDNNRupUtm4M7OGkNQgOQLZG4/nyYtwH00OcKmzlZASH13t03mlvwcWP3NoFeHqXJbROOkrzhG094KmGjvDDFGiNTxP/hnlfqsynzzNSy8dpBQqVavBxGdbee2A5VyXdBhOIkOXUGaIdGZFkMmAANkktnRuOWEfQdBV3vui3wBdHUKJrNglPaUKmnmH5bTR2j7+jmXT+uLAFrsQzQmC7pebHM1TlRVzoQHdbH1jM9x3fyfRArJcINzy+dO36Inzlwb3eUcd282qOAZc7tGCj/j6Jn8TGzUOe8ZFD5jxZjjYWGkJ70MfmlVGzTXiI9mQogZnZoTMDyd/4J</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQRNcBkwUH57FBO/0iKmJ2dzANBgkqhkiG9w0BAQsFADAl
-MSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xODAzMjEw
-NzMwMzNaFw0xOTAzMjEwNzMwMzNaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAt
-IGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2PBu
-joU9dPCDLdMTlLCOkog78u1/3LQVYX2Y/daoIKFDCdhb4zMNjHUhy/4o+uM7fqXb
-8+ZQRjfC10DW8gBBUuTX1Du6hSitc6et+SePw7WTw3NxzLiFUmBrBwLN/WKjVLKT
-X6NXgaw15jD9uabI37DZDyu93e1RoLo0imiNLTRxyQs4QLpcDPR0GH2kqHusxbpZ
-OMAsEfoJbKWFwFrSBUyznodb0f/ABxle5lXIvsfIg3uXCg61baBDoaHd6qEy+syf
-vlJYYqFk76JwgAqkMIWa7OWa9c2jzJJuYGmZI7u4erNtt/YYIli0x/Eoz4KJkl0N
-t79JjvmyIGlI+yAObQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCJD/8kZuSUs3x7
-j9g4CCD33wSpjb6rRy9ghcM2i8LoaWZLtYOBzNPfRtLbN6UZRUHwWxxgT0go4QRb
-doZt0z0phJ0zEqbTZO1ufGFX9f1Yd53WYYWGKmUvVSbNRm4eFOQK781aveoum/3V
-Kz7cZZOcq/unQiBuBfXG6/SAnfHRjcXwXGLzr/RdRRbLpLkr5iPnJjtVPeGYGhK/
-emoIABRhtMkdIbZTHcutG0vjkG/SWxKWNt0krmLphVYItvjU/trIqcy9c0Cfrnhp
-yNR3B4BTkF5EOH8PmMu1up0HTYZ2rCKTxeE4Rf+fNMvu8mGcuYQkmtok72zts03a
-a5Fnat/X</X509Certificate>
+          <X509Certificate>MIIC0jCCAbqgAwIBAgIQRNcBkwUH57FBO/0iKmJ2dzANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xODAzMjEwNzMwMzNaFw0xOTAzMjEwNzMwMzNaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2PBujoU9dPCDLdMTlLCOkog78u1/3LQVYX2Y/daoIKFDCdhb4zMNjHUhy/4o+uM7fqXb8+ZQRjfC10DW8gBBUuTX1Du6hSitc6et+SePw7WTw3NxzLiFUmBrBwLN/WKjVLKTX6NXgaw15jD9uabI37DZDyu93e1RoLo0imiNLTRxyQs4QLpcDPR0GH2kqHusxbpZOMAsEfoJbKWFwFrSBUyznodb0f/ABxle5lXIvsfIg3uXCg61baBDoaHd6qEy+syfvlJYYqFk76JwgAqkMIWa7OWa9c2jzJJuYGmZI7u4erNtt/YYIli0x/Eoz4KJkl0Nt79JjvmyIGlI+yAObQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCJD/8kZuSUs3x7j9g4CCD33wSpjb6rRy9ghcM2i8LoaWZLtYOBzNPfRtLbN6UZRUHwWxxgT0go4QRbdoZt0z0phJ0zEqbTZO1ufGFX9f1Yd53WYYWGKmUvVSbNRm4eFOQK781aveoum/3VKz7cZZOcq/unQiBuBfXG6/SAnfHRjcXwXGLzr/RdRRbLpLkr5iPnJjtVPeGYGhK/emoIABRhtMkdIbZTHcutG0vjkG/SWxKWNt0krmLphVYItvjU/trIqcy9c0CfrnhpyNR3B4BTkF5EOH8PmMu1up0HTYZ2rCKTxeE4Rf+fNMvu8mGcuYQkmtok72zts03aa5Fnat/X</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -612,29 +590,7 @@ a5Fnat/X</X509Certificate>
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQaSSS4YxptKVG3RUlliWcizANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xNzA0MTAwNjI2NDhaFw0xODA0MTAwNjI2NDhaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz2C5vMszlVP70ZPTWY2fbTfDSGG+yVpZoJmYFM+gUmXmELL93mQ0yeCbqb8HnZtm45hEXvBGvzQwUpaD3HSPPV9PF02YFZgz/rrjlQJQ70l0V7ybZzgH64yM45qIKGPXlXIw6qtOl0mNpwR4xqu7/E7e+wlZLB7TSAchT7vhESqOxKbWB4D49mqQZDNK0GbQmNEokkxMR3nxqbFwVh8MwJ5QyQtEifNi9FqiPqF9I/N0bVErqFVENj5WAXPCFQ0hYSH4ulLbAsByRbM4a0J3p2xta/Y/CbvkCnPRrtcEqSd6wk3Ya0qllhDN45rglc9MKDnDtx2zuBQkdLyJMkCAwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCPtKzEQH5cDNNRupUtm4M7OGkNQgOQLZG4/nyYtwH00OcKmzlZASH13t03mlvwcWP3NoFeHqXJbROOkrzhG094KmGjvDDFGiNTxP/hnlfqsynzzNSy8dpBQqVavBxGdbee2A5VyXdBhOIkOXUGaIdGZFkMmAANkktnRuOWEfQdBV3vui3wBdHUKJrNglPaUKmnmH5bTR2j7+jmXT+uLAFrsQzQmC7pebHM1TlRVzoQHdbH1jM9x3fyfRArJcINzy+dO36Inzlwb3eUcd282qOAZc7tGCj/j6Jn8TGzUOe8ZFD5jxZjjYWGkJ70MfmlVGzTXiI9mQogZnZoTMDyd/4J</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQRNcBkwUH57FBO/0iKmJ2dzANBgkqhkiG9w0BAQsFADAl
-MSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xODAzMjEw
-NzMwMzNaFw0xOTAzMjEwNzMwMzNaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAt
-IGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2PBu
-joU9dPCDLdMTlLCOkog78u1/3LQVYX2Y/daoIKFDCdhb4zMNjHUhy/4o+uM7fqXb
-8+ZQRjfC10DW8gBBUuTX1Du6hSitc6et+SePw7WTw3NxzLiFUmBrBwLN/WKjVLKT
-X6NXgaw15jD9uabI37DZDyu93e1RoLo0imiNLTRxyQs4QLpcDPR0GH2kqHusxbpZ
-OMAsEfoJbKWFwFrSBUyznodb0f/ABxle5lXIvsfIg3uXCg61baBDoaHd6qEy+syf
-vlJYYqFk76JwgAqkMIWa7OWa9c2jzJJuYGmZI7u4erNtt/YYIli0x/Eoz4KJkl0N
-t79JjvmyIGlI+yAObQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCJD/8kZuSUs3x7
-j9g4CCD33wSpjb6rRy9ghcM2i8LoaWZLtYOBzNPfRtLbN6UZRUHwWxxgT0go4QRb
-doZt0z0phJ0zEqbTZO1ufGFX9f1Yd53WYYWGKmUvVSbNRm4eFOQK781aveoum/3V
-Kz7cZZOcq/unQiBuBfXG6/SAnfHRjcXwXGLzr/RdRRbLpLkr5iPnJjtVPeGYGhK/
-emoIABRhtMkdIbZTHcutG0vjkG/SWxKWNt0krmLphVYItvjU/trIqcy9c0Cfrnhp
-yNR3B4BTkF5EOH8PmMu1up0HTYZ2rCKTxeE4Rf+fNMvu8mGcuYQkmtok72zts03a
-a5Fnat/X</X509Certificate>
+          <X509Certificate>MIIC0jCCAbqgAwIBAgIQRNcBkwUH57FBO/0iKmJ2dzANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xODAzMjEwNzMwMzNaFw0xOTAzMjEwNzMwMzNaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2PBujoU9dPCDLdMTlLCOkog78u1/3LQVYX2Y/daoIKFDCdhb4zMNjHUhy/4o+uM7fqXb8+ZQRjfC10DW8gBBUuTX1Du6hSitc6et+SePw7WTw3NxzLiFUmBrBwLN/WKjVLKTX6NXgaw15jD9uabI37DZDyu93e1RoLo0imiNLTRxyQs4QLpcDPR0GH2kqHusxbpZOMAsEfoJbKWFwFrSBUyznodb0f/ABxle5lXIvsfIg3uXCg61baBDoaHd6qEy+syfvlJYYqFk76JwgAqkMIWa7OWa9c2jzJJuYGmZI7u4erNtt/YYIli0x/Eoz4KJkl0Nt79JjvmyIGlI+yAObQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCJD/8kZuSUs3x7j9g4CCD33wSpjb6rRy9ghcM2i8LoaWZLtYOBzNPfRtLbN6UZRUHwWxxgT0go4QRbdoZt0z0phJ0zEqbTZO1ufGFX9f1Yd53WYYWGKmUvVSbNRm4eFOQK781aveoum/3VKz7cZZOcq/unQiBuBfXG6/SAnfHRjcXwXGLzr/RdRRbLpLkr5iPnJjtVPeGYGhK/emoIABRhtMkdIbZTHcutG0vjkG/SWxKWNt0krmLphVYItvjU/trIqcy9c0CfrnhpyNR3B4BTkF5EOH8PmMu1up0HTYZ2rCKTxeE4Rf+fNMvu8mGcuYQkmtok72zts03aa5Fnat/X</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -645,13 +601,14 @@ a5Fnat/X</X509Certificate>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.se/adfs/ls/" index="0" isDefault="true"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.rkh.se/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/" index="2"/>
   </SPSSODescriptor>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">rkh.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Röda Korsets Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">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:Logo xml:lang="sv" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
@@ -668,7 +625,7 @@ a5Fnat/X</X509Certificate>
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQaSSS4YxptKVG3RUlliWcizANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xNzA0MTAwNjI2NDhaFw0xODA0MTAwNjI2NDhaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz2C5vMszlVP70ZPTWY2fbTfDSGG+yVpZoJmYFM+gUmXmELL93mQ0yeCbqb8HnZtm45hEXvBGvzQwUpaD3HSPPV9PF02YFZgz/rrjlQJQ70l0V7ybZzgH64yM45qIKGPXlXIw6qtOl0mNpwR4xqu7/E7e+wlZLB7TSAchT7vhESqOxKbWB4D49mqQZDNK0GbQmNEokkxMR3nxqbFwVh8MwJ5QyQtEifNi9FqiPqF9I/N0bVErqFVENj5WAXPCFQ0hYSH4ulLbAsByRbM4a0J3p2xta/Y/CbvkCnPRrtcEqSd6wk3Ya0qllhDN45rglc9MKDnDtx2zuBQkdLyJMkCAwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCPtKzEQH5cDNNRupUtm4M7OGkNQgOQLZG4/nyYtwH00OcKmzlZASH13t03mlvwcWP3NoFeHqXJbROOkrzhG094KmGjvDDFGiNTxP/hnlfqsynzzNSy8dpBQqVavBxGdbee2A5VyXdBhOIkOXUGaIdGZFkMmAANkktnRuOWEfQdBV3vui3wBdHUKJrNglPaUKmnmH5bTR2j7+jmXT+uLAFrsQzQmC7pebHM1TlRVzoQHdbH1jM9x3fyfRArJcINzy+dO36Inzlwb3eUcd282qOAZc7tGCj/j6Jn8TGzUOe8ZFD5jxZjjYWGkJ70MfmlVGzTXiI9mQogZnZoTMDyd/4J</X509Certificate>
+          <X509Certificate>MIIC0jCCAbqgAwIBAgIQRNcBkwUH57FBO/0iKmJ2dzANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLnJraC5zZTAeFw0xODAzMjEwNzMwMzNaFw0xOTAzMjEwNzMwMzNaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMucmtoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2PBujoU9dPCDLdMTlLCOkog78u1/3LQVYX2Y/daoIKFDCdhb4zMNjHUhy/4o+uM7fqXb8+ZQRjfC10DW8gBBUuTX1Du6hSitc6et+SePw7WTw3NxzLiFUmBrBwLN/WKjVLKTX6NXgaw15jD9uabI37DZDyu93e1RoLo0imiNLTRxyQs4QLpcDPR0GH2kqHusxbpZOMAsEfoJbKWFwFrSBUyznodb0f/ABxle5lXIvsfIg3uXCg61baBDoaHd6qEy+syfvlJYYqFk76JwgAqkMIWa7OWa9c2jzJJuYGmZI7u4erNtt/YYIli0x/Eoz4KJkl0Nt79JjvmyIGlI+yAObQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCJD/8kZuSUs3x7j9g4CCD33wSpjb6rRy9ghcM2i8LoaWZLtYOBzNPfRtLbN6UZRUHwWxxgT0go4QRbdoZt0z0phJ0zEqbTZO1ufGFX9f1Yd53WYYWGKmUvVSbNRm4eFOQK781aveoum/3VKz7cZZOcq/unQiBuBfXG6/SAnfHRjcXwXGLzr/RdRRbLpLkr5iPnJjtVPeGYGhK/emoIABRhtMkdIbZTHcutG0vjkG/SWxKWNt0krmLphVYItvjU/trIqcy9c0CfrnhpyNR3B4BTkF5EOH8PmMu1up0HTYZ2rCKTxeE4Rf+fNMvu8mGcuYQkmtok72zts03aa5Fnat/X</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -744,6 +701,14 @@ a5Fnat/X</X509Certificate>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
   </IDPSSODescriptor>
+  <Organization>
+    <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 contactType="administrative">
     <Company>Röda Korsets Högskola</Company>
     <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>