Resolves SWAMID-3195

2 files changed, 10 insertions, 10 deletions

diff --git a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
index 2790a435..14d104b4 100644
--- a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
@@ -13,7 +13,7 @@
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
           <X509Certificate>
-            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
+            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            
           </X509Certificate>
         </X509Data>
       </KeyInfo>
@@ -27,15 +27,6 @@
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>
-            MIIHPzCCBiegAwIBAgIQDnXAAkUju3YJqm521V0vyTANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHlRFUkVOQSBTU0wgSGlnaCBBc3N1cmFuY2UgQ0EgMzAeFw0xODEyMTkwMDAwMDBaFw0yMTAyMTgxMjAwMDBaMIHEMR0wGwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjETMBEGCysGAQQBgjc8AgEDEwJTRTEUMBIGA1UEBRMLNTU2NDc5LTU1OTgxCzAJBgNVBAYTAlNFMRIwEAYDVQQHDAlHw7Z0ZWJvcmcxJzAlBgNVBAoMHkNoYWxtZXJzIFRla25pc2thIEjDtmdza29sYSBBQjEMMAoGA1UECxMDSVRBMSAwHgYDVQQDExdmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRbZ36Aa02KFRrRqeu3IhvwlVoT5pF/b0hBiLEF5RauRTgv/4cJ7r6KpLV0dhNYBsndOic9fJfL/TWVAj1kTNZ4GSOjl5qNM/fe4DdREdVUkInN0V7euBdN0dyfF4AazU3/PRIG+unyswhIONuIR/1esresefY5Vku6s7fQMSJBClzUs7UL4tmakF3Zo5ClaknonNK9gH/JkRNJ8Y4YI8gINGWDPNGobApi/5ogB3nl3I4iokbhovLFveecGMb0N7oeCJ4ar/hAO54m3cmVupSf0zd4VOA9O+GUIzV2HQ6/eiOK7LpAPsbOEdYuvHmseYWW96UdYZDHTFubpp3AMf8CAwEAAaOCA3swggN3MB8GA1UdIwQYMBaAFMK4hdfhuRO90Ui8/V7cfZBCeoqpMB0GA1UdDgQWBBSyC0FWr6FK22lmxgm67MczK/N4AjAiBgNVHREEGzAZghdmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMSGlnaEFzc3VyYW5jZUNBMy5jcmwwPKA6oDiGNmh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xIaWdoQXNzdXJhbmNlQ0EzLmNybDBLBgNVHSAERDBCMDcGCWCGSAGG/WwCATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAcGBWeBDAEBMHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMSGlnaEFzc3VyYW5jZUNBMy5jcnQwDAYDVR0TAQH/BAIwADCCAYAGCisGAQQB1nkCBAIEggFwBIIBbAFqAHcApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFnxr7aLAAABAMASDBGAiEAw2o4qTS1oEQrKPXlKzIk79a4d04eifBLNK9/30OYUqgCIQCIgK02cmZEYvCZoi7h0889sX7ttKolEpJEmAN8RyyrUAB2AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAABZ8a+2moAAAQDAEcwRQIhANnW6Zv7dJX7rlc/Oox5iKDk6D9EG3V9JQrgbFH1jXDrAiAU4QSMf1ip2KoySiXtw6fWcAAr5QbgZ7BxQDQVUtF65wB3AId1v+dZfPiMQ5lfvfNu/1aNR1Y2/0q1YMG06v9eoIMPAAABZ8a+2+YAAAQDAEgwRgIhAJMA3xqK9jFjscB09GIKalgHQtpHXUMTkP7wWBc1dzCfAiEAu4EiLA3FcaJ6EnsMEGtyIcDnXknAuZXyLffToBEGxCIwDQYJKoZIhvcNAQELBQADggEBAHTXTFEqUelDLgoWTBw/zxIKhps8X6F0yFflEyrAoIIrJlGEL62JRZ0C6lV4zKjIYIGgo7q4zePhMjPv7b+Qr3YcA6n/fcHGYdIQiFadNlxhJ/oHH1ssAx4ZJiqVqiIu0BrWUZwplYIcbssDFdoey6UbPPWErPEjJZCCnpjwg2J5aj+IWXqa2i9xZlAzFftDU3LWo3IiWfVi5ghkvw0oMread2NsH0fyMog/3dnUxik0Wqm7nu5bcrVUwNr8TTy5QA8MRHM6XozDYq62l+KDc/jDe2YcP5ZnRVoBJKWys6hz2h/mrQrk36n2kjUwEGNN+5fhqjFew33UvhbiMeKRavk=
-          </X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://flax.nettst.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
diff --git a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
index 68e54529..4f65ea00 100644
--- a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -47,6 +47,15 @@
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>
+            MIIDqTCCApGgAwIBAgIUJvJG3zA1H52oNzOAXoQe57Mk9AwwDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCU0UxDDAKBgNVBAgMA1ZHUjEMMAoGA1UEBwwDR0JHMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMRgwFgYDVQQDDA9pZHAuY2hhbG1lcnMuc2UwHhcNMjAwNzIwMTIzNTI4WhcNNDYwMzExMTIzNTI4WjBkMQswCQYDVQQGEwJTRTEMMAoGA1UECAwDVkdSMQwwCgYDVQQHDANHQkcxETAPBgNVBAoMCENoYWxtZXJzMQwwCgYDVQQLDANJVEExGDAWBgNVBAMMD2lkcC5jaGFsbWVycy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPuaynUvXy5n8He3Jefpxz2ELpaXM9mzhiLlF6NK41XJeLo7OsLD0l3kQH2AXQMXvkKV0hoh/dwxlUImj/jCCpBpdF8z4LmYtz4/+FNYq+fMSCf/TkhB2AbLJbPD+AT+yrrlPr3R7Smjd0emtgPWM20NcbBflTM9Uh2jZMeQLHSJu3dIoRW4cdZOKgwonVMTaocccDxxEMQUqE6k/mYCFmCVEYIGLBnkDPSixNIDtzY+WY70bN12HLwLhPhxCz8wS3C/NhXF5gNoChXcfUB3Fxw4lY4GuH49D5cwyvtVNNJR1uCVJFlSbj+xe9bjqjkKwal78iPcxSTLD1SBxPeia1kCAwEAAaNTMFEwHQYDVR0OBBYEFLHkg8AuJUdGvsY0mwofGr9cHWGfMB8GA1UdIwQYMBaAFLHkg8AuJUdGvsY0mwofGr9cHWGfMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC2nyf2NAWnIpedq7cA4tJsodhxDFNSS6tPPav4MypL2rC46a0W/YL5QJn32qoFTMJNfLglu2NWUfUeSKD22XlH/PKV4z/BPFtC9EXNmNbp2aBXSnoC5rmNr1VL/RgTPHL9ebx7BkpM+y/zAbLOeyKtlfumzDt30PrZAImcIHOp7LqkZjmb4RQFHWZc62pzbNjrXhywbTK3ry6K0U7gk1SvWxjD6U/cWSASaYotqWJryWoo7pVcLTGUUYmfCNi+IGINW+KRhUuH4W7+1STwh104kedGkUcbhXaNGtEpqQPwhNFnEnKZFiKy74rN/Ks2Puvinr2CeoSlfk1mRQSkiGxk=
+          </X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>