resolves SWAMIDOPS-6410

2 files changed, 44 insertions, 6 deletions

diff --git a/swamid-1.0/flax.nettst.chalmers.se.xml b/swamid-1.0/flax.nettst.chalmers.se.xml
index 0b953163..6de3b6ac 100644
--- a/swamid-1.0/flax.nettst.chalmers.se.xml
+++ b/swamid-1.0/flax.nettst.chalmers.se.xml
@@ -4,7 +4,7 @@
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC8DCCAdigAwIBAgIQe+YFPWoU8qBOOT16Vbh0pzANBgkqhkiG9w0BAQsFADA0MTIwMAYDVQQDEylBREZTIEVuY3J5cHRpb24gLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMDExMjUxMDMyMDFaFw0xMTExMjUxMDMyMDFaMDQxMjAwBgNVBAMTKUFERlMgRW5jcnlwdGlvbiAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoT+zKrr+zZHLVYL0Pv3yde16s+IGmTNp79yoCXXvuDQMHOccrx2UMQkSQAe2Yz0V1N98/RAcvHT6mwIjVxfr6/C1cHhyjtUG9n/lXdPml5Ql4qvzOTGjKBLtXUpNVc3hPrLvbpiN0CwcRjWrHLSCY3trJMPlk59Tr/3BKVRqN2uoVaojtuk7bYApZigleO3Hh+RSezMFK9QAYCwVF1yq+0mX/hiNqxArbCrmnCmSM8VyeKNjGeyuNT8C7anpJgJvL4OanYxdhW6OvwfMcFJ/DdZr/0JXcFeB9tM71YjVVGYUWCvfdWtMECejcHUXDWXjRzZUkXHsCaLAfqrTIZtHeQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBuuPS38icLJ6VyakF+Nsbppt6A0CWpXd1HEmKWt8D5kb0KMr6MRwfUy0lXVUAOkhAQmLgmlpTgkoO09COJAZ+uCK3tv6fJuCGo+UuFQt6a/mAlMDGBsJLGw/wZ6J4UAqP6WHf1QlOjgS9SJN4+Roput85x0wIAINNqTDzUQ3OJpp8kR6hujz2Lt677apOwk8pJkacZVMiRGAB+uOXPA08m4WcGJ4OGK+VxL0ICmvpaGmM1X19aiSuz0XJfg/YOBjvexaTYdCDTZasvtMveuhDPs88jTCvBeXdk0UbYymb/7MIU8kBLVE21/V5MXBgVWwf+O5NFvGI6KG87B8sNOZVn</X509Certificate>
+          <X509Certificate>MIIC8DCCAdigAwIBAgIQGOva5QLCyrxJx0wGRFu4ajANBgkqhkiG9w0BAQsFADA0MTIwMAYDVQQDEylBREZTIEVuY3J5cHRpb24gLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMTExMDUyMDU2NTFaFw0xMjExMDQyMDU2NTFaMDQxMjAwBgNVBAMTKUFERlMgRW5jcnlwdGlvbiAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArKP7k/dGZIz9pCBbUBWwQQiaiWF96+dKox75ONVEwvthWXmixJm3O9yerUCcA+CUxQYb2KqKeg4fIq37Av4FefwxY4sr6JkW/pTe8v9P926aQfr2ubxiCf59YuKLhpkCAXwqkcPJb4f4gDRsAUqPBOn84fOHpOf6NQYjznZpqPdIah/0TI/Uj3oA+nFBwI4/6yXHqsRb1JhpSuzkF3ajP6gvo2e8s6hM8WKKCxyHZeoA56SO+8CkE9fQm/Dfp/CWNzfpaXknUU+JZgNwnyHps+2Wg3lDa2+UaOI+5eutUWKtbMVFLviQj74t4JMhB5c+t+nQrKsB7wGyqIS0vnjjHwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB1h4u7BDcvoSEvtS/hArwHSZ2o/H9aNC9IUuGoixImYsItfnkhlTapqcB6zfxPgajw2DDA+ioLnoWViau4uOnmz2nXLIrWYyH5WmD1Moo4mcsF4s+R2AAL9lI8+2o8fahbjO6vj1GsKLOKilR/Uxn85I3tqWDEs/wJPuvMKakorAaluoY+nhdmYprCD7IXT4d6sE817pvzs+STgi+klLfiS53HMWWZZNVfKEuWRYzRpaZYzPO43p+d0cs/9uLP8of8E/68h3E5Pki8GLdgdRnlEGSGbfs89uojka8xxTpFICZMw3CHp8cNxc6Uowh5Hnqoi00x4giHbJeqliuFyBPv</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -129,7 +129,7 @@
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC6jCCAdKgAwIBAgIQY1tbal6FwodHiu3iYt3RDzANBgkqhkiG9w0BAQsFADAxMS8wLQYDVQQDEyZBREZTIFNpZ25pbmcgLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMDExMjUxMDMyMDFaFw0xMTExMjUxMDMyMDFaMDExLzAtBgNVBAMTJkFERlMgU2lnbmluZyAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzgcM2m9cSrUlO+blyf7jMs6GS0DsR/IyK1cCUGBQ4DYLQjqV7+ym63zW6XmFh23hp4DXqTnCCiMI4suw2o/3uI70kUDAL8AJcajqyEudBnu7fEN3atHhxmSD1XYk9uEb2VumNg8E1GBISkvgCeG4Lmr/pZGSNr61GA9x7WnGAh9qaPaeTzrwXaMukH0BY1zmi0k2SQHftNzNFrju47fRgEfS0/C9VEg//QuT4IfobKA0DDXEcTz06Ac0jfYdehlmnhNZOCaWFp9q3BP0zhiwpcqygIZWmG3jr/3Qcj3Cu4oKV1JhQZh8A9rlC3g9mpznnVXrLFE0Frhn0oCpp9vlrQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAuq7sVIabZMbKmlc7wiOo5lQQEuI1Rkk3hM9dfC3DBbYKm+fa1EvnKZZ1n2qlll8icaTlnxlKMJWaRj54eLgngM6C2npOodI4XORQ0xzBum56kYNmZ3Kb899+Y0A88CNtzs9IlZIG9NpV9ajf3PVTJvVmb0ZxrksPQz5ku5xHYQQtAB9FlXS7sR6HtRtP4aUChS8RrvTjRQtLtiyRYws7w/rOFYqZeChluA9KgqHM16xBUZyaPvtw5b0JyOkYMa+0MN58Nqfdx9ZihovalD4odC1RX/jEKCswcpU/0Jz0CKg/yHFuNRMIV7xTiGMXt9r7tLg1mZClqSrYFvdpcVaWY</X509Certificate>
+          <X509Certificate>MIIC6jCCAdKgAwIBAgIQHRv9/m11KqxPGiO1S+jm7jANBgkqhkiG9w0BAQsFADAxMS8wLQYDVQQDEyZBREZTIFNpZ25pbmcgLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMTExMDUyMDU2NTNaFw0xMjExMDQyMDU2NTNaMDExLzAtBgNVBAMTJkFERlMgU2lnbmluZyAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArNfarEPzyTfQbU0Hktb51F7L/SkfXZaUAUxBqc/7k9mKIwtH6N5CJbDtuEU03gjMm4ndbg6dL6BFzZX6KxpYu6JLeie5O/D36581u/N8i+dFgx83iB7fWDw38Nea8HGxn89AxASU+Y4JVwR+WpwIENCY8p4dywkS6zgAG321WYjl4MzVbdEYOqJ85N4osEIRtqsX9Ea0LCLC84IcZfHqUNHhKr2jV+e1vWYVydyBo6c5cDD98mGyAk1SfFbAB0tS8DOR6p+qFJ1XQBErQ1LHcGbW6A/zgm2p7fHSJXMxtkK/BSeRliyj0MOLUfLX9LGXJH8yIssQjRATza0bgHTHMwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAGlYJjps7Q5fUj2zuWvsjxVgaQY3au4QSrSuvoavhFcIUWOeJgtpwXOoAQO6Ap2Z03sT4sXVlB4Tdgy45QRC4EW377VLs4tUWJOV/cf2sFEYjfzo8VbaJCGgQVVu4r0zx8HJm/g9fn355BmZaSFDofCnh3cVP3U6fWe18+1HVMRiUK9qMyq88Eks+Y5VOFsQmPIx+8ABWSjW3W6RVHSBm1xBUbtK04XcYmebFsYexhDDV4ckOBQzw1qHT2qO6IYG7dJ7x3+qB9cbATRCPwPZXnTOazPokWL4bFChY67Az8e2Hq/PhI909dXAQGsa6LjC+2Musg0auIaOwHwpp+VG/d</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -247,14 +247,14 @@
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC8DCCAdigAwIBAgIQe+YFPWoU8qBOOT16Vbh0pzANBgkqhkiG9w0BAQsFADA0MTIwMAYDVQQDEylBREZTIEVuY3J5cHRpb24gLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMDExMjUxMDMyMDFaFw0xMTExMjUxMDMyMDFaMDQxMjAwBgNVBAMTKUFERlMgRW5jcnlwdGlvbiAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoT+zKrr+zZHLVYL0Pv3yde16s+IGmTNp79yoCXXvuDQMHOccrx2UMQkSQAe2Yz0V1N98/RAcvHT6mwIjVxfr6/C1cHhyjtUG9n/lXdPml5Ql4qvzOTGjKBLtXUpNVc3hPrLvbpiN0CwcRjWrHLSCY3trJMPlk59Tr/3BKVRqN2uoVaojtuk7bYApZigleO3Hh+RSezMFK9QAYCwVF1yq+0mX/hiNqxArbCrmnCmSM8VyeKNjGeyuNT8C7anpJgJvL4OanYxdhW6OvwfMcFJ/DdZr/0JXcFeB9tM71YjVVGYUWCvfdWtMECejcHUXDWXjRzZUkXHsCaLAfqrTIZtHeQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBuuPS38icLJ6VyakF+Nsbppt6A0CWpXd1HEmKWt8D5kb0KMr6MRwfUy0lXVUAOkhAQmLgmlpTgkoO09COJAZ+uCK3tv6fJuCGo+UuFQt6a/mAlMDGBsJLGw/wZ6J4UAqP6WHf1QlOjgS9SJN4+Roput85x0wIAINNqTDzUQ3OJpp8kR6hujz2Lt677apOwk8pJkacZVMiRGAB+uOXPA08m4WcGJ4OGK+VxL0ICmvpaGmM1X19aiSuz0XJfg/YOBjvexaTYdCDTZasvtMveuhDPs88jTCvBeXdk0UbYymb/7MIU8kBLVE21/V5MXBgVWwf+O5NFvGI6KG87B8sNOZVn</X509Certificate>
+          <X509Certificate>MIIC8DCCAdigAwIBAgIQGOva5QLCyrxJx0wGRFu4ajANBgkqhkiG9w0BAQsFADA0MTIwMAYDVQQDEylBREZTIEVuY3J5cHRpb24gLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMTExMDUyMDU2NTFaFw0xMjExMDQyMDU2NTFaMDQxMjAwBgNVBAMTKUFERlMgRW5jcnlwdGlvbiAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArKP7k/dGZIz9pCBbUBWwQQiaiWF96+dKox75ONVEwvthWXmixJm3O9yerUCcA+CUxQYb2KqKeg4fIq37Av4FefwxY4sr6JkW/pTe8v9P926aQfr2ubxiCf59YuKLhpkCAXwqkcPJb4f4gDRsAUqPBOn84fOHpOf6NQYjznZpqPdIah/0TI/Uj3oA+nFBwI4/6yXHqsRb1JhpSuzkF3ajP6gvo2e8s6hM8WKKCxyHZeoA56SO+8CkE9fQm/Dfp/CWNzfpaXknUU+JZgNwnyHps+2Wg3lDa2+UaOI+5eutUWKtbMVFLviQj74t4JMhB5c+t+nQrKsB7wGyqIS0vnjjHwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB1h4u7BDcvoSEvtS/hArwHSZ2o/H9aNC9IUuGoixImYsItfnkhlTapqcB6zfxPgajw2DDA+ioLnoWViau4uOnmz2nXLIrWYyH5WmD1Moo4mcsF4s+R2AAL9lI8+2o8fahbjO6vj1GsKLOKilR/Uxn85I3tqWDEs/wJPuvMKakorAaluoY+nhdmYprCD7IXT4d6sE817pvzs+STgi+klLfiS53HMWWZZNVfKEuWRYzRpaZYzPO43p+d0cs/9uLP8of8E/68h3E5Pki8GLdgdRnlEGSGbfs89uojka8xxTpFICZMw3CHp8cNxc6Uowh5Hnqoi00x4giHbJeqliuFyBPv</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC6jCCAdKgAwIBAgIQY1tbal6FwodHiu3iYt3RDzANBgkqhkiG9w0BAQsFADAxMS8wLQYDVQQDEyZBREZTIFNpZ25pbmcgLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMDExMjUxMDMyMDFaFw0xMTExMjUxMDMyMDFaMDExLzAtBgNVBAMTJkFERlMgU2lnbmluZyAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzgcM2m9cSrUlO+blyf7jMs6GS0DsR/IyK1cCUGBQ4DYLQjqV7+ym63zW6XmFh23hp4DXqTnCCiMI4suw2o/3uI70kUDAL8AJcajqyEudBnu7fEN3atHhxmSD1XYk9uEb2VumNg8E1GBISkvgCeG4Lmr/pZGSNr61GA9x7WnGAh9qaPaeTzrwXaMukH0BY1zmi0k2SQHftNzNFrju47fRgEfS0/C9VEg//QuT4IfobKA0DDXEcTz06Ac0jfYdehlmnhNZOCaWFp9q3BP0zhiwpcqygIZWmG3jr/3Qcj3Cu4oKV1JhQZh8A9rlC3g9mpznnVXrLFE0Frhn0oCpp9vlrQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAuq7sVIabZMbKmlc7wiOo5lQQEuI1Rkk3hM9dfC3DBbYKm+fa1EvnKZZ1n2qlll8icaTlnxlKMJWaRj54eLgngM6C2npOodI4XORQ0xzBum56kYNmZ3Kb899+Y0A88CNtzs9IlZIG9NpV9ajf3PVTJvVmb0ZxrksPQz5ku5xHYQQtAB9FlXS7sR6HtRtP4aUChS8RrvTjRQtLtiyRYws7w/rOFYqZeChluA9KgqHM16xBUZyaPvtw5b0JyOkYMa+0MN58Nqfdx9ZihovalD4odC1RX/jEKCswcpU/0Jz0CKg/yHFuNRMIV7xTiGMXt9r7tLg1mZClqSrYFvdpcVaWY</X509Certificate>
+          <X509Certificate>MIIC6jCCAdKgAwIBAgIQHRv9/m11KqxPGiO1S+jm7jANBgkqhkiG9w0BAQsFADAxMS8wLQYDVQQDEyZBREZTIFNpZ25pbmcgLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMTExMDUyMDU2NTNaFw0xMjExMDQyMDU2NTNaMDExLzAtBgNVBAMTJkFERlMgU2lnbmluZyAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArNfarEPzyTfQbU0Hktb51F7L/SkfXZaUAUxBqc/7k9mKIwtH6N5CJbDtuEU03gjMm4ndbg6dL6BFzZX6KxpYu6JLeie5O/D36581u/N8i+dFgx83iB7fWDw38Nea8HGxn89AxASU+Y4JVwR+WpwIENCY8p4dywkS6zgAG321WYjl4MzVbdEYOqJ85N4osEIRtqsX9Ea0LCLC84IcZfHqUNHhKr2jV+e1vWYVydyBo6c5cDD98mGyAk1SfFbAB0tS8DOR6p+qFJ1XQBErQ1LHcGbW6A/zgm2p7fHSJXMxtkK/BSeRliyj0MOLUfLX9LGXJH8yIssQjRATza0bgHTHMwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAGlYJjps7Q5fUj2zuWvsjxVgaQY3au4QSrSuvoavhFcIUWOeJgtpwXOoAQO6Ap2Z03sT4sXVlB4Tdgy45QRC4EW377VLs4tUWJOV/cf2sFEYjfzo8VbaJCGgQVVu4r0zx8HJm/g9fn355BmZaSFDofCnh3cVP3U6fWe18+1HVMRiUK9qMyq88Eks+Y5VOFsQmPIx+8ABWSjW3W6RVHSBm1xBUbtK04XcYmebFsYexhDDV4ckOBQzw1qHT2qO6IYG7dJ7x3+qB9cbATRCPwPZXnTOazPokWL4bFChY67Az8e2Hq/PhI909dXAQGsa6LjC+2Musg0auIaOwHwpp+VG/d</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -274,14 +274,14 @@
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC8DCCAdigAwIBAgIQe+YFPWoU8qBOOT16Vbh0pzANBgkqhkiG9w0BAQsFADA0MTIwMAYDVQQDEylBREZTIEVuY3J5cHRpb24gLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMDExMjUxMDMyMDFaFw0xMTExMjUxMDMyMDFaMDQxMjAwBgNVBAMTKUFERlMgRW5jcnlwdGlvbiAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoT+zKrr+zZHLVYL0Pv3yde16s+IGmTNp79yoCXXvuDQMHOccrx2UMQkSQAe2Yz0V1N98/RAcvHT6mwIjVxfr6/C1cHhyjtUG9n/lXdPml5Ql4qvzOTGjKBLtXUpNVc3hPrLvbpiN0CwcRjWrHLSCY3trJMPlk59Tr/3BKVRqN2uoVaojtuk7bYApZigleO3Hh+RSezMFK9QAYCwVF1yq+0mX/hiNqxArbCrmnCmSM8VyeKNjGeyuNT8C7anpJgJvL4OanYxdhW6OvwfMcFJ/DdZr/0JXcFeB9tM71YjVVGYUWCvfdWtMECejcHUXDWXjRzZUkXHsCaLAfqrTIZtHeQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBuuPS38icLJ6VyakF+Nsbppt6A0CWpXd1HEmKWt8D5kb0KMr6MRwfUy0lXVUAOkhAQmLgmlpTgkoO09COJAZ+uCK3tv6fJuCGo+UuFQt6a/mAlMDGBsJLGw/wZ6J4UAqP6WHf1QlOjgS9SJN4+Roput85x0wIAINNqTDzUQ3OJpp8kR6hujz2Lt677apOwk8pJkacZVMiRGAB+uOXPA08m4WcGJ4OGK+VxL0ICmvpaGmM1X19aiSuz0XJfg/YOBjvexaTYdCDTZasvtMveuhDPs88jTCvBeXdk0UbYymb/7MIU8kBLVE21/V5MXBgVWwf+O5NFvGI6KG87B8sNOZVn</X509Certificate>
+          <X509Certificate>MIIC8DCCAdigAwIBAgIQGOva5QLCyrxJx0wGRFu4ajANBgkqhkiG9w0BAQsFADA0MTIwMAYDVQQDEylBREZTIEVuY3J5cHRpb24gLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMTExMDUyMDU2NTFaFw0xMjExMDQyMDU2NTFaMDQxMjAwBgNVBAMTKUFERlMgRW5jcnlwdGlvbiAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArKP7k/dGZIz9pCBbUBWwQQiaiWF96+dKox75ONVEwvthWXmixJm3O9yerUCcA+CUxQYb2KqKeg4fIq37Av4FefwxY4sr6JkW/pTe8v9P926aQfr2ubxiCf59YuKLhpkCAXwqkcPJb4f4gDRsAUqPBOn84fOHpOf6NQYjznZpqPdIah/0TI/Uj3oA+nFBwI4/6yXHqsRb1JhpSuzkF3ajP6gvo2e8s6hM8WKKCxyHZeoA56SO+8CkE9fQm/Dfp/CWNzfpaXknUU+JZgNwnyHps+2Wg3lDa2+UaOI+5eutUWKtbMVFLviQj74t4JMhB5c+t+nQrKsB7wGyqIS0vnjjHwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB1h4u7BDcvoSEvtS/hArwHSZ2o/H9aNC9IUuGoixImYsItfnkhlTapqcB6zfxPgajw2DDA+ioLnoWViau4uOnmz2nXLIrWYyH5WmD1Moo4mcsF4s+R2AAL9lI8+2o8fahbjO6vj1GsKLOKilR/Uxn85I3tqWDEs/wJPuvMKakorAaluoY+nhdmYprCD7IXT4d6sE817pvzs+STgi+klLfiS53HMWWZZNVfKEuWRYzRpaZYzPO43p+d0cs/9uLP8of8E/68h3E5Pki8GLdgdRnlEGSGbfs89uojka8xxTpFICZMw3CHp8cNxc6Uowh5Hnqoi00x4giHbJeqliuFyBPv</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC6jCCAdKgAwIBAgIQY1tbal6FwodHiu3iYt3RDzANBgkqhkiG9w0BAQsFADAxMS8wLQYDVQQDEyZBREZTIFNpZ25pbmcgLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMDExMjUxMDMyMDFaFw0xMTExMjUxMDMyMDFaMDExLzAtBgNVBAMTJkFERlMgU2lnbmluZyAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzgcM2m9cSrUlO+blyf7jMs6GS0DsR/IyK1cCUGBQ4DYLQjqV7+ym63zW6XmFh23hp4DXqTnCCiMI4suw2o/3uI70kUDAL8AJcajqyEudBnu7fEN3atHhxmSD1XYk9uEb2VumNg8E1GBISkvgCeG4Lmr/pZGSNr61GA9x7WnGAh9qaPaeTzrwXaMukH0BY1zmi0k2SQHftNzNFrju47fRgEfS0/C9VEg//QuT4IfobKA0DDXEcTz06Ac0jfYdehlmnhNZOCaWFp9q3BP0zhiwpcqygIZWmG3jr/3Qcj3Cu4oKV1JhQZh8A9rlC3g9mpznnVXrLFE0Frhn0oCpp9vlrQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAuq7sVIabZMbKmlc7wiOo5lQQEuI1Rkk3hM9dfC3DBbYKm+fa1EvnKZZ1n2qlll8icaTlnxlKMJWaRj54eLgngM6C2npOodI4XORQ0xzBum56kYNmZ3Kb899+Y0A88CNtzs9IlZIG9NpV9ajf3PVTJvVmb0ZxrksPQz5ku5xHYQQtAB9FlXS7sR6HtRtP4aUChS8RrvTjRQtLtiyRYws7w/rOFYqZeChluA9KgqHM16xBUZyaPvtw5b0JyOkYMa+0MN58Nqfdx9ZihovalD4odC1RX/jEKCswcpU/0Jz0CKg/yHFuNRMIV7xTiGMXt9r7tLg1mZClqSrYFvdpcVaWY</X509Certificate>
+          <X509Certificate>MIIC6jCCAdKgAwIBAgIQHRv9/m11KqxPGiO1S+jm7jANBgkqhkiG9w0BAQsFADAxMS8wLQYDVQQDEyZBREZTIFNpZ25pbmcgLSBmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMTExMDUyMDU2NTNaFw0xMjExMDQyMDU2NTNaMDExLzAtBgNVBAMTJkFERlMgU2lnbmluZyAtIGZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArNfarEPzyTfQbU0Hktb51F7L/SkfXZaUAUxBqc/7k9mKIwtH6N5CJbDtuEU03gjMm4ndbg6dL6BFzZX6KxpYu6JLeie5O/D36581u/N8i+dFgx83iB7fWDw38Nea8HGxn89AxASU+Y4JVwR+WpwIENCY8p4dywkS6zgAG321WYjl4MzVbdEYOqJ85N4osEIRtqsX9Ea0LCLC84IcZfHqUNHhKr2jV+e1vWYVydyBo6c5cDD98mGyAk1SfFbAB0tS8DOR6p+qFJ1XQBErQ1LHcGbW6A/zgm2p7fHSJXMxtkK/BSeRliyj0MOLUfLX9LGXJH8yIssQjRATza0bgHTHMwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAGlYJjps7Q5fUj2zuWvsjxVgaQY3au4QSrSuvoavhFcIUWOeJgtpwXOoAQO6Ap2Z03sT4sXVlB4Tdgy45QRC4EW377VLs4tUWJOV/cf2sFEYjfzo8VbaJCGgQVVu4r0zx8HJm/g9fn355BmZaSFDofCnh3cVP3U6fWe18+1HVMRiUK9qMyq88Eks+Y5VOFsQmPIx+8ABWSjW3W6RVHSBm1xBUbtK04XcYmebFsYexhDDV4ckOBQzw1qHT2qO6IYG7dJ7x3+qB9cbATRCPwPZXnTOazPokWL4bFChY67Az8e2Hq/PhI909dXAQGsa6LjC+2Musg0auIaOwHwpp+VG/d</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -315,4 +315,21 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
   </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CHALMERSTest</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Chalmers Test IdP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.chalmers.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Chalmers</Company>
