Merge branch 'master' of md-master.swamid.se:swamid-metadata

1 files changed, 39 insertions, 36 deletions

diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index 6664519e..7f3ca0ce 100644
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -21,31 +21,34 @@
         <mdui:GeolocationHint>geo:59.34474,18.08126</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOU5HVg2XQ7x9zifEpWAwx5/tzMwMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5rbWguc2UwHhcNMTIxMTA2MDkxMTQyWhcNMTUx
-MTA2MDkxMTQyWjAVMRMwEQYDVQQDEwppZHAua21oLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAg7J4scEL6Ptwh2NGEUkfSc08ZlC8I1l5uRL0L3EO
-eRjAFqjwsBuEhgGNvZdevH4vMsMU4XrXA+4J0XzeARZx+8B6EQKpiT5od5Jfw5oN
-8PsbL6bSw0ivEipqRfjMRxxhqntS6unsCyrPG8IFr2l4koGyE2aoixWJ2je2gbGg
-ka/6tC5xpsI+rlO24HJd83tXWPJ+oZ2rI6Ac7TXq2KYjxj8M7fcQS6X9pqhgl1oZ
-04I4HMHMFRMnO62Cb1ryS0A7V5P/PS9d0QU/MrxuSootYQ1vYRtQQnWSulBH945g
-tkubfMV/pkr3wsNxh+tEXaGTh3+vbZ45pYKglZ99amHO3QIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAua21oLnNlhiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFN9PHZwomaeOxq04aXJbnPdgxdlpMA0GCSqGSIb3DQEB
-BQUAA4IBAQBxRPXYVh5a6RiXOucpuOW44fWdzqyevWeQKdk6YOgLCe153TDSJRcB
-qbmg5vPht/Pl+YckIGN5XHjXhx7SkaTaYvCAPX4/E4nVKYqUPoM1P+HDJFvqWtPN
-wGCDbVOeyeBWLLapkmVUFxS3zOL4uCqK+HV20g4cZQQdaDV5bX3WzUbLuXT3h+V4
-mAXptRcQXKX+zbvg1G5bp3NtSFZnXnrou+g9I1u9l4odS9F5kcHjnIAlxiBpl4xd
-qdIb2Ub9Cyim+BBcDduP8P0RaSYzYkj+joxU5SqHKvPCmvQOmMf4bBphtbNJeGBj
-Qz1btpwpzorDI58f7uezMy6zg2+3aLxJ</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>
     <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>
@@ -58,26 +61,26 @@ Qz1btpwpzorDI58f7uezMy6zg2+3aLxJ</ds:X509Certificate>
     <Extensions>
       <shibmd:Scope regexp="false">kmh.se</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOU5HVg2XQ7x9zifEpWAwx5/tzMwMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5rbWguc2UwHhcNMTIxMTA2MDkxMTQyWhcNMTUx
-MTA2MDkxMTQyWjAVMRMwEQYDVQQDEwppZHAua21oLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAg7J4scEL6Ptwh2NGEUkfSc08ZlC8I1l5uRL0L3EO
-eRjAFqjwsBuEhgGNvZdevH4vMsMU4XrXA+4J0XzeARZx+8B6EQKpiT5od5Jfw5oN
-8PsbL6bSw0ivEipqRfjMRxxhqntS6unsCyrPG8IFr2l4koGyE2aoixWJ2je2gbGg
-ka/6tC5xpsI+rlO24HJd83tXWPJ+oZ2rI6Ac7TXq2KYjxj8M7fcQS6X9pqhgl1oZ
-04I4HMHMFRMnO62Cb1ryS0A7V5P/PS9d0QU/MrxuSootYQ1vYRtQQnWSulBH945g
-tkubfMV/pkr3wsNxh+tEXaGTh3+vbZ45pYKglZ99amHO3QIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAua21oLnNlhiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFN9PHZwomaeOxq04aXJbnPdgxdlpMA0GCSqGSIb3DQEB
-BQUAA4IBAQBxRPXYVh5a6RiXOucpuOW44fWdzqyevWeQKdk6YOgLCe153TDSJRcB
-qbmg5vPht/Pl+YckIGN5XHjXhx7SkaTaYvCAPX4/E4nVKYqUPoM1P+HDJFvqWtPN
-wGCDbVOeyeBWLLapkmVUFxS3zOL4uCqK+HV20g4cZQQdaDV5bX3WzUbLuXT3h+V4
-mAXptRcQXKX+zbvg1G5bp3NtSFZnXnrou+g9I1u9l4odS9F5kcHjnIAlxiBpl4xd
-qdIb2Ub9Cyim+BBcDduP8P0RaSYzYkj+joxU5SqHKvPCmvQOmMf4bBphtbNJeGBj
-Qz1btpwpzorDI58f7uezMy6zg2+3aLxJ</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>