Reverted SWAMID-606

1 files changed, 52 insertions, 146 deletions

diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index ce367af5..77f9866b 100644
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.kmh.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.kmh.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">kmh.se</shibmd:Scope>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Royal College of Music in Stockholm</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Kungliga Musikhögskolan</mdui:Description>
@@ -15,7 +15,7 @@
         <mdui:Keywords xml:lang="sv">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
         <mdui:Keywords xml:lang="en">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>kmh.se</mdui:DomainHint>
         <mdui:IPHint>193.10.62.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:59.34474,18.08126</mdui:GeolocationHint>
@@ -24,165 +24,71 @@
     <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUdpf/Qi9UMRvmzR6KSp0csAQbl+UwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNzAxMDIxNjU4MTdaFw0zNzAx
-MDIxNjU4MTdaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDgtxqQBg4CyDz+GeLzWx7PueRVGvOSbuR0HRAbOCXj
-UF05MB9SKmVR4sLsxfwg9RJMYJd2okcX6IToYSZewHygczpq2QnZoT6sRo4MEUKQ
-TT37jvvKiaB3DOjtCLoD/uK7A2JUBa/aVf5KtTPJvdPeu33AJuV5kh2SyDbeE21S
-HJa9ao1srdoS7XlVbFGZPZjkp5EIolXXaSVWn8YpjNa7vjvzVIr36xb4VfLAOfdt
-EoojEd2k3YKgkERSmnHbeD6QhIgj0zqJGTKZX8lxqLNJiZ91Due/M08PjAyI15pE
-26tgI10xT7cyXhNkGlo4f/+d8hYE5FSNiesfn9+exL1vAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQmk8nf141nq1YX6PxUoIJ2GODZTjA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAMD2qDguZuFCH+CMHBp1hde4Q4XEKusHDEB7f/puqXb8CVOp3D8rV+Pr
-hqTPKBQ31xn6tuWy7b4wMSJI92WhUK+MaY8RsenXYPDZeDuE7oHttfWOGpsqxH4P
-I/zATKgOhVEdbRGvM0pt9ru71+ikpEPIqX+ln3H3p1LUiPJfkoyzeo5DD9CrKoHY
-FbvaBcgPUSivBpy0y0iNpcZcaTXGGvDElHZ7kUNoTNze15znUyIhn+pW8QfdQ/If
-3rvUyTvSmgpuDCR9d3Qx8eWyBRnfV5NwQw2/zjN81Fi23EL8ezVCukhP7WIu3tPv
-SqMmDbUX7Rb54xfrvQUl875M67GOjac=
-                        </ds:X509Certificate>
+          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNTA1MjYxMzIwNTZaFw0zNTA1
+MjYxMzIwNTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC8Fndbl7VcQp77YvwrHZJw+P4jup3EJWLqXwTPBQAl
+pUfZXW1ZwlfZ/8Y+ng8GPn11ZS9gVEc9aW5+ZtvIX4rPgceB4Y5z3XFQpQfDrcBY
+g+dZc7xR24UZN5T1Er8i5xZWW7/Q2ariLfarK0X0oDoUEi5kaHcLc0ejvT2K3CVY
+uQ/LCw+4Wl7txbisiwh7AFjlqpgb2lNQxxzP/0xQwUBAMplxOZ/yxlK1RzKCHTOI
+sBHN6Sx3AW27HQduAzvKa3IDw7RV/WBi5ENER5U446LdSfWvObqSq4tNRSSpSszU
+6Vxldhar+0aACK/sBWw8FlLM5OM9K1SWeE7fk5PgTwQbAgMBAAGjWzBZMB0GA1Ud
+DgQWBBTdW08Nts1dNGIfcY8chlK5Yu0MlzA4BgNVHREEMTAvggppZHAua21oLnNl
+hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
+BQADggEBAI20AdShxGWSxSVuiWzRnQKRpHQnalD84ev3BhaurMP93fzWJp4H1FzG
++1+4K5tz5hbf1J1qaIZPn4+hEhYJLxQCiccH37Nqbs9zJFC6fQrCqKiMnh987f8X
+5X/BVsK9W2bNF8+e/a89O7X9u/4mFW7vdpHcsf/kO2QN1fkkukoCLSEWU4oWnWTr
+D0C4p8pAxxuCh86fN/plT6bfLbne17O9qmyT5miEhmfSG4uHoIgwMtbhOljOarH2
+cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
+SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUF9n6s7fhD7BZMymWMLXeJf8eXXgwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNzAxMDIxNjU4MTZaFw0zNzAx
-MDIxNjU4MTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCH18lDbD9uRgQh+LylSlc3/pfv5OdvxvpFqNa4mYpb
-OaDgIJsKsB5hXzBGx7knMPgG9d3qApLzAq7Nz3g3hQ3yNjNTSI7tIMsygxK3/gM8
-EkIUgL059UNw2HBXZce0sQy9+FPX29HyvMQd0Qr/6Gr9+IOd7RHIHY6A9WBa5uG3
-qXG8RFWUlHrFM8WRyQX2Krs5ujaF16dA6pF4kNscrYKFk9FaNMJY0fclvlG13+Ac
-kIaRDZss9p6gCjS4xKXwHb5ETrhxYD/VxVfiOlVMzIaVS1+lp68odZu3Uwlp8YhK
-PXm5f2e24IsMQL3++jREE4/95DlFEKCo4TK9AT0adb0DAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQJHw2JKNDbDxLbeULk1vCzUQF83jA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAC6zZu+DVi0IKFzbVX1iGSj2D1sOwDGJ3CCFCNAla1V2I6iRfzURWcxA
-v11blgRsbE29iYGj9IsTVjVq9RfTjY2FT9MGAC/Yofb8tvVcnQxVupADKyEgoZGI
-qpmkIvwe/XPRJCjqF8xKe1xJYGA30ma5N8ObZRBOR5EUAJdQ+WQD9xhfw7O2Xpgk
-nyY0qi0/10X9hVglc3vp7NCzU7Elb1G1d5TWh73gv75oAt9i5unimdnhG1PRY5VX
-7y3ns6NBWuQWcmWd3eXrq9LyWrGYeiqaaN3pTv4e6Y7IALnA7p1pq6wYkKbxdsGm
-0rIR4wdOy3yVbbNdK+0mjbgUH/6ik0M=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUOUpyvP5ENwAI1IXOhYxASCiOYikwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNzAxMDIxNjU4MTdaFw0zNzAx
-MDIxNjU4MTdaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCl6gFN32CawYsht6fdgB//Y/b2c7nul0sEPUf/vKXa
-IxqIwii4h0VZwb7nDFCoSiWNojVBwHCz+6l5MnisXjw70JGvnFVhrevEsaFTf4iX
-KeQu1E9nc2tw/BGFvA7AGRJBX+VAOKfNLXl8ukp1NodsAkOKa9GYCoHgl5ruDNTn
-uVVAgJYPOLNcGcNKfl4vPyuxy01oBVeQaFGro2kFP3acgltLlp1xWWsAod7v9VCh
-Auzf52NqM8JuRUnWvCYn+x2oa2Al7mLjwGg6e1uT+hOqhtGEz80VOqPMvlxuTWiH
-pBWQTAYjdMnbun8aOOy+J0PGBy/rSiBktqYqszxXafF/AgMBAAGjWzBZMB0GA1Ud
-DgQWBBT+7rxeox3CJgeWi9cGqA1w5nB+pzA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAG+oIbDD3mGylvbBuOuSqDAwtAynLD7aUi4VazwbfExeGHo++pUyhD+6
-0QpImoT90WxakxSG12WDEA7Xd1u166KU0t92sg8p2PbOB1h2pnIppMzTELuScIrZ
-QLdAbBr8oEZcknNr0w4qhKuZelvdG0g4cSqhWM0vzBhLhK/jTKh520dgCK165whb
-b6rVIowKo4FjiqXNnssuhYaZ2KcNIY1HLTVbytLvjv4RHZj6hLUezw+eHtV14LXs
-JEqBQxTUq9n7zMOGC5H7YQU6rw33s+/Z60FvW16cHBhfM5ZOVeOUCeNtxqhpCc9V
-SZoUaXdlwjsZ5gj6LXHpUMcC8UsCgrA=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kmh.se/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kmh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">kmh.se</shibmd:Scope>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUdpf/Qi9UMRvmzR6KSp0csAQbl+UwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNzAxMDIxNjU4MTdaFw0zNzAx
-MDIxNjU4MTdaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDgtxqQBg4CyDz+GeLzWx7PueRVGvOSbuR0HRAbOCXj
-UF05MB9SKmVR4sLsxfwg9RJMYJd2okcX6IToYSZewHygczpq2QnZoT6sRo4MEUKQ
-TT37jvvKiaB3DOjtCLoD/uK7A2JUBa/aVf5KtTPJvdPeu33AJuV5kh2SyDbeE21S
-HJa9ao1srdoS7XlVbFGZPZjkp5EIolXXaSVWn8YpjNa7vjvzVIr36xb4VfLAOfdt
-EoojEd2k3YKgkERSmnHbeD6QhIgj0zqJGTKZX8lxqLNJiZ91Due/M08PjAyI15pE
-26tgI10xT7cyXhNkGlo4f/+d8hYE5FSNiesfn9+exL1vAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQmk8nf141nq1YX6PxUoIJ2GODZTjA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAMD2qDguZuFCH+CMHBp1hde4Q4XEKusHDEB7f/puqXb8CVOp3D8rV+Pr
-hqTPKBQ31xn6tuWy7b4wMSJI92WhUK+MaY8RsenXYPDZeDuE7oHttfWOGpsqxH4P
-I/zATKgOhVEdbRGvM0pt9ru71+ikpEPIqX+ln3H3p1LUiPJfkoyzeo5DD9CrKoHY
-FbvaBcgPUSivBpy0y0iNpcZcaTXGGvDElHZ7kUNoTNze15znUyIhn+pW8QfdQ/If
-3rvUyTvSmgpuDCR9d3Qx8eWyBRnfV5NwQw2/zjN81Fi23EL8ezVCukhP7WIu3tPv
-SqMmDbUX7Rb54xfrvQUl875M67GOjac=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUF9n6s7fhD7BZMymWMLXeJf8eXXgwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNzAxMDIxNjU4MTZaFw0zNzAx
-MDIxNjU4MTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCH18lDbD9uRgQh+LylSlc3/pfv5OdvxvpFqNa4mYpb
-OaDgIJsKsB5hXzBGx7knMPgG9d3qApLzAq7Nz3g3hQ3yNjNTSI7tIMsygxK3/gM8
-EkIUgL059UNw2HBXZce0sQy9+FPX29HyvMQd0Qr/6Gr9+IOd7RHIHY6A9WBa5uG3
-qXG8RFWUlHrFM8WRyQX2Krs5ujaF16dA6pF4kNscrYKFk9FaNMJY0fclvlG13+Ac
-kIaRDZss9p6gCjS4xKXwHb5ETrhxYD/VxVfiOlVMzIaVS1+lp68odZu3Uwlp8YhK
-PXm5f2e24IsMQL3++jREE4/95DlFEKCo4TK9AT0adb0DAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQJHw2JKNDbDxLbeULk1vCzUQF83jA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAC6zZu+DVi0IKFzbVX1iGSj2D1sOwDGJ3CCFCNAla1V2I6iRfzURWcxA
-v11blgRsbE29iYGj9IsTVjVq9RfTjY2FT9MGAC/Yofb8tvVcnQxVupADKyEgoZGI
-qpmkIvwe/XPRJCjqF8xKe1xJYGA30ma5N8ObZRBOR5EUAJdQ+WQD9xhfw7O2Xpgk
-nyY0qi0/10X9hVglc3vp7NCzU7Elb1G1d5TWh73gv75oAt9i5unimdnhG1PRY5VX
-7y3ns6NBWuQWcmWd3eXrq9LyWrGYeiqaaN3pTv4e6Y7IALnA7p1pq6wYkKbxdsGm
-0rIR4wdOy3yVbbNdK+0mjbgUH/6ik0M=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUOUpyvP5ENwAI1IXOhYxASCiOYikwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNzAxMDIxNjU4MTdaFw0zNzAx
-MDIxNjU4MTdaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCl6gFN32CawYsht6fdgB//Y/b2c7nul0sEPUf/vKXa
-IxqIwii4h0VZwb7nDFCoSiWNojVBwHCz+6l5MnisXjw70JGvnFVhrevEsaFTf4iX
-KeQu1E9nc2tw/BGFvA7AGRJBX+VAOKfNLXl8ukp1NodsAkOKa9GYCoHgl5ruDNTn
-uVVAgJYPOLNcGcNKfl4vPyuxy01oBVeQaFGro2kFP3acgltLlp1xWWsAod7v9VCh
-Auzf52NqM8JuRUnWvCYn+x2oa2Al7mLjwGg6e1uT+hOqhtGEz80VOqPMvlxuTWiH
-pBWQTAYjdMnbun8aOOy+J0PGBy/rSiBktqYqszxXafF/AgMBAAGjWzBZMB0GA1Ud
-DgQWBBT+7rxeox3CJgeWi9cGqA1w5nB+pzA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAG+oIbDD3mGylvbBuOuSqDAwtAynLD7aUi4VazwbfExeGHo++pUyhD+6
-0QpImoT90WxakxSG12WDEA7Xd1u166KU0t92sg8p2PbOB1h2pnIppMzTELuScIrZ
-QLdAbBr8oEZcknNr0w4qhKuZelvdG0g4cSqhWM0vzBhLhK/jTKh520dgCK165whb
-b6rVIowKo4FjiqXNnssuhYaZ2KcNIY1HLTVbytLvjv4RHZj6hLUezw+eHtV14LXs
-JEqBQxTUq9n7zMOGC5H7YQU6rw33s+/Z60FvW16cHBhfM5ZOVeOUCeNtxqhpCc9V
-SZoUaXdlwjsZ5gj6LXHpUMcC8UsCgrA=
-                        </ds:X509Certificate>
+          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNTA1MjYxMzIwNTZaFw0zNTA1
+MjYxMzIwNTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC8Fndbl7VcQp77YvwrHZJw+P4jup3EJWLqXwTPBQAl
+pUfZXW1ZwlfZ/8Y+ng8GPn11ZS9gVEc9aW5+ZtvIX4rPgceB4Y5z3XFQpQfDrcBY
+g+dZc7xR24UZN5T1Er8i5xZWW7/Q2ariLfarK0X0oDoUEi5kaHcLc0ejvT2K3CVY
+uQ/LCw+4Wl7txbisiwh7AFjlqpgb2lNQxxzP/0xQwUBAMplxOZ/yxlK1RzKCHTOI
+sBHN6Sx3AW27HQduAzvKa3IDw7RV/WBi5ENER5U446LdSfWvObqSq4tNRSSpSszU
+6Vxldhar+0aACK/sBWw8FlLM5OM9K1SWeE7fk5PgTwQbAgMBAAGjWzBZMB0GA1Ud
+DgQWBBTdW08Nts1dNGIfcY8chlK5Yu0MlzA4BgNVHREEMTAvggppZHAua21oLnNl
+hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
+BQADggEBAI20AdShxGWSxSVuiWzRnQKRpHQnalD84ev3BhaurMP93fzWJp4H1FzG
++1+4K5tz5hbf1J1qaIZPn4+hEhYJLxQCiccH37Nqbs9zJFC6fQrCqKiMnh987f8X
+5X/BVsK9W2bNF8+e/a89O7X9u/4mFW7vdpHcsf/kO2QN1fkkukoCLSEWU4oWnWTr
+D0C4p8pAxxuCh86fN/plT6bfLbne17O9qmyT5miEhmfSG4uHoIgwMtbhOljOarH2
+cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
+SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KMH</OrganizationName>