+    <EmailAddress>appro@chalmers.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Chalmers</Company>
+    <EmailAddress>nrq@chalmers.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Chalmers</Company>
+    <EmailAddress>biorn@chalmers.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-1.0/idp.chalmers.se.xml b/swamid-1.0/idp.chalmers.se.xml
index df065a23..d904ed31 100644
--- a/swamid-1.0/idp.chalmers.se.xml
+++ b/swamid-1.0/idp.chalmers.se.xml
@@ -133,6 +133,13 @@
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC2jCCAcKgAwIBAgIQdTSCoUMKuo9GNnkctyUJFTANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZHAuY2hhbG1lcnMuc2UwHhcNMTIwMTA3MTMyNTMwWhcNMTMwMTA2MTMyNTMwWjApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClcPethrYu2tkJ0Z5fbJIwZQZR+5YyY5dYgwhxC6p5KsoH3sIVMCGnO/wI46lPEnyynUqjko73PbzF2z0V0uow6BnmT/lPK19tlujDopPm3K/NnTwdXIFgaBJsX6vZ2arwPi7usTmmKG1H655+TsfdD8SP9fAYhO7x4SPnwDbOwt0ZklmekM/ZtwDiH0cG0w+5EehkAYcap3My+xSlXWu/ru3q0sW2L8Aqv0UuzCiLtVp3B1j+ccvKMwZKo5tiYHPKqEQiPGx8/BQwj4AfsQ62NYLOLJkk01n6fw1PIQGRhwfZbwynYpmx2bK/bjSwhonmqJvfAmEshom7kh5Z9pwFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFGnqgK9rcy8LaYbeuJfTc7mCnFtOSnhs7sE+cOpT30P2jyxhK1/41QufoSdxIgLTNEbpMKJBeMPQG9G9lag3xe+QtiS+rUhWKOkPXA9YBD3ckg5AXomSARle2+S3X7iCNgNQuqoR0WnJ1XIUK4aKYLE9hr0Sdx3+QepX5Jn4Sj7j4fRasSA0uda9TNUGqjNRsRkbv89tc+aHfZwVrelHrlNJozkPq1gPl+QeXbWt3mIa7p2IoKFLqZXxqL1vCgimdOoSiTKkPHPo2/ERKnsBZVfyd5VbPDi2uzZU0mFKWAs8fEVVMTRmGdZTfk7/SDT+K0aJyJ06sQmLX+5wWiweoI=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
     <fed:TokenTypesOffered>
       <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
       <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
