1 files changed, 56 insertions, 60 deletions
diff --git a/swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml b/swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml
index 81f13cd3..9686ce7f 100644
--- a/swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml
+++ b/swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml
@@ -121,30 +121,6 @@ qBxK89s=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUXRI6TnTqyLdbWXY+ybzzfbGoeZwwDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0LmhiLnNlMB4XDTE4MDkwNDE1
-MzcxMloXDTM4MDkwNDE1MzcxMlowIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0
-LmhiLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgqktYAX0lZcZ
-KjQBkdgNN3VVHi0XmPQWQzZULb8mIEHet0oF2Cu84m6q5+yeLesbVpr17VIiqeYV
-rDmfYEoVYKuIxpZkcE/Df4QRtQLMM/zlfPmivjMgY9cA6xy2UkxO3yLH6yWtwvf1
-L+6oOEpix9ZBnK1fxtUP0rqjof4+pwkT6qj6OtgvEcA/0Y4uK9r7gP3bX6qB6vTS
-3XW0oZKf9KfNk7ES+pu19mCYSvwUK6UlHeNWZfOzz6/cmHBIJfWnirdE6GZrbIZL
-rZT28KwF43zBQ93OjfQxjvoVTFNI0ienSMJh1wquLEez0rgoyfvnnaPwEmdg+xK8
-3Z3JzAkPaQIDAQABo3EwbzAdBgNVHQ4EFgQUi0AQ8gh4n344u3KqkqSr5zXM8osw
-TgYDVR0RBEcwRYIVaGJpZHAtdGVzdC50ZXN0LmhiLnNlhixodHRwczovL2hiaWRw
-LXRlc3QudGVzdC5oYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAaMzc+G/kwGYh6K4nX5fUXqVKSWeYoqj37ewoWDF7ZP+1/iQJ+AEp7yPtDXZQ
-e1Hbepeyw/nRDucI8Zs5rw2B7CbQXIhVhzWd4MvD//GZRJn8gllwM7MQ4GQeveG5
-HxkE3HkGyuMw81EqYd+zxbnw9i0OgUaKCjQYv7z66GDN5BnBi0RkwN1K5FdeNq2N
-tmwzSXBUYd5AuOluabpjCVJE87CnSIOJ+6ZyFWqhE1owqM2vw2YDR+5qMhqxCn3l
-Wkw27URn2McUdKeTUMRQBp4TgHUlPruxui51DsU842gJIeRjKvGpKBEr3whEVwEQ
-ulMd7RBwYluu5OV3k9qVEF28oA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -219,48 +195,68 @@ HeJFPfMchJSIf4t2ui7XHSfm5/U=</ds:X509Certificate>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUXRI6TnTqyLdbWXY+ybzzfbGoeZwwDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0LmhiLnNlMB4XDTE4MDkwNDE1
-MzcxMloXDTM4MDkwNDE1MzcxMlowIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0
-LmhiLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgqktYAX0lZcZ
-KjQBkdgNN3VVHi0XmPQWQzZULb8mIEHet0oF2Cu84m6q5+yeLesbVpr17VIiqeYV
-rDmfYEoVYKuIxpZkcE/Df4QRtQLMM/zlfPmivjMgY9cA6xy2UkxO3yLH6yWtwvf1
-L+6oOEpix9ZBnK1fxtUP0rqjof4+pwkT6qj6OtgvEcA/0Y4uK9r7gP3bX6qB6vTS
-3XW0oZKf9KfNk7ES+pu19mCYSvwUK6UlHeNWZfOzz6/cmHBIJfWnirdE6GZrbIZL
-rZT28KwF43zBQ93OjfQxjvoVTFNI0ienSMJh1wquLEez0rgoyfvnnaPwEmdg+xK8
-3Z3JzAkPaQIDAQABo3EwbzAdBgNVHQ4EFgQUi0AQ8gh4n344u3KqkqSr5zXM8osw
-TgYDVR0RBEcwRYIVaGJpZHAtdGVzdC50ZXN0LmhiLnNlhixodHRwczovL2hiaWRw
-LXRlc3QudGVzdC5oYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAaMzc+G/kwGYh6K4nX5fUXqVKSWeYoqj37ewoWDF7ZP+1/iQJ+AEp7yPtDXZQ
-e1Hbepeyw/nRDucI8Zs5rw2B7CbQXIhVhzWd4MvD//GZRJn8gllwM7MQ4GQeveG5
-HxkE3HkGyuMw81EqYd+zxbnw9i0OgUaKCjQYv7z66GDN5BnBi0RkwN1K5FdeNq2N
-tmwzSXBUYd5AuOluabpjCVJE87CnSIOJ+6ZyFWqhE1owqM2vw2YDR+5qMhqxCn3l
-Wkw27URn2McUdKeTUMRQBp4TgHUlPruxui51DsU842gJIeRjKvGpKBEr3whEVwEQ
-ulMd7RBwYluu5OV3k9qVEF28oA==</ds:X509Certificate>
+          <ds:X509Certificate>MIIFETCCAvmgAwIBAgIUXnD1F3XbyCf+Jqb8RkTasy3fWQ8wDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0LmhiLnNlMB4XDTIyMTIwMjE0
+MDAyMloXDTMyMTIwMjE0MDAyMlowIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0
+LmhiLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAiqVju+aruwfk
+qsgmTXDtp+zHvyOrb61SjByOcNuJUqtjJq5VpFEFZiu0L9iNNzYPDP1tKHoU9OoC
+KGXjzAIAx4oliGPUroW52wD5NSd1aYB+HR58Bw74V/JDvrgWwLIIPhmot/qFnm0o
+x+7Vum6cQ4iba9oK5vvBK14uGlUZgkicR4JO3KDg9l7vK4G5vi5R5s3Nv7rt6Ik8
+KfYfxHws+ZyebD0rYCV45gVcHYghxMFlErYZapTE4CFY27sPq02MoK/zoIzskHnZ
+v3w0zEnmdYWTYdmrpP6J10kD8WO5JfnZO9Vt11XdbXGX8GBW161o/7eNO5xC84Xc
+RowPXuE3xV0GZnQyETA0zjomiRrewfZJio6seGaj9DAYZlFte1NwGTKv8rSDHIR2
+tz40LnJZPg1ReuQ8+pxifsV4DM9sz4WrubEYnkoQe6YPxFwVZ0Bf6z/dm5iHOG/H
+h0d3CdAurUbrOWvG7Xzoa9Wps4xharlRr1tov2jr7QuFFQPvKx7qQ0Sg0N9lQaZK
+d0KbMKnV8o04/tJ5fNTdLCpnhq+3rLESKkLkQO5+jKybw7c4Dg37rPW4icpILtWS
+mt8+Dlt8H4unqPa3qukzy33+T8F91vRhP7CifQ8RhuqzVgqcnpMbeC22uKd9i7s3
+TBrpnzx768LmLmFBIPhNtwuNLGN75W8CAwEAAaNDMEEwHQYDVR0OBBYEFIiR8OIT
+0yr6gxIrdg+FiRbEa2tyMCAGA1UdEQQZMBeCFWhiaWRwLXRlc3QudGVzdC5oYi5z
+ZTANBgkqhkiG9w0BAQsFAAOCAgEASzUZZs/gH0HqWFVJ9/xlHK4J1G1IhjJS9blp
+qj2JL23s5raYqXdttpYcipv2/Nf/E3SGh6JFvUPljpmjMhc2ljIEV7h8TaVQvAEP
+BHEyKDYw8yXncmWMCYAqfpQPdpHeFJSP/bWRzyZymZ0r0ccqfLoY9A0ak8a7vIvz
+4iyYROvmBLbeOQLEf5OSpLVV1Z7Eirv95SOSvPB+8DaSDjtUERtvNe3yaG2PovPX
+XuTQVM2cKFqnh8oSGFBp9VQwx3ryUoOqt1hDQMgO/xgJiMf36VXlZ6Sqotb0J+YN
+BKHmryWJ3ZJEFJhQsntuIzAi/W8KxG5FTZlTefs1ty4Ha27N6+QxuO8OjjCGlK7R
+/mjKoGflsQL+F27KwJJpH2gC7SdqOzArCJLJwfzr5K7kK5rQsMryZbsAFD+xCjjC
+Zt2PwRSlQVuMEuSOTRyxI6C2MzWX5D1A6COYNGA4Jg9ICNqGTs89f7VxwgLHL6jZ
+LzZNdlQUaWQbBcVQ0HvXCJbJIi3n+oaBSK4lShyOJrGM1Mrz+/sy+dY1yD6aS3Ua
+ejE2DQTAMezc+Czocba4tGXVuGfQOBK9sc+gn79Cu/gDWbYnvF17+5Z+nVS8uzbS
+CUs7vulw9YpY4I5tw1rnkL+3tJwBQe2l+P3eRMh+ndiVtyibIfCHEPkgI6mBn0ws
+qBxK89s=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIVAPWsuZ2aCN3fS5mXG2JLmHm1AZgOMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVzdC5oYi5zZTAeFw0xODA5MDQx
-NTM3MTNaFw0zODA5MDQxNTM3MTNaMCAxHjAcBgNVBAMMFWhiaWRwLXRlc3QudGVz
-dC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQdXtQn6Aei
-wNIfovjsFpCSF9UO7nho+gsB48rU8PTWPnuodWhQaBqlyf8FTazrpF/Ring+wJg6
-glPKlBgoWgtUQTOprwkgnqGWRpL5ult7nQTfa1JQjdHBxm+vBFpvEE6+0RKkSmBh
-Llm0dd7zBJnyfG28y0Ouv75BDMK6gvoodHucYndBbEPnyUrnf44OvJD/VKg+DAlb
-pZaUBJkDeR1jM2VUJNBiMbmUmU8v7HgjgplPu5PvL3u4yMU5i0NI+eL9NWo5eRbI
-QNzKQQ4JBW87W90OzoJjaP0VRG7zoO9I27qdlNtVi3I6q2yEEimjx6oC1520JAk/
-aYmG7Cmrg8MCAwEAAaNxMG8wHQYDVR0OBBYEFHWo3WwleQ0SQ1cV9kC+e9D/5AoM
-ME4GA1UdEQRHMEWCFWhiaWRwLXRlc3QudGVzdC5oYi5zZYYsaHR0cHM6Ly9oYmlk
-cC10ZXN0LnRlc3QuaGIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAFv7/0GOeil7iLorFfP7fgiW0PSpOrz1IqdKaPWjGpluav8PW+iBT4l82cNB
-ES3wNEcNbqhnRWmP7su5AJqQX8XdorGl330eK2jd99j/lKWS/6e5H9lq4arWEsTF
-5UwwfT3/NVDI0lBLh1oewROauWN3c8BWd4fmyJ2vMMp+3BTOMgHMzurelZWkMFbj
-emi03bjNx3BEln9TAib40eDwWBJkSzGjsFvjZKhXkA8HunKOqqQrTJw3FK9Z0i+r
-3/7dJXfTLB9biTO3FLytC7lHlFHp9V+k0zeFO6hZdyWPggmYjpyD4ayRdAeekjgJ
-YPbGFDgtXE/LKeKsvKgyQIfKUW8=</ds:X509Certificate>
+          <ds:X509Certificate>MIIFETCCAvmgAwIBAgIUAWBT8/bGYBTu+BX/TRYpyvIC4nUwDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0LmhiLnNlMB4XDTIyMTIwMjE0
+MDAxMloXDTMyMTIwMjE0MDAxMlowIDEeMBwGA1UEAwwVaGJpZHAtdGVzdC50ZXN0
+LmhiLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArgcjOrGbCASG
+KmkV++eMYPPEfnfgPXzeymWR5QKlpNR8xS9xxNrleLJa24YOwg5oPb2ouPh6yCyc
+L5jRizeHYUYiSa4zwDrwqTMpleubeJzh5yC1KIrqdhhCsux4CT0OBYO0I/JpBbG8
+rJ1ukjidlnmDn7yRIR18ImLn+T4ySI71otLqLKlXMPjrThOBOv7FHt7JT2FLLnKM
+cIqjij9O+Ui/iDdec6jDUlxf6BXclKOKhnoXGyVQkavDDYfGPCxLfX8m0t3YsTE/
+5rwkBxz9WIavaWgpmRJKY2gznQO11uENH30oO57YRInEydznp28K/JkZ3sQLsniy
+3jjMbRFG4UPzZiECrlTKOSwEV+t4mNiywtT35StO30TZpJUq05sFaHJlKY2fqDzv
+i1QYXI1UH/pv785O5nssQdV94gpWUCzu/BWhpncqhfzk/n3NytFDNr1XXR7rHvCQ
+RVngNV4hjEZzhbcdlxrC1e7NcdaVvGB8W1/vYz70dGI36xmMjytBa5VCHSsaTPfw
+xHJ6MIZxAvcwho2irrNliBdfBTV1WqMaa8hH2G9w/zLmtU1T1brd6Ua+gj55ZWgg
+pc/NuwBFfaOlXrfpEyKdVVn9NKecjNh46f7qz2w0n/Xl/AZxQn1cfUecBALnZ/8N
+TQ0pkkynpNRGC+6TmND9SUR9FlSYSjcCAwEAAaNDMEEwHQYDVR0OBBYEFFycTwzS
+tP7VaasPdHsEKdkzO8bbMCAGA1UdEQQZMBeCFWhiaWRwLXRlc3QudGVzdC5oYi5z
+ZTANBgkqhkiG9w0BAQsFAAOCAgEAIM4Zh54FzW3lmuWL6mP4yB3BZ6vzaaAWo1bo
+V+RPsetKjwI47TKhkT4SCW0X4reT1qb60PmlcjcbKe3abF6LfAOrX0Ot8W2culuH
+nFZExAvHThXHAX3ltucAia6ZAAVW+mW/g6Fm8XRXtYQSg41804n6RyBUEmribdmL
+ACWrScOREc6TW5SyrEn7kL1WOubZfzZ39NR/9i+6tRSSYqM1Md0/fD9sDjsNcupo
+WpNMi01OdRB2vx7AiPiFcZIqdCRNuQntUyrJHNwLU1AtHHEpo2x5NMTxwT095UWs
+/6Sm8nZnJEe2MgUR59hsWgV5ZziCvGsgahi6xeT4kuEoxSrAFLpMO/R2pvICdUEh
+a4t0PWJcZzFwrGtkZa/6YeowQ09HV+0KARXftUCWJoKy9Wso0nUgxjXUzLhl/rMc
+ue/ONXENQAdool45L+WUdEPrnSywl6NFLaF8qxE2jLg2xvJecbfoOqwnjVk8EjR0
+m3v4LMOi6jL8dXOHuFS3Lhm1wcwn/C8kHe+645mgWihwUQvobGYacWYuWsimxZ7Z
+rTbOTr2x72k9FYUsuQi0kY3KMGZm3vB/39aUMiqTIFUcVXaQIVm46qDsyS6r8xj3
+WhGVbT9yaKeTxzJpImxbeP1A0VJ9WoOxMibOrEObz/RP62WErobTm1EtD3Nyspx3
+O1aA7Vc=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>