Resolves SWAMID-2352

1 files changed, 7 insertions, 22 deletions

diff --git a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
index 36c5839c..fbe1c960 100644
--- a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
+++ b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
@@ -12,28 +12,6 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <!--
-  <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-    <ds:SignedInfo>
-      <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-      <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <ds:Reference URI="#_5eba7715-4e27-4a61-afbc-761eb34929df">
-        <ds:Transforms>
-          <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-          <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-        </ds:Transforms>
-        <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-        <ds:DigestValue>fswGaH5rj0xi4dhUHI0JhFSYfU21LSP4onHseVHU4zc=</ds:DigestValue>
-      </ds:Reference>
-    </ds:SignedInfo>
-    <ds:SignatureValue>Obi0WmX9V8ZWLATy45qgWXzFCmvbBdKc7ERiiwPOjZ2QRiHD3RqnH2V9vOvRYQVR2ROJNqN8kcNzPUwHG2OOmdXiXkKeMxbzUEdU7iz/r9xv77l8scNw/1DsXP1COq+DZkYIR4+aG9IL4idKpQruuYO4USYeKiaigM8n5Hj7SksI3M/VSyAVsiL1P+mWg55a6df/wYmvOIcT9NpDU/et2Fuin5KYTaZXXYMvaJ51uuUluNAYB59MkDcKXjdf9sgBgaThFD+gkFi6epijbny6fzUNx4mbPrWWrLeJ9/n+ulnwoMLPKd1XVB28b+AkudXbcZ5LuANpswQuBgq2O7cXIQ==</ds:SignatureValue>
-    <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-      <X509Data>
-        <X509Certificate>MIIC2jCCAcKgAwIBAgIQNiJSeyIIjZNIgrCFtM7wjzANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZC5zdGF0ZW5zc2Muc2UwHhcNMTQwOTA3MjEyNzQzWhcNMTkwOTA3MjEyNzQzWjApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvyasbdU+qo4Km/Ci2Y4dQynGCmV4N7mhiGZfZy4NGXJLAxY5a93M7pVHSanprju2M1IiwOu0TM7yR7glBW5kgry8G0/qwIEkcB0NtyDnSfF9qpVcwL7SQUL+pcVSRzOIMYaCHr3uydSkqfenSpCo2pQskT4fI3H6WuIt+ssttqzjh107bjfO7jaywV4VsvT6hx2j1PhW9H3h6c1ax6aMSRhBEcutS/SQ4JvULdcM/yITMs+YfN+5uRDUy2OpwPuXNTeNZ6N5lNH/zUCGdVCiz0GP5t6n6591u6vfo62PaIOLvKjmDpyhZEKBXnei2ccZiv01ErQn1U1EjUj3NG9MFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFZAIg+ngKrFMBkD6dD3THPK8ky0FxH7hCSASthn1PdIRQCorKIemqglV8yc+hadK+jK6//vc0xRk102Ku6t3T1ThWlTZluJt/WcZ1hb1p+hq3ZaxLSZkzEiu5G2xCPsAXg3QBQO1JyW8j+VnT4ls+wm/QQyG96W42O7bws7b6GWKsmfJNQgbrZDAxFuXKcO8jTP6iqXoRUARSHCe1sUBP+vqKZXE1Pgvwdvo69tqmK3uIUPDlj7cPCs1y01xiPw4qhPzLYyW60epOaGvC2yy4ecsGV9F1NAIbNFU+V2Gdu91bKYAqTt+bNUBMc9ikKy0R84W9Gqj8/vlys8IL5IIWU=</X509Certificate>
-      </X509Data>
-    </KeyInfo>
-  </ds:Signature>
-  -->
   <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <mdui:UIInfo>
@@ -57,6 +35,13 @@
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC2jCCAcKgAwIBAgIQKSx3hQQhGrRC0NhtF+YWmDANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZC5zdGF0ZW5zc2Muc2UwHhcNMTkwODE2MDUzNzU1WhcNMjQwODE1MDUzNzU1WjApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCQjhfSS7MmszSlgTT/2cCywh2jogm4gEMBcYwLVeR9qnKinYuFuqzLMS2L2+3Yhx6XcjGviNXIxkSjUv8YwAXusBKgOILFm+bp5NJWCbTxp5maaAAua1TtDi/wfm2VRQ3hITdQemJi05xL5rO8M1rgELrljNM4vXfc/bFSvpLDiKFfyPYU2DleORP1tesWdNv0d8603gthsTzJk5/TV+c6TLWI38FGNJcQqernVQPrxsNDrpGneYb+oMFhCgMI04GnS48uSFmYgeTXmD5peeUeMWLTYyG3RCpqdThG9HUEwr6KKk25/kyTS4D+3N8YNdIo4DjMDeypbDI3MSEZ4t3AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKzmx1KLEoXd7D07WlKAndKYsK7zoyWf0l8UaEWvThtBPXrJErMC3nHMr8IdHPC32faPsKZO9QwFJylbck1SFuj+rNoC+BPOB97JLiD+qLUl7oaRG0VZIw7nOxEWEBiQdJn5padzUp8PyLJya/bLB74oLojf7W07rgR+QdT0rIX7k1CbW3KN+mpbGI1xigu2QgAiZHohubJdzHhlc6smXC+STrlm3UfSh9CGs1bxc8FruAVgyTcQGerlHu/O2w/hX6l9JWII7fQkHLuHN2eIVWW8q6Ye4cPYf1xqtmzIqF7Mi7yGQzFm5DQTvgVyxI0DlpGC9IYqZh5qjnU/5hnUce4=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.statenssc.se/adfs/ls/"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.statenssc.se/adfs/ls/"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>