@@ -258,6 +265,13 @@
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC2jCCAcKgAwIBAgIQdTSCoUMKuo9GNnkctyUJFTANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZHAuY2hhbG1lcnMuc2UwHhcNMTIwMTA3MTMyNTMwWhcNMTMwMTA2MTMyNTMwWjApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClcPethrYu2tkJ0Z5fbJIwZQZR+5YyY5dYgwhxC6p5KsoH3sIVMCGnO/wI46lPEnyynUqjko73PbzF2z0V0uow6BnmT/lPK19tlujDopPm3K/NnTwdXIFgaBJsX6vZ2arwPi7usTmmKG1H655+TsfdD8SP9fAYhO7x4SPnwDbOwt0ZklmekM/ZtwDiH0cG0w+5EehkAYcap3My+xSlXWu/ru3q0sW2L8Aqv0UuzCiLtVp3B1j+ccvKMwZKo5tiYHPKqEQiPGx8/BQwj4AfsQ62NYLOLJkk01n6fw1PIQGRhwfZbwynYpmx2bK/bjSwhonmqJvfAmEshom7kh5Z9pwFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFGnqgK9rcy8LaYbeuJfTc7mCnFtOSnhs7sE+cOpT30P2jyxhK1/41QufoSdxIgLTNEbpMKJBeMPQG9G9lag3xe+QtiS+rUhWKOkPXA9YBD3ckg5AXomSARle2+S3X7iCNgNQuqoR0WnJ1XIUK4aKYLE9hr0Sdx3+QepX5Jn4Sj7j4fRasSA0uda9TNUGqjNRsRkbv89tc+aHfZwVrelHrlNJozkPq1gPl+QeXbWt3mIa7p2IoKFLqZXxqL1vCgimdOoSiTKkPHPo2/ERKnsBZVfyd5VbPDi2uzZU0mFKWAs8fEVVMTRmGdZTfk7/SDT+K0aJyJ06sQmLX+5wWiweoI=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
     <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/"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
@@ -285,6 +299,13 @@
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC2jCCAcKgAwIBAgIQdTSCoUMKuo9GNnkctyUJFTANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZHAuY2hhbG1lcnMuc2UwHhcNMTIwMTA3MTMyNTMwWhcNMTMwMTA2MTMyNTMwWjApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClcPethrYu2tkJ0Z5fbJIwZQZR+5YyY5dYgwhxC6p5KsoH3sIVMCGnO/wI46lPEnyynUqjko73PbzF2z0V0uow6BnmT/lPK19tlujDopPm3K/NnTwdXIFgaBJsX6vZ2arwPi7usTmmKG1H655+TsfdD8SP9fAYhO7x4SPnwDbOwt0ZklmekM/ZtwDiH0cG0w+5EehkAYcap3My+xSlXWu/ru3q0sW2L8Aqv0UuzCiLtVp3B1j+ccvKMwZKo5tiYHPKqEQiPGx8/BQwj4AfsQ62NYLOLJkk01n6fw1PIQGRhwfZbwynYpmx2bK/bjSwhonmqJvfAmEshom7kh5Z9pwFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFGnqgK9rcy8LaYbeuJfTc7mCnFtOSnhs7sE+cOpT30P2jyxhK1/41QufoSdxIgLTNEbpMKJBeMPQG9G9lag3xe+QtiS+rUhWKOkPXA9YBD3ckg5AXomSARle2+S3X7iCNgNQuqoR0WnJ1XIUK4aKYLE9hr0Sdx3+QepX5Jn4Sj7j4fRasSA0uda9TNUGqjNRsRkbv89tc+aHfZwVrelHrlNJozkPq1gPl+QeXbWt3mIa7p2IoKFLqZXxqL1vCgimdOoSiTKkPHPo2/ERKnsBZVfyd5VbPDi2uzZU0mFKWAs8fEVVMTRmGdZTfk7/SDT+K0aJyJ06sQmLX+5wWiweoI=</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/"/>