Added client flag to SSL servers, because each server is also a SOAP client.

author: Emmanuel Raviart <eraviart@entrouvert.com> 2004-08-13 11:02:46 +0000
committer: Emmanuel Raviart <eraviart@entrouvert.com> 2004-08-13 11:02:46 +0000
commit: 2687aac1714a0fe2260d725dc4c628c2696134f4 (patch)
tree: 29946f54f3404e55fbb84fbf6e27c60a0be59bba /tests/data
parent: db348429d96ff168906addab3477c482fda98036 (diff)
download: lasso-2687aac1714a0fe2260d725dc4c628c2696134f4.tar.gz
lasso-2687aac1714a0fe2260d725dc4c628c2696134f4.tar.xz
lasso-2687aac1714a0fe2260d725dc4c628c2696134f4.zip
132 files changed, 1325 insertions, 1325 deletions
diff --git a/tests/data/ca1-la/certificate.pem b/tests/data/ca1-la/certificate.pem
index 4f833207..258a8b85 100644
--- a/tests/data/ca1-la/certificate.pem
+++ b/tests/data/ca1-la/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEcDCCA1igAwIBAgIBADANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDQyMzJaFw0yOTA0
-MDMxMDQyMzJaMFgxCzAJBgNVBAYTAkZSMTQwMgYDVQQDDCtFbnRyb3V2ZXJ0IExp
-YmVydHkgQWxsaWFuY2UgdGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2
-ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArmcyyEc1l01f1vfG
-S6sBhqX7cycaxVMS0TrGJ3FTRz9GF9bQumztIEQ6hOYdN161bLkV+dsoTWJ37l6P
-GkHg3+BMHGTs+MX6UJwMK68swQTEOkoGcf/opq5gj6qcO3b55P61kDpnx/l5kOYF
-sm9u3bpgfsb3yLJT2Y52CvKcuX6+hXL8/570q0LGt12N6C7Gqch5XK+jZmKwdhaO
-dO9Zw52uDTWu39A41MGbBZm8IqPJjxjvIu1Nrmqxg580DFhlzjcufyw+vYBRwth3
-4x/hmdGO03oXTl63O36FLnQh0henc6HPlU0xWjKNpEdrdsyhEMSxWIOx30kgBN6G
-OkIZSQIDAQABo4IBQzCCAT8wHQYDVR0OBBYEFLUSaFQTIbZaJnt0/079m5weciGi
-MB8GA1UdIwQYMBaAFLUSaFQTIbZaJnt0/079m5weciGiMA8GA1UdEwEB/wQFMAMB
+QSAjMTETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDM2MzdaFw0yOTA0
+MDQxMDM2MzdaMFgxCzAJBgNVBAYTAkZSMTQwMgYDVQQDDCtFbnRyb3V2ZXJ0IExp
+YmVydHkgQWxsaWFuY2UgdGVzdCBSb290IENBICMxMRMwEQYDVQQKDApFbnRyb3V2
+ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvL1Q5vTdirmFqJVL
+zshZyfFiS+jLRkevnOYYoS1h8tpXAabk9NcfP33YOAnidk+Vk54H5Ce1DZwf1KBK
+cJBGIWl13WYDsDVsz74tbww5BrrZy8Q/XnNfruwoW3hj0au95gnawZEzpVddT5Ao
+tRTOqa6Hp2p5oicAaKSghQpSSwVzxxaACu1VRL2ahjhYSn9L9Z5ZW+dtAB4R6HaE
+EImYPtAZBX3EZi3UgX5hmHiTwmhBPEJ1tIzJP34y5+0eHyloCrEmysuK0NRKpHtH
+DdotPSCRdj16jEDYKjHeunauWVGcPMLrth4/vEqNEnDLbVfSO2LZlu4LK8jX0K7t
+P6pW8wIDAQABo4IBQzCCAT8wHQYDVR0OBBYEFD1RAUjcM/fCNO/Y/iQY0r8S2FqI
+MB8GA1UdIwQYMBaAFD1RAUjcM/fCNO/Y/iQY0r8S2FqIMA8GA1UdEwEB/wQFMAMB
 Af8wCwYDVR0PBAQDAgEGMCoGA1UdJQQjMCEGCCsGAQUFBwMBBgorBgEEAYI3CgMD
 BglghkgBhvhCBAEwEQYJYIZIAYb4QgEBBAQDAgEGMCYGA1UdEQQfMB2GG2h0dHA6
 Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28u
 ZW50cm91dmVydC5vcmcwUAYJYIZIAYb4QgENBEMWQUVudHInb3V2ZXJ0IExpYmVy
 dHkgQWxsaWFuY2UgdGVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICMx
-MA0GCSqGSIb3DQEBBQUAA4IBAQBnriX0Ny9EoWpVczRwBXSilqiqYXlYNiAbuJfA
-FBukoe1PEQVzk1ZcqvHbPOocxq3LPM9zgQzXLHLM+mG/bkocYObKNpqem7g6ywyZ
-t7Mgn/JL4FR9nkxP6O/NUZltjDg0R6KpcQ+5tbDhAN6kmDRRxttFX460pV8q3rTb
-nCJewW5vu2KO9xSg0zGr2CVa3xIOPqvh4MSrFEysqIMO5/gt1La4I2HWHgGEajqA
-1h/Nbcvxf6BbL52ry5WxXnvVswBsxfquzxSwIXUVhT5Z1BhkVtzWT5Wh/RnadTq2
-XGg60mT07OE6O5cUtoM3AOte9F37JRuQJkk7Zw16oS/PKCD7
+MA0GCSqGSIb3DQEBBQUAA4IBAQBPqgAG2Pj/g7D/WqPYXOJdx6O+PjOft0F1SdFN
+ZwN4m1J5LQWIb4HqCnsDjJ2LIjo2bKM1EGRm/LqlX4lgSxwYhJDcZD2eI1G6y/0e
+g2EKbLyMjOoVmlndfzPspk0kq+egHkrmIks+CKFUIE3FdNdWV0N7Jh43ATQLzRHF
+jtrrWmgS8gLuzlOZxZSGRyg5f6QAu+QzdNbt+pS0xCDHnkH8L8YwoHCHHkLu9JgM
+2xww0U07nMpQ/98TWJd3Y9FI/THcbmKE2zUSrhuykvr4lPynpLdbQZ07X3TmNz5L
+b4QVCXZPdFx8t9oztoimbyhg7+E/A0xiwc8NuahpfcX6et7w
 -----END CERTIFICATE-----
diff --git a/tests/data/ca1-la/jks.keystore b/tests/data/ca1-la/jks.keystore
index fc0b167b..27cdfce5 100644
--- a/tests/data/ca1-la/jks.keystore
+++ b/tests/data/ca1-la/jks.keystore
diff --git a/tests/data/ca1-ssl/certificate.pem b/tests/data/ca1-ssl/certificate.pem
index 52baa20f..e648245d 100644
--- a/tests/data/ca1-ssl/certificate.pem
+++ b/tests/data/ca1-ssl/certificate.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
 MIIEjDCCA3SgAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMxMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NDIzOVoXDTI5MDQwMzEwNDIzOVowYzELMAkGA1UEBhMCRlIxPzA9BgNVBAMMNkVu
+dGVzdCBSb290IENBICMxMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+MzY0NFoXDTI5MDQwNDEwMzY0NFowYzELMAkGA1UEBhMCRlIxPzA9BgNVBAMMNkVu
 dHJvdXZlcnQgTGliZXJ0eSBBbGxpYW5jZSB3ZWIgc2VydmVyIHRlc3QgUm9vdCBD
 QSAjMTETMBEGA1UECgwKRW50cm91dmVydDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALah84BxXX3AGKecWSKqltGjQTjox1VCD3n2YNuAS/f/DaPCmZyd
-zWM8H2YRWwdguR43FayQ9Pt30yJYCSgCwnA0iDHTOGTTb+vCWj/tbEYggbx+gGsy
-zGmevbM0cSN/chwi3DANOzL3fmJJcVP2wBWucFUnOsFdOgWXlrnL4o+W5byOtPee
-CiFG6M56i9GJpo2LQ6ITKcNcN7ybXnMecSGbfjrxXR/trdZqdxD1bntYjPvbh04f
-UVCuzgZYTTizrzQ1dZhr9qf4oOztxCoNdRR+Aql1mabpNmBU9mWOJvubGIrUqALP
-LVFoFoztsIGAOLhleUSUaQVF2VD2IRkLO2ECAwEAAaOCAUkwggFFMB0GA1UdDgQW
-BBTiv6B3xTSfHBjjF02xFJYX7qZCnTAfBgNVHSMEGDAWgBTiv6B3xTSfHBjjF02x
-FJYX7qZCnTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAqBgNVHSUEIzAh
+ADCCAQoCggEBALaUOhGFO50YW89P6h2myXFUGM8R4P39mVvqcRrO09YAMLXXLlUm
+lYgCLSiBpiVs7YpXLL92RGLh04Agn0lrH1fn2kobn+JIyMHpDxpPej/DSktCKpQ0
+JSD8RuJxamlPKU3hGLOuAgAJMFxD5bbMdcbecPc35ZXtGpnfxQVqKniZh8hgQnG0
+ek+ERiW9pxXVeHRjRlWJ+XTzBaU5r8pxNB6/KFLurmCLGXuEwVxkwqF9slAKRqui
+JpRnt7dmnxfc6qoFlRFUCXjrOfYtbQFwBxiwoG5VQRZatqd41X3UsZ/Q5pRYYrH9
+Nw4l9VGv2pv63IkV0gwptZb6+Dh2de+fz6kCAwEAAaOCAUkwggFFMB0GA1UdDgQW
+BBQpga5rdso1yVo7NfIOIgZCP2DhOzAfBgNVHSMEGDAWgBQpga5rdso1yVo7NfIO
+IgZCP2DhOzAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAqBgNVHSUEIzAh
 BggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMBEGCWCGSAGG+EIBAQQE
 AwIBBjAmBgNVHREEHzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwJgYD
 VR0SBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMFYGCWCGSAGG+EIB
 DQRJFkdFbnRyJ291dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3Qgd2ViIHNlcnZl
 ciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAjMTANBgkqhkiG9w0BAQUFAAOCAQEA
-pHRMToZwBPXGREPhRKpd9PZwxTnykixnzKdYzrUbvFp4NUXZQRTbVRjwO45WA4fw
-VO5RNv5hZK2ZPgLFw3LqlKToy8ZDuD0IxsA1YqoZ8yBypoTpLDnKsfPAcQiKnIrq
-0DcON2BeSkCGn8TBIrMQlJxe15J4LP5Jh3XHf0LIxYHGtbVcIRV024L7UUX5fppo
-6IU6vU4lGANiepPQs4nz/OtBkYXBsjq/Mm4ni03pJnqhVK3O0XNHBAtYZ63HKB0N
-OzxRy279F6fxX4tCWu943gtWWH794Ka++zkjyC2Qam/7ExSTjk5Ky3xHoxV6fJLf
-gu4u5GNHS3nNrBbBk4kuAA==
+NlkWh3nXLO+crkuI6uYyJf3yqQ5kpOBiqsOm6LzzuRxtcXHd94WBgR9Qk+v3DdI5
+T9qflAHEfWOAgL+kTVRXyAQvmWODuEcNs7LyHxNL6KWySTx8G1bvrmkRnKYSt126
+vMCYEMJDUA8kfKDX78/YapqnpqohtcFeYCh7LB0BG1qq12mnnaWwcgqerQSshp7P
+9cmx8/2jKogIgUZqZ5sv/XIasGbMsG26yB898dydgNwGW42TScK8lpzr0fa1AMA3
+xKNIOHpnPb8rmTSis6hk8n3qcAQacApqi69y3hk9oUzlWhhHQm1LvoO0anmjysSp
+7BqwIo2AdBdKTxA6Wa26FQ==
 -----END CERTIFICATE-----
diff --git a/tests/data/ca1-ssl/jks.keystore b/tests/data/ca1-ssl/jks.keystore
index 43598882..b87e7fe7 100644
--- a/tests/data/ca1-ssl/jks.keystore
+++ b/tests/data/ca1-ssl/jks.keystore
diff --git a/tests/data/ca2-la/certificate.pem b/tests/data/ca2-la/certificate.pem
index 357bd7a4..e8c91066 100644
--- a/tests/data/ca2-la/certificate.pem
+++ b/tests/data/ca2-la/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEcDCCA1igAwIBAgIBADANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDQyMzVaFw0yOTA0
-MDMxMDQyMzVaMFgxCzAJBgNVBAYTAkZSMTQwMgYDVQQDDCtFbnRyb3V2ZXJ0IExp
+QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDM2NDBaFw0yOTA0
+MDQxMDM2NDBaMFgxCzAJBgNVBAYTAkZSMTQwMgYDVQQDDCtFbnRyb3V2ZXJ0IExp
 YmVydHkgQWxsaWFuY2UgdGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2
-ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4CIBR4rFrs0pU1z0
-264DAdPbjOeinKRPs0dJ4BO/rE4ghFx6r1LxCiGLQRwloHcd5aknbdeZvVLxvs1J
-xhuutDXn2AMgBc6xRQLzvIaP/Tg1NBHea9KOwweEwidXwXLlLMm8Ps52Dwi9QGUM
-bIqCof1bH9eIMagCSONuHy165HWmaKCdwGT88o2X+8454x8Te7vBvJqquMWeMuu8
-Ej4oW1w0iY6aOIsn+q4njyyz+zrAAmnPCR/y3Aa5b0tREzI+2zKIJH2kRPz15hQ2
-nlafnMrHB0jvcK7JJTt0vs6V5zirhtuFV0Wvt6kvKfld066lpTAxrlaHgB5dc5Zt
-joLQEQIDAQABo4IBQzCCAT8wHQYDVR0OBBYEFAJXtjXr7Gloq9goXfQRAk+q+G5S
-MB8GA1UdIwQYMBaAFAJXtjXr7Gloq9goXfQRAk+q+G5SMA8GA1UdEwEB/wQFMAMB
+ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Qzh4gzApaqSLg6F
+bOGlhaIX1eVEUgBYWdHI80Ss9ZVR+3HoClXlzwO+sQLHo9zQZ4Y4btb/3P7TdQlx
+HEm02xCmLthvXo9pEtvchg35HEXIDTOHCwvJy7LhyRjASlxV4ncpiSQLwpSlnuak
+znfF1/u2FE0X6c0jL14w4E5+xWXvg8dBfJXMlZLVzamWzQfkSbFzlSNJjy+u3hB2
+LzINSdli7wXrkxuk50xSK9ZScavYs1sCmB0RnJ+9M8jk1HJNallI6wIrnXed05k6
+cWd82MVYk5G7GMPCwy72qCSxiBFilj3DoyiuId968NffyU3uKQ/BuU2UQ2D0LiUy
+sNhWjQIDAQABo4IBQzCCAT8wHQYDVR0OBBYEFPIgVeWrkWP48RFO7BHb+wuvnhRy
+MB8GA1UdIwQYMBaAFPIgVeWrkWP48RFO7BHb+wuvnhRyMA8GA1UdEwEB/wQFMAMB
 Af8wCwYDVR0PBAQDAgEGMCoGA1UdJQQjMCEGCCsGAQUFBwMBBgorBgEEAYI3CgMD
 BglghkgBhvhCBAEwEQYJYIZIAYb4QgEBBAQDAgEGMCYGA1UdEQQfMB2GG2h0dHA6
 Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28u
 ZW50cm91dmVydC5vcmcwUAYJYIZIAYb4QgENBEMWQUVudHInb3V2ZXJ0IExpYmVy
 dHkgQWxsaWFuY2UgdGVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICMy
-MA0GCSqGSIb3DQEBBQUAA4IBAQBVZFzPoyhaCbQu6Vd3WloBnffTaDVOdneI1aUF
-7zuh35DTAsawuKb3RGpi2VgR9TxxcJWd4j7tWFFeIjXUCdT2TUYt3No0gZCTHrvF
-cwOrmdEP7NuCLt2frNQPHR/UhISNpoqXOF69a8TGsp0b57/r8VN0j9RMj4O8GEwq
-el2nMDchsgW+P83qcHzsM/ed6D1PDOn43EeVFWnp0pinON2GWFRulFw2IBZ3KawB
-XePQrBhGfWBdvsH17XU0m8kzzdEWsrnaj41muivTBfAsOPoD4Y6Itxl84z06KUKh
-WOCbuApCrmI7z2os4vbcRWjLCphh+h0KGm4gmbUrE3+ocV/V
+MA0GCSqGSIb3DQEBBQUAA4IBAQDgmlNcSavDjLNEm/2ABOJLF65DdcsMDD0NJsoq
+rCURQhJPinExSX1k1qIPaqv61vZ3EP5cs9WR90Zo1N3I0Sz+8wJ5/TiVQm2bkMc9
+ip4vNjxzkxKJT7VUHdx07K0TPigXC0OLnMwxWdil646koXeRRIUqCEfoLsRx7P30
+cDWcjxZpJ3KnSuPwNCwOwSMJrTQ6Tf40BGmdMsqOoEuYJcFEDoqQWfNpDpJ8GVTL
+zdsKv+KsRDkx0GWC2P3Q2eEcF/KcdvtGNjk85cHBlk2ywow7xQ9w1HA5i3OcyuVg
+6swqJwlbWhVAxFCAKhwJIC8RHk9W8+aTYP9/ZnyG9lgLoDji
 -----END CERTIFICATE-----
diff --git a/tests/data/ca2-la/jks.keystore b/tests/data/ca2-la/jks.keystore
index ea782d99..44b54cac 100644
--- a/tests/data/ca2-la/jks.keystore
+++ b/tests/data/ca2-la/jks.keystore
diff --git a/tests/data/ca2-ssl/certificate.pem b/tests/data/ca2-ssl/certificate.pem
index 822c82b6..bae81f6b 100644
--- a/tests/data/ca2-ssl/certificate.pem
+++ b/tests/data/ca2-ssl/certificate.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
 MIIEjDCCA3SgAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NDI0MVoXDTI5MDQwMzEwNDI0MVowYzELMAkGA1UEBhMCRlIxPzA9BgNVBAMMNkVu
+dGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+MzY0NVoXDTI5MDQwNDEwMzY0NVowYzELMAkGA1UEBhMCRlIxPzA9BgNVBAMMNkVu
 dHJvdXZlcnQgTGliZXJ0eSBBbGxpYW5jZSB3ZWIgc2VydmVyIHRlc3QgUm9vdCBD
 QSAjMjETMBEGA1UECgwKRW50cm91dmVydDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAM5ZcOH9JrSHPGk+3gQMPNkYNer3vtrO2LStedivhEpy1l7Vwp/X
-4LTh1UJNEQH5ZE83edw6RFiDa51xAv2nr8H0BP7GLdDuk9UGrVvPuIx8SZWdN8bx
-mk+Y8retFcIfXLMTCsOvn+qCGjGHtlL4oH0/jr06s6cyxmJ1lSq6FKpIK+1E85wN
-1otDHvNWLoT98DiFeqIEir2b8hz0aj6yn9OBc6No6/VATpz7qNGtZ98t+nyRgxr1
-i8kh+CYRfT6Xr5b+cYSgLQAUZ77qdoJZ9S+gdhZ/ptnSThbb3UfJcHec7X7io2mu
-x4jSmPWvzfPnPhI2USZGPQytXmjdQ7K96ycCAwEAAaOCAUkwggFFMB0GA1UdDgQW
-BBSEZ8mfyrhND4GxEZj6ytXz5OM19zAfBgNVHSMEGDAWgBSEZ8mfyrhND4GxEZj6
-ytXz5OM19zAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAqBgNVHSUEIzAh
+ADCCAQoCggEBAMP1ujy2vf4WVLY5rMoNqHbVLTpgOZALIaOI6SCBYK4vD3pKe88Q
+ZSDB23cSpFq8BvRZE3LYjUvEwYZbcwuKjSbADYjrY/FvjQf40+uaM/bwt896lNn2
+E9+XB3XFA4/9/7GxqyGU/TLma3pCB5ZraSFI20U9aD6pYWpPTFtmRsD1OZWtXLYs
+KHHA94LHoXdhSI2oQdM+cPCgW1+vNAnA/krtBiaQLeQZIfKI5WDjDhbq6y5jGdk7
++43ZZfXKeS0l3X8d9b/OqavVUs9r+xRRoHFqWM574kNpQOTwyi7Ql7cVflbqYxwL
+VQc6iQYXvs5ij4uNkjELOtuAtL2fzPJ9qzcCAwEAAaOCAUkwggFFMB0GA1UdDgQW
+BBQbt02pxy1yeex675FTANQAHs/P8DAfBgNVHSMEGDAWgBQbt02pxy1yeex675FT
+ANQAHs/P8DAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAqBgNVHSUEIzAh
 BggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMBEGCWCGSAGG+EIBAQQE
 AwIBBjAmBgNVHREEHzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwJgYD
 VR0SBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMFYGCWCGSAGG+EIB
 DQRJFkdFbnRyJ291dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3Qgd2ViIHNlcnZl
 ciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAjMjANBgkqhkiG9w0BAQUFAAOCAQEA
-JxMi/2U0L8Fvxr9ZLVEd5Mua6iyzPZiquuvBK5XiF70pDluMaoMIZh//9nuXDaR9
-svhVDc/TWecLwkHf7AxM/qt8/DXKnCIWHj6ITR4XUqgQchprsxwwNf6AMTGctu2j
-aGdidGY4NllGeheZhDGc0YMaA7h9T5Tx6Gp985ObALLVA+ZokUi1rwdZ1eihQYqZ
-x5hHQQXaYRYl0P9jUfkh10hj0/o4BzhB/zAySUO/YzE7isR0pvKmQLGCJu8zthUF
-WdjlCCywxzFDUMz8Yyp/43HRyBbTaEi+giNusIfBw5rBMfSX1YGw5sqk/amtTJnj
-/xwV6nOoWQOD5rspBKLKgA==
+e81S66yFf/XnaqlQHLOVKrl226aL1ERlQfsE0YJD9M8hKiyljMfplZI6XYOvufPL
+Ry5kFYOhPvasYOtk5OPHLehsQco0Y07toMZQpcDPRy+gwMgMEge+gwMYkMOWrPUG
+LdtFh44Ii9u3d6jp3CO6CHyheY4KZNvkNGlV4tx1HdHCeOZ4XNXyqHqaRwH+qhDK
+RtLoRaPgx7Hqp34myZbhALNRvyKF9vwzER0Ws9/61wCP7BRMhc5y+cOnzDx5Zjq2
+/cJPqerhH1UG5gxCjeifEt93sKBtHQKl6JFo7E0lxRsm69X9IhslGQgDpkwo8j+F
+Intprjv+DKiTMpKUOrf84w==
 -----END CERTIFICATE-----
diff --git a/tests/data/ca2-ssl/jks.keystore b/tests/data/ca2-ssl/jks.keystore
index a05ee323..cd729413 100644
--- a/tests/data/ca2-ssl/jks.keystore
+++ b/tests/data/ca2-ssl/jks.keystore
diff --git a/tests/data/ca3-la/certificate.pem b/tests/data/ca3-la/certificate.pem
index f00a7f21..7c4e8ae8 100644
--- a/tests/data/ca3-la/certificate.pem
+++ b/tests/data/ca3-la/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEcDCCA1igAwIBAgIBADANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDQyMzVaFw0yOTA0
-MDMxMDQyMzVaMFgxCzAJBgNVBAYTAkZSMTQwMgYDVQQDDCtFbnRyb3V2ZXJ0IExp
+QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDM2NDBaFw0yOTA0
+MDQxMDM2NDBaMFgxCzAJBgNVBAYTAkZSMTQwMgYDVQQDDCtFbnRyb3V2ZXJ0IExp
 YmVydHkgQWxsaWFuY2UgdGVzdCBSb290IENBICMzMRMwEQYDVQQKDApFbnRyb3V2
-ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzW7tYIQ9Uzy2tU/H
-AouOjSwMNLtncAC/Jwxl4wmaJFbWzcP4ccj9Rep4o1P9Z8tyyyh7vbDAT32MI+gW
-Aqw1H1oiiuREq2fxscBweJMF9mNO6sdJcyRKVJw3EOeUOLvbT2d9N3mr60dOVBob
-9j7sNDc3M56wkFVOBsDxD5oGC1MvFYtTtGk4RAZlzY179Rt1E9CYgFHkZTI+H68V
-ZnnRwl2cgpRMphRL6zGOVnTIpcEqFtJkwAHLzDKyqOhFZyCHeYR54yUVXto+efll
-uhJWsJ1Mi4cPrjO3CpqRYzq0tGt4b0fx8H74rrqBFqIxAEWlJucD2FJCkJWFuaJu
-mjWlawIDAQABo4IBQzCCAT8wHQYDVR0OBBYEFHbi6rcSWJs05ge5dXTuJH/6kKTz
-MB8GA1UdIwQYMBaAFHbi6rcSWJs05ge5dXTuJH/6kKTzMA8GA1UdEwEB/wQFMAMB
+ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAopQBWuBPGtW9V3VH
+k2VJt4GsBJIztKwHJHuaCSnbNPO3Ac/Ome1wkv4d9GhDzQaXVBViaduUwy723Vfl
+rDtm6N0jq48PJbYa5j9qHdLlGsTbJWlZQRERiZsEygo18YyZsucluXwcn0tGX3dq
+X/Kf33NHhLqF5Xg4X7+W+QoJLvdrjLSp0JrIgicKm/u26UXwwYtrcEh2lyUmABuJ
+bWYC+oPSNBAxP9jbcPhgW9ER501kbxUKwfP74SA4XUd37KhhM4nKsC6OnWhibOFM
+zYKMd14KBB738vvauf+QCNU5mxP7nY2KZPboI65VsrqcO1BUsjM8MLe3jt5QXFLt
+A/P8zQIDAQABo4IBQzCCAT8wHQYDVR0OBBYEFJNfpe35u5XiGi6Qq62fu+oqQZEL
+MB8GA1UdIwQYMBaAFJNfpe35u5XiGi6Qq62fu+oqQZELMA8GA1UdEwEB/wQFMAMB
 Af8wCwYDVR0PBAQDAgEGMCoGA1UdJQQjMCEGCCsGAQUFBwMBBgorBgEEAYI3CgMD
 BglghkgBhvhCBAEwEQYJYIZIAYb4QgEBBAQDAgEGMCYGA1UdEQQfMB2GG2h0dHA6
 Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28u
 ZW50cm91dmVydC5vcmcwUAYJYIZIAYb4QgENBEMWQUVudHInb3V2ZXJ0IExpYmVy
 dHkgQWxsaWFuY2UgdGVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICMz
-MA0GCSqGSIb3DQEBBQUAA4IBAQBPd3Q+tRMzjIzKXtcA9OZLTg0MNSeLC4pXHsZ0
-Hn7rBzZTg78ds+u3lWz4bONsU9kMk/YVgZubUk4OhIW8MY9sLodCPU894iyFYjf+
-ofAIh05gIjutb5HQ5RGvUa5k0SiDyEuTk9yn3A1L9rb6hxkt2JvvV0ulfx8vgG2i
-nFLzKYZ4fOY2zxeibzVZEAgbGw3VRprE/z7v/niNR5mMa7hcixB6UaH78Nre6L7m
-1D57W5BqYHC0m7dHqz4P3LOuDzD+omOYgfX6vU01XJmwMll7VTqVl8o++c6QhRao
-ZpgiJvvJZUpjRAgywM7YleL7JrrdH7u/EyZNIgpMl609FmFx
+MA0GCSqGSIb3DQEBBQUAA4IBAQAm/GYIn64PcMxXsSwoaheknCDTzIIyXH3dq+Co
+I17I4im0+bED1u0s2qWwIwul7YfBLwf70dRMK41pqCb8ZQhUtYAb3rFGDFyQm6FO
+MbnzhzeCfA3x8IyJs4e2SP572ErTBA6WLQKnVzSNBLmGapVWfmNyOp1IQnLKwKz/
+pf5oKkikOWbs8SqjpBqd7aiBV7qmjqCUmLl5hevNkiKJPnB1cwOt1mGxaDUHfmmb
+i0ybwU3Ycjy750bcJ2AM7LfXvKVI5RkK5WU4jIco8eCnqSAa+Iwptxz/YygO6LKO
+rlghhr4mh7Fi1f4X0xgxGY/waem27vltAXg1v33T8/dDyZnT
 -----END CERTIFICATE-----
diff --git a/tests/data/ca3-la/jks.keystore b/tests/data/ca3-la/jks.keystore
index 5a20073a..24164c26 100644
--- a/tests/data/ca3-la/jks.keystore
+++ b/tests/data/ca3-la/jks.keystore
diff --git a/tests/data/ca3-ssl/certificate.pem b/tests/data/ca3-ssl/certificate.pem
index 5b2c5fd2..307b3dd0 100644
--- a/tests/data/ca3-ssl/certificate.pem
+++ b/tests/data/ca3-ssl/certificate.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
 MIIEjDCCA3SgAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMzMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NDI0NVoXDTI5MDQwMzEwNDI0NVowYzELMAkGA1UEBhMCRlIxPzA9BgNVBAMMNkVu
+dGVzdCBSb290IENBICMzMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+MzY0OFoXDTI5MDQwNDEwMzY0OFowYzELMAkGA1UEBhMCRlIxPzA9BgNVBAMMNkVu
 dHJvdXZlcnQgTGliZXJ0eSBBbGxpYW5jZSB3ZWIgc2VydmVyIHRlc3QgUm9vdCBD
 QSAjMzETMBEGA1UECgwKRW50cm91dmVydDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMBd9mxrwlH6esCinuQ/qz8sssiVZDVbirlzknjaq371XvNe/FJM
-8vHPiCOKdiayuRfLruRUL3+txWOz2tbuUzpzHU2eEk0iq5OtAca/Ft9eKqw7g6Hq
-LML6Ouv7cdeVf9Cw0jl9KVHE+k0K5sQP1+X0/CqxLgH4OTMIDmFgHG+j9BaHZCrt
-snHVVj5bJGJhb6SpMTKxQsY3pnIFFf1yxiF6lGTn02pP/E/LjulshtWZG1kOCDI5
-UjDFdqCjJyvdN9xpgBhhhtF7ot9QByI1Xa2JA0GGI6//JIO4deIV9XFMKFM0ue3V
-2JWBLK1Qx7BJrEK9QqKlny8uRuPrMFX8+IUCAwEAAaOCAUkwggFFMB0GA1UdDgQW
-BBQhF1thvvRHEgl04E+MFccnkt67RDAfBgNVHSMEGDAWgBQhF1thvvRHEgl04E+M
-Fccnkt67RDAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAqBgNVHSUEIzAh
+ADCCAQoCggEBANS/16ipkL/MCzXDkwsNVPKvX7HUoyFA3Z49Wo4LRxOkNzg+MVIZ
+bOrORscPtwrwGApAsEURyExiJYDM0n7ucLt+QUxPt/XQUNgzHE9nxxxJlq/+KBNI
+ow6cQo9CxX0xkC5aHA5oD4CTVvL8m55yuCiSa5v3KWpHmNZj+uXI8toDva1yxaD5
+UrQFjlJECMAy2gLh3nkWZvX/Ug9Gg+uSkipKDrFdmkDB73Q8D7MFHYswZCXxpiRV
+WPjFUDCdgnCoyiIktyQu6F0QYqevJbIJkEiCP6QcacSb9UsmslTAT9zZs8iNTu5N
+HLgU9uj4cp/tNsGEnQE+eW/AyzRxVxEmtEMCAwEAAaOCAUkwggFFMB0GA1UdDgQW
+BBRLnMUF75CqPJazPMtlO9VjwcaY4jAfBgNVHSMEGDAWgBRLnMUF75CqPJazPMtl
+O9VjwcaY4jAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAqBgNVHSUEIzAh
 BggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMBEGCWCGSAGG+EIBAQQE
 AwIBBjAmBgNVHREEHzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwJgYD
 VR0SBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMFYGCWCGSAGG+EIB
 DQRJFkdFbnRyJ291dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3Qgd2ViIHNlcnZl
 ciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAjMzANBgkqhkiG9w0BAQUFAAOCAQEA
-McUv9ZtVnEB9PFomkVN909l+4T3fBtO50swOVsKqtaZVEENJE0sjalzXo5Fyye8h
-6rcB/RVRHbWM1VTlwABt4s9BQqQmWa84do1gvtWTFONhBA3WWQqcp2hzgCGWV1pU
-4EgfrY4gpW8P2GRoatcQI4gO/8uTWWM6VQQGKXP3U3SYXiufW2aioMXn1PAKVovF
-l9FkuTnBtsbX+6gZjYHi17C5r/Z9bMcp9LDPkUi2utPMuTCJxVY9Ijj0cMJlGoS8
-XMtGmPd7RWHMMV5qTDxIwS+n529tirh1fNx8WaVVke7NL6cL66tkUlOP/5uDetBr
-C0c12fl05d+pz+/1chDasA==
+MRWSeoJ9KyyjeGnAjUZFkUYQxyAA8aV1zL2cr49t2Tae0p/QViOk2pX5ZAXlIzbq
+EzRfRBnHcuMgXYWs2hRu6xQnjtAy2+lEdkLZW2t/rtWoVgvmCYTD8OdwI7PGA0we
+ZD98UIdYvZRxnGnmZ6IC7UYpd8g8+amtdAWg5Y5zGThzI+6aH8zjGBn78zQOD7dn
+tE8/9SUdOIp82DQF6mKC0cWxf5UirPimlm23cKuncNR7GJTn/QZb7NOfYH9pNa4T
+bhZ7PiOCCwO12JbhGWcWYlBeqFrgay7v/ooUei1DxiOvUStrR31H0dXxoZvz2j/7
+iY8wLtfwwI/B9vDrzsuCAA==
 -----END CERTIFICATE-----
diff --git a/tests/data/ca3-ssl/jks.keystore b/tests/data/ca3-ssl/jks.keystore
index 633d7742..fab6f4bf 100644
--- a/tests/data/ca3-ssl/jks.keystore
+++ b/tests/data/ca3-ssl/jks.keystore
diff --git a/tests/data/ca4-la/certificate.pem b/tests/data/ca4-la/certificate.pem
index 53c6b5b3..57e503b2 100644
--- a/tests/data/ca4-la/certificate.pem
+++ b/tests/data/ca4-la/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEcDCCA1igAwIBAgIBADANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDQyMzdaFw0yOTA0
-MDMxMDQyMzdaMFgxCzAJBgNVBAYTAkZSMTQwMgYDVQQDDCtFbnRyb3V2ZXJ0IExp
+QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDM2NDJaFw0yOTA0
+MDQxMDM2NDJaMFgxCzAJBgNVBAYTAkZSMTQwMgYDVQQDDCtFbnRyb3V2ZXJ0IExp
 YmVydHkgQWxsaWFuY2UgdGVzdCBSb290IENBICM0MRMwEQYDVQQKDApFbnRyb3V2
-ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqPyQGG4lJf7GWK4
-PlQExWUu2J/gAvjpuEt1oXNB3qQM3YwYoOJg2NYiwU8uFWGOb9bI+HTPmAXLKIrU
-NM2U6tln0e0XqWKIrFonOxDtPBypCZZtKX0FzeipayIwiSIyKDayZ5TS3LfUsOy3
-6zhwixVde0iow/GbX+z8ZEP9g71a5VjwxbYCYDWhLIAIX4z6wGVqogJXuNK7lMPk
-CAsM2EvBbghAnxDuQ5FgDEkk+1lTHOdDFOvds9ddYEhgaAHs50gQnESvqiGvHnSo
-3K2MB3p+x7LEtuuWO5c4sAULj9kOFuvdbLycgg1v1AvQXJ9GPHD3zv4mebU24J8P
-hQ19vQIDAQABo4IBQzCCAT8wHQYDVR0OBBYEFPzHFsRLPTmffN3UkQ/VHEYdCKAl
-MB8GA1UdIwQYMBaAFPzHFsRLPTmffN3UkQ/VHEYdCKAlMA8GA1UdEwEB/wQFMAMB
+ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1F1LyhwSsqjkeFS3
+90dr0HvsHAsP20qXl8nk6ojEclB5RAa7qWthuglfJACeeQfFgp7S8cqUf5I3nbN6
+uIzNF1hMmQvY3ScKMBlpdRN0tI0DZXNRFF3t3MCwb6B7RyKZ4B7Cbx+49SSXNbJa
+4NtbdNmRBlRtnykZZLsbdzwbYrxNhuUeG5YQF4uPvMvMPvpFXrp9deN9fcPGmEpt
+ZDNBO22w8Ll/lHe4WBmcFVY8c2NnCCHaphHdbCML9tB0HoVTvGCEL2XRxG5DEgH0
+i0A5b/x8s7LNFFJ6iO0+IGJNLD74hluM4CTgtc175Aq6nmpiGera8SaNKAiTDxYK
+WrHgeQIDAQABo4IBQzCCAT8wHQYDVR0OBBYEFFOChTRLADjBJRWdXNGH2Kt/9T7o
+MB8GA1UdIwQYMBaAFFOChTRLADjBJRWdXNGH2Kt/9T7oMA8GA1UdEwEB/wQFMAMB
 Af8wCwYDVR0PBAQDAgEGMCoGA1UdJQQjMCEGCCsGAQUFBwMBBgorBgEEAYI3CgMD
 BglghkgBhvhCBAEwEQYJYIZIAYb4QgEBBAQDAgEGMCYGA1UdEQQfMB2GG2h0dHA6
 Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28u
 ZW50cm91dmVydC5vcmcwUAYJYIZIAYb4QgENBEMWQUVudHInb3V2ZXJ0IExpYmVy
 dHkgQWxsaWFuY2UgdGVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICM0
-MA0GCSqGSIb3DQEBBQUAA4IBAQBV/FDSCwvl6/2PsnxBwPukjrVjlhjz8qInu+AY
-2pz66J5//q4jgedmTuTk/stEGwy5FJic+sov5rEPtfIqgkQ1ufqTb6H5uMUE/FTx
-YAgT94VSA6lQZ6vzEncPzMxBq9Y7zj7lneWJRf6VCfociwyg8bDw8wYybcAGopSE
-HDFMUYNiwYTywwZkp/cmescjLTNCo64APYBfXqsBXerVUrbFLqH1+ZvJvl6lnYso
-9SicdGQyjw7R3y+oPYB1LoAiY6/Qpzp5ni1wp3KwPtV9LIefGhs+vawV61UsjWcr
-dpQxiRcgzN0hompSzz00uTN9PJOYvMK53ZuDA7pYyR8SWCpW
+MA0GCSqGSIb3DQEBBQUAA4IBAQA68OVSRzkFNiIXRqpfawAFKNUN4Yp1Raiwr6gB
+4rbDTgrrslJ6zMqJDRvvdrB7kVsc8hxR6ZeC2xlIrAe4xoswpV5FjjWbtMaeUEwC
+Q80rEdIzNW6zN1IeZfB+nHhIKiqdypbAu0jeqzN5v5aBOoOquX2YMZmE3ng3N5JN
+6NtwGr51OSDNgowChkRyVrVfOeIPqGNFBdC4TQmrae/U3NyWSDoUo6d65fUgsQXW
+Qq8sR7HAPhf0l1jrvOKdTPaogziFDbIinEjx2UkXQPhKaAHold14N2qKAEnPvEyV
+LOptXSN1O518NF1uo7FBKZQEOxw6Ltvgz6eTl4KPFvqsHVTi
 -----END CERTIFICATE-----
diff --git a/tests/data/ca4-la/jks.keystore b/tests/data/ca4-la/jks.keystore
index f5c227e9..a69859ee 100644
--- a/tests/data/ca4-la/jks.keystore
+++ b/tests/data/ca4-la/jks.keystore
diff --git a/tests/data/ca4-ssl/certificate.pem b/tests/data/ca4-ssl/certificate.pem
index bb67e5f3..cdfdd406 100644
--- a/tests/data/ca4-ssl/certificate.pem
+++ b/tests/data/ca4-ssl/certificate.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
 MIIEjDCCA3SgAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICM0MRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NDI0NloXDTI5MDQwMzEwNDI0NlowYzELMAkGA1UEBhMCRlIxPzA9BgNVBAMMNkVu
+dGVzdCBSb290IENBICM0MRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+MzY0OVoXDTI5MDQwNDEwMzY0OVowYzELMAkGA1UEBhMCRlIxPzA9BgNVBAMMNkVu
 dHJvdXZlcnQgTGliZXJ0eSBBbGxpYW5jZSB3ZWIgc2VydmVyIHRlc3QgUm9vdCBD
 QSAjNDETMBEGA1UECgwKRW50cm91dmVydDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANqFq4kReLZsw6x5RfdIHJbDHt83Rr0UfSDM26dR285YI5GEUrlj
-Rr0/bfQ76CA3HJXdtiOOyyVSuFOVakusWi/6xCGL4y7wAtkpIw4JTDSk8OAn4U8e
-K1VG4ZxZVpUGaRK1f7pz0t1oXKQSwTCkWJY5qft02HzmaaxznWXjoROQ8mdL5pKu
-ePuRIyuw1Ojo6jsu8R767Y9Cjjr2O+NvZ3DV/hjBZ7ZXoPU0pUzjd+Er5wvrrwDr
-xzcZBKwJyZHeai+oRS9y4Rf4QeUOBv06EuyFqhLK1AyYSiTBwPieM0fBGqOKG0Rl
-ybHrn3Ustua5wWNV4dpVeBHJJ5m8WAtciAsCAwEAAaOCAUkwggFFMB0GA1UdDgQW
-BBSdSElpvq5OLfwdV1djHxE28aQvDDAfBgNVHSMEGDAWgBSdSElpvq5OLfwdV1dj
-HxE28aQvDDAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAqBgNVHSUEIzAh
+ADCCAQoCggEBANI81buGeEYKhwD/lO8MfO+J/h0FUAVvX9N+5z6uvG3Me8UE219A
+VNJ68YHGWzSoPGD4+3ONA8N+ahYhieTL8y+hmnVsSbIfeNI24mVjClK82gNYw4qs
++EqT3m+JK71kwhHqoP9r0tekzYPyouV4qlYNhT0I+eBtnbG5i6npXlmXucgfNA7j
+3z352sEiMno82/R50t/b80Te487pxl4iLwZVDE+VyXwF6UUoY/Diippyn8SRnNiR
+QbpgoAXCA+r6MI1G5mC+snEv8o+/QJQToQBkqaAXSaqESPs+O4xCXc3QvzhVsp+o
+5SwM6WxCXLL/SS/urDYVx0cAIBV9R05OGTUCAwEAAaOCAUkwggFFMB0GA1UdDgQW
+BBST1Dwt1MJV5+Ue3Cqjejq67zqFHjAfBgNVHSMEGDAWgBST1Dwt1MJV5+Ue3Cqj
+ejq67zqFHjAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAqBgNVHSUEIzAh
 BggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMBEGCWCGSAGG+EIBAQQE
 AwIBBjAmBgNVHREEHzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwJgYD
 VR0SBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMFYGCWCGSAGG+EIB
 DQRJFkdFbnRyJ291dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3Qgd2ViIHNlcnZl
 ciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAjNDANBgkqhkiG9w0BAQUFAAOCAQEA
-PTn/ZzjpK/GSvxEjPAnrSD8AYgobI8zVlo8VjadxIE8LzQQDvOuQ2stlJTkQFAJ9
-z4b/V+d7R+jrfdnb3kEI5m/78Tg4gipgE4odz/wCstuAj5HWL8pbELjIiUY4Wbg3
-VyyQzbxYu+NcQhn9ztJ0V/dA4dYpngUuhRVbrLxxrfHTf34msHXWvr9hkC5WagTA
-K0tRSesIMQgBXMRLuTAai58zf3UIsehwWWSnLql30gwrW/DhW9uX0yVAZv/geMy9
-/KpmBfH4hsSmC8DZ5Srp+G9ovB1Clyz04afGwUMyVvI9xkvI5qpYYMZi8BwOnmYu
-YMT+4bay3PpVNzZYSzDWqw==
+yur5gt6C15zrfnjTmsSUGgO0PMrqChkiHjHRAoUNA+vX/Rbphhnxe8I449UHV7Ch
+f5Nlm/CNxpldxuaE7jcjhMIGSrlx3mmKrY3khDTrlxzj/uL+LJubc3IWKUm+ehVl
+zxwqDPSN3GMj9uoyQv7lPovak/OQsv0RLqXz2L2WlyL7bEBgo9HoIE6CjMLZuLlW
+OQKWgLGbmkOLnccBIFGKF0TAE4NMIKQTJ83tqMhe67Us7Bsyypwh+O/y5UmWwVxC
+40Ajxm3ybzB17nmi5Td6CR4MN5j2lbiiFZG17KgMloHGfv5/34lR8t9uwNUQkmPT
+dNJ+hnCp++ZKhusm8J7Jjg==
 -----END CERTIFICATE-----
diff --git a/tests/data/ca4-ssl/jks.keystore b/tests/data/ca4-ssl/jks.keystore
index e3afcd32..ab8d3293 100644
--- a/tests/data/ca4-ssl/jks.keystore
+++ b/tests/data/ca4-ssl/jks.keystore
diff --git a/tests/data/idp1-la/certificate.pem b/tests/data/idp1-la/certificate.pem
index b3cd80c3..cf6828b8 100644
--- a/tests/data/idp1-la/certificate.pem
+++ b/tests/data/idp1-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIEKzCCAxOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjZaFw0yNDA4
-MTMxMDUwMjZaMDExDTALBgNVBAMTBGlkcDExEzARBgNVBAoTCkVudHJvdXZlcnQx
-CzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Hyh
-FocG3oGSgWrZE09fCVV1lCk3j45ZnQ5Ua5IFkJSaT8BNdsul1bVqhV1otJoajgXW
-bYPq1GNW09bUsuyvABeuR5wEtZU89Bgkos8SPFNQpUXXxshBmOZ3gdyqCBi59b8X
-tSMm9sTwXz/BdvDd3isqAlMk4kyieL+pVS3vuN61RNcAXvg7b/Wz66XUDVhAGWB/
-USj7XzgFc9Dm5d3PPa+GoKqJqoDTwT/f4cQ3y+zZz4g/Q4Rla9S9WTOlkUagUwJJ
-/UahkLetoUClHHlBzSjVjM9Fm2aP2zexdS1AoS1ypF4BPwg+KJpRzhfZeHCBI+Rv
-HfDTVIKMU1B/2xLAGwIDAQABo4IBJTCCASEwHQYDVR0OBBYEFB7GI5rkHblSQ7C/
-xWOmsq57hw1yMB8GA1UdIwQYMBaAFLUSaFQTIbZaJnt0/079m5weciGiMAwGA1Ud
+QSAjMTETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjJaFw0yNDA4
+MTQxMDQ0MjJaMDExDTALBgNVBAMTBGlkcDExEzARBgNVBAoTCkVudHJvdXZlcnQx
+CzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyGho
+tVOjmA+Plan0bIUulvlkHXMv2oYpmnk5y3XSnUnMBk+SPkApGBwvs5dayOI6kcoA
+VbVYSOLX/LbP/0BciJGryalFVgsoyn1PpOCOsj74EY8y5uAVeDfyOwHBigXKfHZM
+7+jDkBnh8+oAAQ9u2090WXhH1WnHC2nag9KLh/lvHMTmOdSmNHt/bD62TrKazvWn
+qEZKY+Vjub/Fwau63MJXFSyWkE6PQjJzHUEfqDCLDd78BraMyaD8bflqSafKj0k1
+nBj0sW3xPU8o69P08eQ4dKVwwE70P2+KdZkW1tyGKUdbM7cMEZg0A0PjoHOskjbI
+mp9xdwDYg/bYaW6r3QIDAQABo4IBJTCCASEwHQYDVR0OBBYEFLrTPiJMpMuXRB6o
+wQs4xN9C5798MB8GA1UdIwQYMBaAFD1RAUjcM/fCNO/Y/iQY0r8S2FqIMAwGA1Ud
 EwEB/wQCMAAwCwYDVR0PBAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
 BQcDCDARBglghkgBhvhCAQEEBAMCB4AwJgYDVR0RBB8wHYYbaHR0cDovL2xhc3Nv
 LmVudHJvdXZlcnQub3JnMCYGA1UdEgQfMB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2
 ZXJ0Lm9yZzBCBglghkgBhvhCAQ0ENRYzRW50cm91dmVydCBMaWJlcnR5IEFsbGlh
-bmNlIElEUCAjMSB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQBu
-VS/Vgnhk4OL262AEk/LP/e83oa7Bg7bGW9NtbdHOZHHOVUWc7wqXSZ8uyn6lg7mI
-oRuCzkqAe9NA9v90+T2oZz2LudCQKY2jGrFhXTkT38jpg4ruuwVJOyoo9nk1ldqX
-JZMgrsrr6B/uIPjRyQ42JQ9j4+opHVaGPI0Twn/JIw8hEuaiA1HVC7neSMOE2asM
-n177IEfZrGBb2Et/qioZUPRD+XUc+IQRblN7C7yj3SAzT13PSnm5f8WhhJtoLMrV
-pP8aF8tg85AMgvH0sCzmsBTJUCZz/dOpRPBAeGA3kw/S+USuKIybGzNExwA/8CJf
-+9B07t5dEMVZnlR/Ytev
+bmNlIElEUCAjMSB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQBc
+1zMdajPZliKbXCRXGZ1RTBVr8+jotKHqXIqD6BGjRr6q8JShMWrkhfF6QCqmB/wb
+hqv3PWb4G6nmNSRJsVtFujmNrrdyR3O9OW50InEpxHwV+A+QWMX29QVYnAt+wCaA
+MUfEgVfBK7aDtPhXUdu2XJ/BHoxl4k33fixV/ZIiAcl6Ly1fSQluJPoy2YDzOImK
+a7nIqHR8g1NZBvjY7LvR3J0mC2eYkWJUfQf7lnRMoFgnQ3yAmeMNBokjlhXGrXDU
+u1QMUoT65DdFA4orewkueE3OUDjqx3H86zdMdkAtqCH5A+qa7/JNX97TG05v0r2e
+o2YzCC/vmQC3Fi9FqcTz
 -----END CERTIFICATE-----
diff --git a/tests/data/idp1-la/jks.keystore b/tests/data/idp1-la/jks.keystore
index f256492f..88099c95 100644
--- a/tests/data/idp1-la/jks.keystore
+++ b/tests/data/idp1-la/jks.keystore
diff --git a/tests/data/idp1-la/private-key-raw.pem b/tests/data/idp1-la/private-key-raw.pem
index 57ecc495..0904a342 100644
--- a/tests/data/idp1-la/private-key-raw.pem
+++ b/tests/data/idp1-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDUfKEWhwbegZKBatkTT18JVXWU
-KTePjlmdDlRrkgWQlJpPwE12y6XVtWqFXWi0mhqOBdZtg+rUY1bT1tSy7K8AF65HnAS1lTz0GCSi
-zxI8U1ClRdfGyEGY5neB3KoIGLn1vxe1Iyb2xPBfP8F28N3eKyoCUyTiTKJ4v6lVLe+43rVE1wBe
-+Dtv9bPrpdQNWEAZYH9RKPtfOAVz0Obl3c89r4agqomqgNPBP9/hxDfL7NnPiD9DhGVr1L1ZM6WR
-RqBTAkn9RqGQt62hQKUceUHNKNWMz0WbZo/bN7F1LUChLXKkXgE/CD4omlHOF9l4cIEj5G8d8NNU
-goxTUH/bEsAbAgMBAAECggEASVHv6+wPzLt9KDcMTIN40amxdrx6NYjzFySYsL2kOe1tCdPbZwCC
-aqm85eQDez4pp5QQF54La9oTXemlX1AYWrnRI1iMr3OdosSp75vwOOyuyTi+ahMzv2TXG/JeoYiW
-sluL/K7yhPgT0WoYgcg/ZqgSSNcTxRqYfX31GjVNoMZnYEG190l9ShdRMlF5M8jBKIc6IT5VwnR0
-JcHSK1tR+ExCVRmafY+BTWl3OHgj8gaLogjpfQoypxb5T++khM8Q2XrCIXR/v0feE46VIsSlvw8/
-jIEsFhScoHQM3T3jMAoveWR7gUyOSDjvLme1jNfvjxd6c6Dm8kSZNhPuKtrJcQKBgQDsuqpUBrjk
-kwLbaPwi8ZA3+SBY4fflGPZNMt1ghgialff57bjRn/wfTJAO9lvgfdD2O0dSHf7e5YIDmh4zdEZv
-RLXS8V3OUrvDP6/9aUu+ws/gDMZVG1uKRrAgYIYpGQ4dRcSoi4WoiTe4jkDqrf0h6vnfm3xG0YHY
-uBychE/I9wKBgQDlyMOeAHPQcvuMQpq1gl4VppMH4vL4yYDV6SxPGD+OrfDNGMiP/7f/0RkWvqGY
-U+ZBtpIqxoYvgFmmLKeWVWGS4XlpWK1stElsJG1lO9chmPk6A52GTOmBXkZBcC5duBr973Sisach
-q4eOI+QFCl8gYeJqQLx46gYSx9wygUr8/QKBgGh4cFaoqMvmvOoLSMo7BMRO4yGWh4nJHFkxS1Uf
-kYh3Cnp3mIqaKe++IA0aV62YmLExs+Xfauz/KANi7lUSyUqtbfhroFQ/WrFt18LjxxOmcYqU2KoS
-arF5RJzlPA/DCOGOOp2PBSs9cyO1U5y9r+paAm/V9GBkcQMtLSM9mOA9AoGAdqGm9KzRHh4u5mQA
-kZMj1dOw9xJhVLZbkJSYbqFbNuNwfcK80TM5oJYoeMikjwtJxkVmwzTJVD7UielmAERGYtmLoCrL
-JmMRwQYxgGFbmRnsGdqB+jM9HrA4X1J2baY+MTnuIozLd6OiEW1QLJYFNKe0iByx8U8JIasTcPO1
-blUCgYEAqHtPQVyatKQ2p37+kbPJ7HnDXEg9ngtpYzNa+fCitnWD7hY+drOQXDrHPvL7Nj4Ldncn
-vAvrsYcfgoThtRYi/34rpNwqD4H8K5767pHGAkjdSBBG7j8zbKJQ8DvnrNlzHvJzNz3fJXsMe/TO
-ky4O8zJcr7xGTCAg6g/mvdvq0aM=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDIaGi1U6OYD4+VqfRshS6W+WQd
+cy/ahimaeTnLddKdScwGT5I+QCkYHC+zl1rI4jqRygBVtVhI4tf8ts//QFyIkavJqUVWCyjKfU+k
+4I6yPvgRjzLm4BV4N/I7AcGKBcp8dkzv6MOQGeHz6gABD27bT3RZeEfVaccLadqD0ouH+W8cxOY5
+1KY0e39sPrZOsprO9aeoRkpj5WO5v8XBq7rcwlcVLJaQTo9CMnMdQR+oMIsN3vwGtozJoPxt+WpJ
+p8qPSTWcGPSxbfE9Tyjr0/Tx5Dh0pXDATvQ/b4p1mRbW3IYpR1sztwwRmDQDQ+Ogc6ySNsian3F3
+ANiD9thpbqvdAgMBAAECggEALsb4EcLo/3g6WoOl8qKPglvJu3oEZGxGT7EWBWCF/YKZJavzBaay
+MNd7Zt7gKN1tMFRHCbpfVfvk0C7Xk8uxDYt63oItFe1a4xCmw2RKyl4aRvb2uZ76Q+pDFvTM+Otr
+HOv7/0+EPiFcdTNcNuMkS/pavPtvQOgEtqxJfdVqDh2HnYfIBx7ex7oI5tE1Tag3bx8dpfYThENr
+XfC04cBkprUreqhFX8TGX2kaWViCo4psfWue+zTYuBhxsu4HfxtgboKM0EqWvh89955KxQ9K1BXu
+jUXPO0Ai6lpNlWrXsJ0KP6Mf9crzGN8OLuCU3dC/rzDzpddNoO6ATVy0NP8dYQKBgQDwcDw8aWBN
+nxoUttizKBXQq5QpSU0+Bot3E8O97/ETnCZjyGtNuB0vUqqZY9mFmFu/y8medR86FRSA9nbNA57L
+4oCb7sCgdOq9zC2QM3BfTeaTXQkFS8QuwfuBzIFdANVufnsZZ74e65a/Ae1zAZQqr1uFE8igwDs7
+JyVggv7pZQKBgQDVYOrF6hyFUuClFXUScvvT8H8NUpwtE5VGJI1pw2pzdHVJ6G5YBdPbAQcgY9Kb
+jOjtEOnL+XQL2VSKIy9/6uWS6w5Utq01v95BmjIB5VJ/6W36dKL0bsdq3DR1HChTV2VqOlSSpXuQ
+YzzVQEh4YQ8tiozlIFYQDZv5LLzS/tTNGQKBgQDU88MWCorGFP1njU6+1ukDaYQPUSH9ppRNgg7j
+IinWIX4K8I7BRilrKX953erhnUDdzaOkGb3vlo4Tbrdn+yXhFJquATdQplzmf3l3d2e2sWtf542+
+yA1ZEGwu2S9WbQ+cDp/+r1i/UA+y2wUw0Bwn9ipL4mrWnYuYZ6J+KWeW1QKBgFZyMEtEYI+nFvnq
+qoZx7RJdMav9FuawM166ekwp7lueB9KMhv/ERKNKVE/MAUwhl1BL9Nw9UMVoI/be8GR7jsypzCGH
+7L6E4A9l3/KirHzD3lmEnWw34TSqx9nWMYQqOR0DSrYqste5TLD8nR+f+t0xb4l4Q0W3rcQSWuGE
+ekQpAoGBAOKuwo0CGKgErHnlI2m1FhP7uCVCYKU1WZL1Jxvzktym9EzuiQfNKP8i7ahftIOAwZsL
+tB/ZoENp38zgLUHfoJ7DUFrv7N6npWy7DQenHr7EqxuV+S4b5Qex2S7hg1EGaIr7TP1VuYJM/Sfs
+YkOXUr/24CxZ3GyaVYN+Kr/HZg/i
 -----END PRIVATE KEY-----
diff --git a/tests/data/idp1-la/public-key.pem b/tests/data/idp1-la/public-key.pem
index 3282c396..4c440c9c 100644
--- a/tests/data/idp1-la/public-key.pem
+++ b/tests/data/idp1-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1HyhFocG3oGSgWrZE09f
-CVV1lCk3j45ZnQ5Ua5IFkJSaT8BNdsul1bVqhV1otJoajgXWbYPq1GNW09bUsuyv
-ABeuR5wEtZU89Bgkos8SPFNQpUXXxshBmOZ3gdyqCBi59b8XtSMm9sTwXz/BdvDd
-3isqAlMk4kyieL+pVS3vuN61RNcAXvg7b/Wz66XUDVhAGWB/USj7XzgFc9Dm5d3P
-Pa+GoKqJqoDTwT/f4cQ3y+zZz4g/Q4Rla9S9WTOlkUagUwJJ/UahkLetoUClHHlB
-zSjVjM9Fm2aP2zexdS1AoS1ypF4BPwg+KJpRzhfZeHCBI+RvHfDTVIKMU1B/2xLA
-GwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyGhotVOjmA+Plan0bIUu
+lvlkHXMv2oYpmnk5y3XSnUnMBk+SPkApGBwvs5dayOI6kcoAVbVYSOLX/LbP/0Bc
+iJGryalFVgsoyn1PpOCOsj74EY8y5uAVeDfyOwHBigXKfHZM7+jDkBnh8+oAAQ9u
+2090WXhH1WnHC2nag9KLh/lvHMTmOdSmNHt/bD62TrKazvWnqEZKY+Vjub/Fwau6
+3MJXFSyWkE6PQjJzHUEfqDCLDd78BraMyaD8bflqSafKj0k1nBj0sW3xPU8o69P0
+8eQ4dKVwwE70P2+KdZkW1tyGKUdbM7cMEZg0A0PjoHOskjbImp9xdwDYg/bYaW6r
+3QIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/idp1-ssl/all.p12 b/tests/data/idp1-ssl/all.p12
index 85672d3c..31af7a38 100644
--- a/tests/data/idp1-ssl/all.p12
+++ b/tests/data/idp1-ssl/all.p12
diff --git a/tests/data/idp1-ssl/certificate.pem b/tests/data/idp1-ssl/certificate.pem
index 6c120109..0c21a2f9 100644
--- a/tests/data/idp1-ssl/certificate.pem
+++ b/tests/data/idp1-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEUjCCAzqgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMxMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAyOFoXDTI0MDgxMzEwNTAyOFowMTENMAsGA1UEAxMEaWRwMTETMBEGA1UEChMK
+dGVzdCBSb290IENBICMxMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyNVoXDTI0MDgxNDEwNDQyNVowMTENMAsGA1UEAxMEaWRwMTETMBEGA1UEChMK
 RW50cm91dmVydDELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDCptJCaO98CPIdXPQq11lhNRO7LPE+0ct7lfVXc+e1cw/sSkNz+uBQ
-Gk0k6mObZodcT5NIOySALt4gNVmBgSTd1B7wqcKUk7KRpWG89qDGx2ZFe6siP3hG
-JN5zdDUIvSw94aHlReEM61tA8VnilBMC9CpaqX7ofF0tZbY7g+EFjWLACjnkuCYB
-RE4DfzXdaBU2YNBXTAx3WmUsAHGQ8yIqrYqKluUDL7OInjiUQcOMkGgcVwysbigG
-fS+g4DRgP1C3kzDuTrlfMNrZmF81++xjC47f/62Hb2P/3punHpuvx6OPb8AgzrS0
-s2K+Tp4e4vRVDPK1WFcAk1/cJ0iCzkbrAgMBAAGjggFBMIIBPTAdBgNVHQ4EFgQU
-1KvUkmzSGsfVUjLmNn384l88eeEwHwYDVR0jBBgwFoAU4r+gd8U0nxwY4xdNsRSW
-F+6mQp0wDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBSAwKgYDVR0lBCMwIQYIKwYB
+ggEKAoIBAQCx/z+h5GJMFzGmFs8Hh+fMGL9puDq9C6+e0hFIAbHYc6yVSRSp15kd
+IulwaV9nRn3QlNyXvN8RWob+kXdodVeYDsfCzba7ajIQH0fLjraXxDbda81Sn3hj
+RGhmnTfGK/dVeVOXz1YZ4m8VInsFVo+q+awduSvMl4nSMJ+ZC82FlgbzuIeFhZHj
+l6LRtFm9MINYBh/NwvmX/8aNJT5lvqKfbPj321eQYj6umFnO500LopbmT9dnsicF
+Q25NM0kqN8n6W+ohcQlVAqeyKDk1JT0AfX3hhUOGFmHq7pE+ONNpXvVT52ebTtMi
+vub5tHlMniBr85UNJ8vKzfJebYBTvbFhAgMBAAGjggFBMIIBPTAdBgNVHQ4EFgQU
+oOZnrX3E9rY4nDZ9KN6QETM21qcwHwYDVR0jBBgwFoAUKYGua3bKNclaOzXyDiIG
+Qj9g4TswDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBaAwKgYDVR0lBCMwIQYIKwYB
 BQUHAwEGCisGAQQBgjcKAwMGCWCGSAGG+EIEATARBglghkgBhvhCAQEEBAMCBsAw
 JgYDVR0RBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMCYGA1UdEgQf
 MB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzBRBglghkgBhvhCAQ0ERBZC
 RW50cm91dmVydCBTU0wgTGliZXJ0eSBBbGxpYW5jZSBJRFAgIzEgd2ViIHNlcnZl
-ciB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQBOX0BZnY1ObUCh
-KjkKhntOUce5mDRfoy+0f2i4YTgdRr8+g25RvqazQUdj8HOTMXPXj0oPu7z9ueO1
-OHEtuFj6U8qnBCTuHYc9+cBEaaMNiLNaZVFJ5qkWWDgahqqC5HqNQrBvsnrb6fmA
-4y9SMLtbqSILoSk2nyewYFtPOKdlaRAbLxzTZLIjME4/v09hmETAIfaLrwlRCbyA
-zVgceVVPOqOfO7j52yUD1sMjN4dQwZhxP5jMNn95pqowtrQ8Kl/EQ3Of5aOD9RKN
-38rKJ1XfVo+RcwIplLHEP309Xeo9uEAb62AzyF0TZIUKDemf+JiATn5tL0KcMejJ
-T9ncqWiY
+ciB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQBNNp87RWu72sDw
+vhK68zpq/aSMMNUHdZ8YQyjDcYSJlBx94E868MDqbfUVJ+2fUmlycQosxAz+jBxn
+Y3XmuSxexp2rc6rWwIIH/P0bjrBrkqjIPGYlvT36Sd+DkYVEBe0tSuvN2O7RiF5G
+G9C4CC/SFfw7g8F1lcrfftA8SB66QbD/XcZBsS1ari/p4ckxydA+pFt56V0wSkhP
+td2ThX2D5mybDU183CdgB2jKjCNqd+tgoSrBBjjmWrj8+VZBrU/k6ZH0wO5GGsmb
+ntJyW7rW+AmLZNHZtOgnuQXuBM0tVsRlOdRbtTDqJy4rHrJEm6NavfvCj7i1ayhR
+JYql2tXK
 -----END CERTIFICATE-----
diff --git a/tests/data/idp1-ssl/jks.keystore b/tests/data/idp1-ssl/jks.keystore
index 7876c949..6caecc0e 100644
--- a/tests/data/idp1-ssl/jks.keystore
+++ b/tests/data/idp1-ssl/jks.keystore
diff --git a/tests/data/idp1-ssl/private-key-raw.pem b/tests/data/idp1-ssl/private-key-raw.pem
index 79e6c1a9..147e2455 100644
--- a/tests/data/idp1-ssl/private-key-raw.pem
+++ b/tests/data/idp1-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCptJCaO98CPIdXPQq11lhNRO7
-LPE+0ct7lfVXc+e1cw/sSkNz+uBQGk0k6mObZodcT5NIOySALt4gNVmBgSTd1B7wqcKUk7KRpWG8
-9qDGx2ZFe6siP3hGJN5zdDUIvSw94aHlReEM61tA8VnilBMC9CpaqX7ofF0tZbY7g+EFjWLACjnk
-uCYBRE4DfzXdaBU2YNBXTAx3WmUsAHGQ8yIqrYqKluUDL7OInjiUQcOMkGgcVwysbigGfS+g4DRg
-P1C3kzDuTrlfMNrZmF81++xjC47f/62Hb2P/3punHpuvx6OPb8AgzrS0s2K+Tp4e4vRVDPK1WFcA
-k1/cJ0iCzkbrAgMBAAECggEAP0WovQuNJR1nTiIkADUGCbIOGt6uAISDh0WkfWvgmruvJlixembH
-OWKDRwelnyMBxwDa2DTZVY1miMOut4j6Kd1EvWgBJvinp+5BSgJFGrhARz++ziAhgXOEl7TjdFbB
-pc/NJ1DCqcdrXz3UwPDvCRvDFLtZ1Epwo0wXo1rn7zyH9Rh3DNMZQJjsTXTJCf/d1ECzE4xgfXNy
-oU5REG0fOcC9Wk0wmYlCQAIX9OMbyiqKjpZ4skfBJrQhtcRC5otCZiwiIYdOsmXlzArSrOSypzTU
-KiKmXdPm6f9ok4CcXrQ0LEG9jwsZgDSK3CZxIsRqAoEpH0BdWwk5Cto4pai6qQKBgQDmfkVlnxhP
-oEm4XsbSNsAw2ec5xQ64Gv/52zZ78anMLAR9msJTbzdUkl5bxrJNYMxivvNEI+mTkSJDRaX98TO9
-ivOfgrYmoXSZ4jwz681F+xnrNB+UowbLnAgh5tZdqsuGOrmmq7JDEwRD2VktqYo29d6mIRmax9zw
-iZ6PIa9bdQKBgQDYMS4iF1UvtJqIfgAKjADI1CJ/EypapdOP/qQHclcfqsHpoVDyWtrMqaX/BA6e
-R9uQ1WReZr6UyhWRVAFmXDl7GVFF6LNbSSyr2NEx4/wD9c/UsIQmAlcEcudBrjG5SXabMTzoynXn
-kEhl2NFfYSzkXkP4bjSDb5yb8/TZDs+s3wKBgQC28YhBVVplcPKyXL9wADbhT0LAzpCVPhDoDr8a
-9z/vJwzVaO1Obdq7zIUKURYaZncy9R5+egadsrdAL9rFSRnpGo2tkIDk/ode0Hs6NrGyFtCGp9Nd
-FVyCZTDrP53rsHFj896A1IxjwodDFxM6M/PZFaOHtoPtHy9U19Y7AuB9NQKBgDo6DLXL2PqvRsuq
-O/KbQH7We7AEBm1Bqlhm+eCzj/mMcQuukfGkPLfQnU+w1QsWSXGZt52hSIUkZGiu2m2qOyUHbZdJ
-lDzq2WgzTiyEvdSHOQGMxRrDmJIvLE/JTcUcnyAvQ7tjBBxpBMbBfaqVrpSXOvFHJUedIO3z56cq
-UQ67AoGAEXE0pJ5xgxYATR8V9qT6/EAGdaGazPhtvdPIPT0+XaCeaaidQNBXFNnLFNHyfnTEC2j2
-Eu1SrvLVObypxz7pE2DeBx51Kw0i0G56gCO3cVzjrqk71nGqEb8eH/XKKTXJEdUHq54LQQMuJoo7
-a2OclzCfXMAFq+TsV03Oo3OwAj8=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCx/z+h5GJMFzGmFs8Hh+fMGL9p
+uDq9C6+e0hFIAbHYc6yVSRSp15kdIulwaV9nRn3QlNyXvN8RWob+kXdodVeYDsfCzba7ajIQH0fL
+jraXxDbda81Sn3hjRGhmnTfGK/dVeVOXz1YZ4m8VInsFVo+q+awduSvMl4nSMJ+ZC82FlgbzuIeF
+hZHjl6LRtFm9MINYBh/NwvmX/8aNJT5lvqKfbPj321eQYj6umFnO500LopbmT9dnsicFQ25NM0kq
+N8n6W+ohcQlVAqeyKDk1JT0AfX3hhUOGFmHq7pE+ONNpXvVT52ebTtMivub5tHlMniBr85UNJ8vK
+zfJebYBTvbFhAgMBAAECggEBAJ1NIrHygEAYW0MZcxqHq3y9/iLysc4xjqF/qdAF12KfT0yayg0S
+wHh0SvKR3MMLE9MKSyw5uLTAWP6OFYWV9bQmk7j/TVaxEc8Xpb4pwAm9WHMzer9iuOSZJt5QYGLc
+pfa+gvZtP/0eE+cMksVz6wFBJi8aXq+u2BiN6e059gXvx476O62cMWj0w9wqAkrO5DZDUuyri1bU
+oN/BPcL+0JM00Mc1RfznrA5WsrrHTUxQZUy3/nDu5vhbC3bOK/t0KVydXJf3Bl/oCL72PZkKzbVl
+li0RLrg1259eR9jkrvu5hiqAgxcaR07fVGzX01weBX9wWLnXc9+VMCUyI7pJqfECgYEA2kxYFgKM
+PvBHKT+NvJ+nZWpYiYFR7oopvUYyYWms1F1kehg6Pemdl3RuhB2ZzXKhABSh3/dVQlz7OktlTTXn
+y6da+BeMYpetNq33nlrObkYZEte2jWl9QuxRE5zenAW+RiHRY+rvtrCOoOpCMtSVtqnf0QZ39NPN
+SLHy+qcTFsUCgYEA0L0QEKie4kbL3iNDjx9BFQexSTGvPRaPwNRnvNqQAIF5MgeZpsRxIqDF7A1G
+wwc9q0nCdkHBcCRS4glfnEBomd+k7TA2fiQfLn9+WQ7kfJeyi6xvb8kwHPFR5ZzgfKIIeB7wgK7J
+mUqoGOvb4T1U/k2RaChU/6pHJI0ko7z8+e0CgYBMavlTCyVJSxe+Ks9VPpZ8/BNuX2TtGlSuO4qb
+a0DjPqZTz3NkBQnz4QBnI22Z7AzMWGyqWIzyJFaV+5rEwqAYPMetnaC5StuKDrBmMOee1s8kN3ti
+WZFOAigHs5yCBcisCF6imbW8wGXNkvQFk0Gtph4BsEAB5rswPYsPj7kw+QKBgQCwE2sjwjkUAkgh
+/3kTl3ect7pyVXjOfOOR8xn2kh76bjy/WO3hYL9WSGvr7F8OUGNSw4tHmbwETn+jr+h4s1QIyEAk
+25B74xhybpUzpn5SItw3OaNelkUBhQZiO2yZdUzTlrWktsvThMg7DWmSm9vAD8piI/NfHlGYoX6Q
+p/B1GQKBgGEzKZjuROFccoPUhoTgY0xZAFlaKBspzelgvfOBg7qxvmjL0ZX82ct0opoL36VB2caQ
+Zvy17lgvyHU9Dw6RM6j+1kxdTrKQC+6Ow+DGLUwrHlW0mxUfeFHN6NLXGgsYJwC8A75jHh7wdPrl
+xwHZieb/v+a4XMKZeNmYfrV+MyVa
 -----END PRIVATE KEY-----
diff --git a/tests/data/idp2-la/certificate.pem b/tests/data/idp2-la/certificate.pem
index a7014f37..03e39ec2 100644
--- a/tests/data/idp2-la/certificate.pem
+++ b/tests/data/idp2-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIEKzCCAxOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjZaFw0yNDA4
-MTMxMDUwMjZaMDExDTALBgNVBAMTBGlkcDIxEzARBgNVBAoTCkVudHJvdXZlcnQx
-CzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIhu
-hKxVUHR+nESRmUy1qa1uvE2FgQU7Sg4fymFICdR/dP6x96hFIAPAQ2aM1ByRpu3v
-EeXPlaRHu8Yt1uoQFYgY61QXLUFbqQAP5olddSo0BPYIXWoU9diz+ziZBfkmaTOg
-oRscFfnrmFPCKkhMcE4CVH8zDhoaSBLODuyj1cTsPlK55SJaXrLSTcnAAwd+ubZA
-x7ljhTMuyhQb/so+DJysbDMCx059b66rPS2yvhod2QK7cTd1h7cbKDdO2iUbRlFl
-HfHjOkZQpn7GRMKGnpLxuX6HRiVztTpt858spTX3i0mgTQ9bZLPa7l/Ddu16GHJt
-y3LXDqesk4M6x1i+TQIDAQABo4IBJTCCASEwHQYDVR0OBBYEFOhJ8dDgkPD8Io6V
-vkGTgam2+RVdMB8GA1UdIwQYMBaAFAJXtjXr7Gloq9goXfQRAk+q+G5SMAwGA1Ud
+QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjNaFw0yNDA4
+MTQxMDQ0MjNaMDExDTALBgNVBAMTBGlkcDIxEzARBgNVBAoTCkVudHJvdXZlcnQx
+CzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwhO8
+87NKma8n79+BHHBL+KBJAQq04SqCdX4oQvFL4zjsoeffQA2z30eCxOcHbDRjJ0zZ
+h18CYciXB8pZLNEnJzEQRxHqNQXUDYFV9QOEit2bf/rhwa48CYPEQKdMy8KiQdaq
+4AGPVvdyl97d09eTE9y6ouqD/t0UVbq1cYAXO36gQ249+at8h3m9G5opxX8oU0tE
+oCtCH89P8y+VHy8ijx8lcaOLBi6g4wv9zc0aa0VygHc89xCbnlAPEDEEPdxUMosD
+kXm6IqKzbCXYVPEDuw1ESD2zFo23xV4yZ3Pggkif8v3IDbpuzo2nf03zYzLcx77i
+HwHcxnNMxPqICE0S+wIDAQABo4IBJTCCASEwHQYDVR0OBBYEFI/TbvK66Nw01UJX
+0DBUPCsM52BaMB8GA1UdIwQYMBaAFPIgVeWrkWP48RFO7BHb+wuvnhRyMAwGA1Ud
 EwEB/wQCMAAwCwYDVR0PBAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
 BQcDCDARBglghkgBhvhCAQEEBAMCB4AwJgYDVR0RBB8wHYYbaHR0cDovL2xhc3Nv
 LmVudHJvdXZlcnQub3JnMCYGA1UdEgQfMB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2
 ZXJ0Lm9yZzBCBglghkgBhvhCAQ0ENRYzRW50cm91dmVydCBMaWJlcnR5IEFsbGlh
-bmNlIElEUCAjMiB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQDS
-i1pS3wDe06JTSpyE9gn1zkdziYRwY8comqwJMVVOJzmiN+YqBgOxQVQMV9FVdoSn
-LicAeCqk/4r3+wgDgq3ln+kPvJ2wCVaWlyAUbZge3Q+jsY1mKiulM9KkYtKDUdzD
-PxAa571N3Nb16bN0PGr9loL4yg7fWxUQAT5oFc2H0xp3+XdB0BqErH5DU1UwJlkj
-l9kUYzcdZpUNkg0LmWDbl8HxWpQkbIOJdfkt+sJZPTxeBQxavnat4GqMIG/gInnP
-CgtnSQfZfI+JLHiAzVruOKhNjeH7SqB6VimcSY9mExgOHH+B/V+kJs1BCSFurOl+
-c+IOX26rn0QSJuNDyYJK
+bmNlIElEUCAjMiB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQBL
+ioPZDsHKJtHZL9Asva09DQGGzadsHGRSw8q9GkaYxuekj4ie/GU6r0B2sna9/yxe
+gjyIgZxRw+2a8mncGyOrsB3Cp20KafBc+42pNQNMAB3GR0djlorJS08tnm/trkNL
+Z9EY5rMYZW+HQk6zR8SvdI6OUqBIWhf9l0ImxlTw33aMx0QPwcqvhUVDsEj3qWtF
+wWyO97nR14A5U24wvKjAReTg6ivFeupywMsiFtfyf4MJTgRsLsRoVxhHkHtgCYXR
+BTZhMTR1GeX0DUZ0xQwH+m0EvcFJ/CgEXUJcwVXwbyPonJ7vH4Pt9Vd6B0ibE7bS
+B2Nzs2lZBTvsRhksPapB
 -----END CERTIFICATE-----
diff --git a/tests/data/idp2-la/jks.keystore b/tests/data/idp2-la/jks.keystore
index a83284e3..5aaf6ab1 100644
--- a/tests/data/idp2-la/jks.keystore
+++ b/tests/data/idp2-la/jks.keystore
diff --git a/tests/data/idp2-la/private-key-raw.pem b/tests/data/idp2-la/private-key-raw.pem
index b43a1bf2..63894085 100644
--- a/tests/data/idp2-la/private-key-raw.pem
+++ b/tests/data/idp2-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8iG6ErFVQdH6cRJGZTLWprW68
-TYWBBTtKDh/KYUgJ1H90/rH3qEUgA8BDZozUHJGm7e8R5c+VpEe7xi3W6hAViBjrVBctQVupAA/m
-iV11KjQE9ghdahT12LP7OJkF+SZpM6ChGxwV+euYU8IqSExwTgJUfzMOGhpIEs4O7KPVxOw+Urnl
-IlpestJNycADB365tkDHuWOFMy7KFBv+yj4MnKxsMwLHTn1vrqs9LbK+Gh3ZArtxN3WHtxsoN07a
-JRtGUWUd8eM6RlCmfsZEwoaekvG5fodGJXO1Om3znyylNfeLSaBND1tks9ruX8N27XoYcm3LctcO
-p6yTgzrHWL5NAgMBAAECggEALON/DO/LUGCsVKCu2gU9q6yzlPoQM2v/dd5vC0ymTlDeGAkcbo8O
-BlVeTa35EffLZid4qJZDGqoGulqxR15rffTtmfpnmkrZfB+bqZRDQEZQJG5AB53eZ7q0/7e2F4n+
-70VvlWxS/5iF07r9m/ui14p7W4r9qPnmEAsKLNuDFr5ns4/I2TdguPJ6xCS56LtdiU1erO7tIp5K
-vQiRLZPCu6CWOWH2us7/Bg71+8H5FEsJVj07cYgnUyEdrDQiW5Stm8he8LkMSX1TEIBzicT6ABGJ
-8z2YVkBropyM6mb2Fi7c48g7kj5tzllvGzWHby1+PoJ6VSkdCMjq6Iw2Wf2kgQKBgQDb+JY1H/U4
-aP65kJu/+waFzJRBSXcBr7xaF0KG4yUlt128N/x3SDx6Iovvj3/PXq9eO1o8DgqNMcphc4ZtZGfN
-S5h8Egs/MU2T6mNdk+AFZlkXNLLTU6vxUGShyvkPrHZ3A/keCcZqiFdgLWa23MLvI2rIawicrFxX
-/XUkEsiDaQKBgQDbaaQqUtrweUsJeJxYqmccrjeWuB0S3NLQUBDO0nVhlGMytu7ycrRnGTHCp9bj
-urLG8eCk8dlamWEQX62OtmUm3BvkgB8garmpzhiWIdDKPgIr0HfGyKjb69IyJ+3VGCqdsB1EVq1H
-iZ8hO1n/mNam2O5NHjWPutrbBq460/9bRQKBgGpb4AT/1snXupJu4WAKODUpneWTZ/9gwWmuJXSj
-D6sU5jXDvEbQnq1PVuoWMG5MEe82M4MmJuPuVzSXb0AldCtHigszjkyXwjLq+fCdN4xk2F7oFC8q
-HdEoVgAE7Dgv43fYa/OiNlX8ZoMScL+qLncCYPdXCWr3zA6fdqxiiKFBAoGAagx5aGt7ntdBSWae
-Ssyx4c7i11pN0xwgWMcaGJzoVy2ddJmujEicoWgwAOGWn6NRXY7zAUZTw9J2c6+K93t5EHs6kArN
-AKIU8tnGUGovvFCURBESk2XRF9q3Ub6y2VhA4M6Klsk+H2GJJErHiR6aQTKAm42KXdn2hf6In65v
-sfECgYEAokqltiQ5trh5N3bGFVN+xFtm1tFUcQF67KX7i5dFaHI9EYDyraqw7u8MdIEjvy0DJcXO
-N/SJWafk9PM4dD+C3hMVx46qWR2isy5gniyDp5oZapp3biV6prV3e/u+sAMxcGSjwEo3mAO30AB4
-Tz97woPozWgoJxwzX3vp3ZHNB60=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCE7zzs0qZryfv34EccEv4oEkB
+CrThKoJ1fihC8UvjOOyh599ADbPfR4LE5wdsNGMnTNmHXwJhyJcHylks0ScnMRBHEeo1BdQNgVX1
+A4SK3Zt/+uHBrjwJg8RAp0zLwqJB1qrgAY9W93KX3t3T15MT3Lqi6oP+3RRVurVxgBc7fqBDbj35
+q3yHeb0bminFfyhTS0SgK0Ifz0/zL5UfLyKPHyVxo4sGLqDjC/3NzRprRXKAdzz3EJueUA8QMQQ9
+3FQyiwOReboiorNsJdhU8QO7DURIPbMWjbfFXjJnc+CCSJ/y/cgNum7Ojad/TfNjMtzHvuIfAdzG
+c0zE+ogITRL7AgMBAAECggEBAIQ2OhSy4XFM16Ib2rLq9XZMiy9AgfSapwEvjnH8O7xxfRLXCUlz
+jEPhTX6h/HaEQb/2JIKKAO9oXSsbeCCF42xZikNAOxMgA1On9kzRtqt7SIGpAb6V2aSJtVpuHmz5
+DNxZR1MO/P072T8IvomgZDu1tRdjN8SaC05TwWOu5STLcMfeDkthWW1Lh/JemPiCZtVMcDW2bFaH
+f++wrPt+Mevd3tdp80OqxiWxefnM1/uVGJmLH+EdNSW9jGCjj0I35u2xSp0i1q+IK9UYUQw/tGNA
+HhHUtjCW3ZUFV1r7g2FCwTjN/OKGZje1x9N+hq2mbZjdfWPANujNhx3aXcrfLzECgYEA5Phr2V14
+NepfS+OCbt5lcaFQDYicOxs7YV+OwzXiVPk6QTX4WFxyIQtRy0v9nAiHa7P+RGY8GiM9vTJbqxd4
+BFTnNmKw5fyF7Hwp4S2xgVdfApWpWg5vfCMyIYokNuJw0sdlvdHgh36riNEkyG4IoCWfKAK8sV5E
+wGgB9QGc5C0CgYEA2PzTxlIYnp2ImL/2XKzke6X0n7mh2Jn46poXt1ypSMkrL69jQVsQ0CltbrTr
+Lb2HOFBYNdCezLeA/yiGWIgvKaghAd1ADQ0J2NrKYISazWhShD8jYGAPYYNOdMtzVmKgRUnfumnj
+R7Yb5fPK3ZIWLwNsckd+zcyjkXJxKYxDBMcCgYB4f+xyNmifJzsDuzXXlx8YD+cLWEuwJ4K2mg2N
+2nvEcG0iCH8sMWq2zTg8nz9WsH5kRhOYd51FvCovuaLYhb9ZuDz+OC4UuzLX4/g+U0fJY+vSdmTr
+yhEN6Y/masboQ39QzjNTFHLvm9A2bqrG+HF9po7+BYK8bXoNMC9ne3PP+QKBgG/n3DQwjL/o0NSu
+U5kyFVfrm8BwVRbHOceMFuUa5bdDAIHEOzUuiPpCE00AAzYAw+b4ELYYVH2RufZd6QNpoKEkM3mp
+qGnSqpxrIeorGUcMIVpQ0abXg7cvp9u2PVJ05OE3Gyohh/So57RtSdeBiu1OH7TESJJMkqLlWZUq
+4DlrAoGBAMvDkYikGi3mVQWRrGfnIiTgcY2rp5rj1RotTWU3ETmLfsoWrVYpY9kYzM7JeR1GimS1
+YYIp+khoEyG29vuJx5XLxdivsA5qVeArbR3AznCnESOZVPQ7aqcn18KuVcUhtthCkSOQglVXKPk8
+BnBo7gRdr1kXazhtPVutkuM+f5UY
 -----END PRIVATE KEY-----
diff --git a/tests/data/idp2-la/public-key.pem b/tests/data/idp2-la/public-key.pem
index ebc95b2b..09f1767b 100644
--- a/tests/data/idp2-la/public-key.pem
+++ b/tests/data/idp2-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIhuhKxVUHR+nESRmUy1
-qa1uvE2FgQU7Sg4fymFICdR/dP6x96hFIAPAQ2aM1ByRpu3vEeXPlaRHu8Yt1uoQ
-FYgY61QXLUFbqQAP5olddSo0BPYIXWoU9diz+ziZBfkmaTOgoRscFfnrmFPCKkhM
-cE4CVH8zDhoaSBLODuyj1cTsPlK55SJaXrLSTcnAAwd+ubZAx7ljhTMuyhQb/so+
-DJysbDMCx059b66rPS2yvhod2QK7cTd1h7cbKDdO2iUbRlFlHfHjOkZQpn7GRMKG
-npLxuX6HRiVztTpt858spTX3i0mgTQ9bZLPa7l/Ddu16GHJty3LXDqesk4M6x1i+
-TQIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwhO887NKma8n79+BHHBL
++KBJAQq04SqCdX4oQvFL4zjsoeffQA2z30eCxOcHbDRjJ0zZh18CYciXB8pZLNEn
+JzEQRxHqNQXUDYFV9QOEit2bf/rhwa48CYPEQKdMy8KiQdaq4AGPVvdyl97d09eT
+E9y6ouqD/t0UVbq1cYAXO36gQ249+at8h3m9G5opxX8oU0tEoCtCH89P8y+VHy8i
+jx8lcaOLBi6g4wv9zc0aa0VygHc89xCbnlAPEDEEPdxUMosDkXm6IqKzbCXYVPED
+uw1ESD2zFo23xV4yZ3Pggkif8v3IDbpuzo2nf03zYzLcx77iHwHcxnNMxPqICE0S
++wIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/idp2-ssl/all.p12 b/tests/data/idp2-ssl/all.p12
index dbac0d55..f43b5f17 100644
--- a/tests/data/idp2-ssl/all.p12
+++ b/tests/data/idp2-ssl/all.p12
diff --git a/tests/data/idp2-ssl/certificate.pem b/tests/data/idp2-ssl/certificate.pem
index 54274362..8cd549dd 100644
--- a/tests/data/idp2-ssl/certificate.pem
+++ b/tests/data/idp2-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEUjCCAzqgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAyOVoXDTI0MDgxMzEwNTAyOVowMTENMAsGA1UEAxMEaWRwMjETMBEGA1UEChMK
+dGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyNloXDTI0MDgxNDEwNDQyNlowMTENMAsGA1UEAxMEaWRwMjETMBEGA1UEChMK
 RW50cm91dmVydDELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDECfSrwgl8sy3va0CtXlGzRCF1YvlJwPHN1hVUMvDKtUYjgFJq8pWo
-pEEkeCSdC4KS7Nph1Bv5KR2akeagBkpqzU45mmoA59/9esPaZqY1G8wQtlTYV/1h
-ZLdgXTwS9RsjBZt/3j3qgOWDbJcyAtnDEImuKOYSLWYX5TfMm1aR5kUT8x6qSkHt
-17vYH4TT2HGB/5KfFpfRW8QVdxqX7KjQnxvb04jqC5uvEp7OVC4951zq+9DgRoUd
-gCX7cPMVAAUlk3hwIN+90vxz0oG0tPjX10TL+FiJja5nFnqUa/jH9HDQH8gsjYTS
-yzg+SO31mWe/DcZSaNvU/pd1oL7BDmLbAgMBAAGjggFBMIIBPTAdBgNVHQ4EFgQU
-tiZ9lnowphmVw4swPRjZ41kIeZUwHwYDVR0jBBgwFoAUhGfJn8q4TQ+BsRGY+srV
-8+TjNfcwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBSAwKgYDVR0lBCMwIQYIKwYB
+ggEKAoIBAQC6VRxTjmY/yqtXOiWfrOeLBSPJaTnGCQ3tl5ngveB9EqRbrBlrgTSJ
+mWaVYL3d3K4fWkT7z+BkJNNsoVkIoWlTbQidY3oEFvJ0TBppiK1OMMJcQAAS3aV+
+Ra8+9+p1xn3BVGeTKdyO2wJXF+Ymp8re7s/Xhs5wbmUIuYgsUYXrQSohLufpWhfO
+RCdBbfhWXEJTwXDaG46wVbnPsgCiJmDtIubi+Ox9966K06XNJiWFbgNXKunWr6ZI
+uSOINwnjw9d+xrBrdQkaGwVsl6YbaOIEr1K+LdArFO2oJG/s71ea5CabG0g3qdDb
+9lfkwzmkRAXwGJiyDIp0o6pp/+7DStgVAgMBAAGjggFBMIIBPTAdBgNVHQ4EFgQU
+bT6XxWYXOz/nNTPuiR6BpXHBt6gwHwYDVR0jBBgwFoAUG7dNqcctcnnseu+RUwDU
+AB7Pz/AwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBaAwKgYDVR0lBCMwIQYIKwYB
 BQUHAwEGCisGAQQBgjcKAwMGCWCGSAGG+EIEATARBglghkgBhvhCAQEEBAMCBsAw
 JgYDVR0RBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMCYGA1UdEgQf
 MB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzBRBglghkgBhvhCAQ0ERBZC
 RW50cm91dmVydCBTU0wgTGliZXJ0eSBBbGxpYW5jZSBJRFAgIzIgd2ViIHNlcnZl
-ciB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQBrdvLGuAgWD+tn
-v6OVIiSQINQUdLE1sJtZJtgqWNvv3kQm4A4EewewcXBQiUPmfyDOI3WAkuFa2RO1
-TPmyrsu0D4HS+PTazfvHUTpdBSQKXwyBxQE/0J5lHJC3+Y8mOiKeU13Zh2Ov0mVY
-RRL/VgQxfd6U4scduzqCo7Pd+S9wmSk/7wu1mROjIN78FrzRbKJpXOZdUf1t+EEK
-OmiTYuHjCsmFgH2+oYMFOH3KfqvH/7jPM+BoRiakSifcSqAYMjc+c5WBz2X2emWv
-0AKx0ZwObnhvngxkim3UtDlRjH39mJaJxTcO0MSpzi6bzmdgKa81e4DL7KXb9cvg
-WV8cH1p9
+ciB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQCadxGw3IzgSiyP
+yHcNT0gUrvxK8pcZlBIVbubMxc7N0u4EgkCnpAVQD1x0IguIXN8nfTaj2RZCzWmE
+uWsKMh2WJoLibgAIFmc7dq01QGSXyqPuZbx44XmlP5ShvZBW5pWJsb8vglKStBSr
+8OjIzme/3qNcLv1pR7mbJHYtjTzFUtnMrGRuVDF5REDbqQ0FQb5JlKPyFIAOmfIJ
+t9EaaaraT7JXmILABHFM+ogoxuaKR2WKNjnb1LX1VGJC4untzmq6j4mbRxbF/HLM
+P37AMEilzgexCiDDzy1Lq32urDHOpvV5ibF59buhTfkIOwxp2DhlMq2rNO2D4msg
+ydjJDMTU
 -----END CERTIFICATE-----
diff --git a/tests/data/idp2-ssl/jks.keystore b/tests/data/idp2-ssl/jks.keystore
index 79cc6c0a..407d73cc 100644
--- a/tests/data/idp2-ssl/jks.keystore
+++ b/tests/data/idp2-ssl/jks.keystore
diff --git a/tests/data/idp2-ssl/private-key-raw.pem b/tests/data/idp2-ssl/private-key-raw.pem
index 7a7fd7d2..39988e55 100644
--- a/tests/data/idp2-ssl/private-key-raw.pem
+++ b/tests/data/idp2-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDECfSrwgl8sy3va0CtXlGzRCF1
-YvlJwPHN1hVUMvDKtUYjgFJq8pWopEEkeCSdC4KS7Nph1Bv5KR2akeagBkpqzU45mmoA59/9esPa
-ZqY1G8wQtlTYV/1hZLdgXTwS9RsjBZt/3j3qgOWDbJcyAtnDEImuKOYSLWYX5TfMm1aR5kUT8x6q
-SkHt17vYH4TT2HGB/5KfFpfRW8QVdxqX7KjQnxvb04jqC5uvEp7OVC4951zq+9DgRoUdgCX7cPMV
-AAUlk3hwIN+90vxz0oG0tPjX10TL+FiJja5nFnqUa/jH9HDQH8gsjYTSyzg+SO31mWe/DcZSaNvU
-/pd1oL7BDmLbAgMBAAECggEAHvl/uj+/Zf+dq22j24DCofOK4dRQlTGyQxanahVebHj16xgUbaeE
-tA+35z5Acrvl1rcrzjdIcDbp4YlaCkDUM0nbKUjXpOr+PjvOhEyhyFRrCtz0TPaiJ2hVfRleK5Sk
-xATXy/1ehRX2raxTu2gt5h9P0b/OkmKv9eiWx3Jn3EdhrXcOqGxG9DND5UW6We8LUnXKc+wJgSC4
-UDXSg4UuPbuyacELMWjpbzhr5qbwFp7cY3cSu6qinU92ZOjuCi0Eq2taR9FDUJ6VJPCN4z9LgxIz
-sGuEBGb4b3wPtc+cP8Jgd+zrJDir89dRA0ceoLbslN4OfiqrkbONvtXCt+VuEQKBgQD71f9FhVr3
-OYZtXjL0T8z5qzOOcINJnzJz020J9ErSodMC/zyERSyNY4VuDN2ASGeBO1WCt/GUpqQYG/iDvC12
-ivnYPgjfLvu4v5qJQoPbgsDadsFkk2LRS3macUEssPFzDautLiwLKeQUBafDtmUqL8Cu5E2av4Ak
-UJ/eYwruGQKBgQDHR8Yb26jGOuzoHMeQf9tgdsXDg+35/M4TvUbjiYIZWwbuxeiBHCEeKeIb1rqS
-0yL53TOWswoyWcjA2oSZfve39B6EDrPflM0u/5rD6nx/vjbOvV1o/8840Qmy0w8OqHZqD42RXGE5
-RSQ76k5MSy5Gal/4co1tuS15F9BbhI1PEwKBgDi7oOJchH2la+8/hWMchyTHuLmiBzGSt574Rlwz
-uJdy9UJ7lXqGyt6fSPPd2hiINykZ4M2t+rJuSBFWW8nxnpxR+q8Iap88ymB4aav6XBIbhq6wiijK
-OzzDMAXm9bPHuN0ee0psWGe7bDJGg+DHOksirtm3fPQbqBaGQz2qOlAhAoGASEc2CYCgNFXG+2EE
-2Nom3VP24rUFKXiR3gL2pSyIrV2gpBXQAJQNRv117xbw0LQXqXyba3tApYZ/E8Ot+GZevq+iKc+T
-WfKEgRlgLtLrmQGKq21vZdfydu8Kj3uRqIVdfZZqiGBzOuxi+gA/qdhSzmNir6AMv9E8NwF2Jttq
-zVUCgYEAsMdnpMOhpWnh6n+wH7vjoN/evixCh2SAptaM2rt4eIfQ163UjXvTk8itqul74LMB0DO+
-xM0I6pciuj857tVCaSfusWAfXrrVpx+w7xUhEAQr5IgA2EKgy/Qd3cVYDCfd9PWyZ/75b/TcvcXE
-9R5z7Oqdfgtln9HPQsinlJd/rBc=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC6VRxTjmY/yqtXOiWfrOeLBSPJ
+aTnGCQ3tl5ngveB9EqRbrBlrgTSJmWaVYL3d3K4fWkT7z+BkJNNsoVkIoWlTbQidY3oEFvJ0TBpp
+iK1OMMJcQAAS3aV+Ra8+9+p1xn3BVGeTKdyO2wJXF+Ymp8re7s/Xhs5wbmUIuYgsUYXrQSohLufp
+WhfORCdBbfhWXEJTwXDaG46wVbnPsgCiJmDtIubi+Ox9966K06XNJiWFbgNXKunWr6ZIuSOINwnj
+w9d+xrBrdQkaGwVsl6YbaOIEr1K+LdArFO2oJG/s71ea5CabG0g3qdDb9lfkwzmkRAXwGJiyDIp0
+o6pp/+7DStgVAgMBAAECggEAWRFcA/jamX2oX361A1mkKIjhbWJ2MlqbpMnFzW8WAtNJa2Sdlgzh
+7zA7oAXpXEcjmGsO9IuOiHAt/Aw4Qe7eKPnCl3E4nwHVDZBfQ7kIloqqLWyOXHZEqFJpDaF2Gqwx
+6psNE4R8IHFB8h3DbxDf4aaoBS80OPwcIYqGNCEX8baYDxvmLSjw30QWd99E/qgwYwPE8PaKPPYC
+A0Gv2WsrFGC+zBrDEhKpMYGy3GdJxtrjjpJten+SDmjkkK8kw+qTDm1irutaQ0DGWayG2i+wn1yd
+nqCMEiTY8N/30fJ62BhAfZyv41r3CnoovPs5jyacF06U6VeACvwfHNC5T7gP9QKBgQDs16dnc5G8
+tsul0NOuHCd0WWNPZLTjG87DIH41n2d4nwYDiSKf6+nWUUS/U5oJHw+7detQ0tEwQBvDUZZ3/ZGV
+9YENdQIAHt+HpHx4c2jvOR20hN4pj1hkzBhXDT9LbiceovY2wZ782Zl9xyjZT2fMMWcVXyqqWn4A
+s/a7LICuYwKBgQDJZ4lnTGY8aa4VIVqmB9uf63HRLBZbAnpF3hpk3I73m0f8LaObi3YqGwVVBd+T
+rvQZsmhNJeu2F9KwdNV2dSTat8IVwjCjH0+Uva4MBfBqTuvidxKeHLSbcdSBp3Ri8F0nbp55OAsm
+3DLOVr2y57UQY0Tuf5ZU38YunFIHNDnNJwKBgQDJls0QStgTDmvMGTDzk1cpuyPCYe9tFzAn+bIz
+JhjGHGTcAY+NGxoPp2CikSAc/2k+oCHIy4fuT8LRvtIaE6QlRa+wqpUnUR/lrmWbiHAanjzgd+84
+5J/SO73D6qyjIYD+nKqA9NDEWtpAqpHkVaf9r1cUY8pG8XsqUgOCUWC+DQKBgBliV0sRsgEDQNGg
+9o/ehavOPPYkHF00Hr0XlTQJKGvEwnniNrCwDyCXb0CcEOXIMzPZ7JNsqBy3O/LJhu37Lb3zUx7y
+7rZgh+MzVPBm/zom4EwWvd33uDuvSR1eQakGqncB1i9pBN7M+gpPnHEkCwoZuOJmakggPBY71Yra
+5j4ZAoGAKJKYpkMpsQemvhh+Ofo510XvQ8As9/+/anjYw7PbTNEhYoMjVrxx22FFuyVoqYhkVPpU
+lT3v5gUNHn4XO3rBGdn69hS7zQmeSNSe7hkl0Aa59eHIEDJ23HbfQiPCdWdJ95/JPV+3qBYyYzkD
+mPQAPC52j4s8BWMGWOF72sdgPKM=
 -----END PRIVATE KEY-----
diff --git a/tests/data/idp3-la/certificate.pem b/tests/data/idp3-la/certificate.pem
index 9fb1319e..9ba9694a 100644
--- a/tests/data/idp3-la/certificate.pem
+++ b/tests/data/idp3-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIEKzCCAxOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjdaFw0yNDA4
-MTMxMDUwMjdaMDExDTALBgNVBAMTBGlkcDMxEzARBgNVBAoTCkVudHJvdXZlcnQx
-CzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA60fX
-wZjBVE16Ma1wDp2Ty/Ajdv4WNdnr4kQi+XxceOJD7ZXoyvgTnmRY65j2+LMLzmIf
-RZxpxKAocQ6n/npof/IolJBJFaAIlgHfBUy9lJ1NTBx8LL/2vwscdg0Lie10UIkR
-OyHLDBtVzcrvbkJM/9TtEvMtYBzaf0zlbogfIORxO7z1O8dwRUYguGiN6a5qjjJ2
-Q91YvuzoRwS614iCz6NmKFNsHqh/dq/NEviV64WSPZPfvHnw+gwywnggxZoyGwIC
-X6iH7eRjI4YookiU3YeLr4gXYjWtAcrZnI/2ebzVI0USQNFy4rEw+1YVGVnCDJh5
-l+lIuOFrf8/YQy+30QIDAQABo4IBJTCCASEwHQYDVR0OBBYEFE9XjYxA57izg1+u
-Qx27/WU08zZwMB8GA1UdIwQYMBaAFHbi6rcSWJs05ge5dXTuJH/6kKTzMAwGA1Ud
+QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjRaFw0yNDA4
+MTQxMDQ0MjRaMDExDTALBgNVBAMTBGlkcDMxEzARBgNVBAoTCkVudHJvdXZlcnQx
+CzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnH5c
+Q9RpkeFqkq3Mw3c+89J9Fg263315njP9JCmNVP3I0LkBRWVB7uA75hTMJ+Wwdnbt
+fO8Hav8l8+x+hp1NZY9q8WxoS+3qkf6XFrvRvHnt2GZS9G95QVp3tca7g0VJ+br2
+DHDMclTczz/+pG5Ch2aRVZCSeCDSUcf7NTnyy6kf7ZEGYPrzi+AS434ya4Sd1o6C
+DyMdm5Ni0FEM+B8bFLQMlo7FZv1C+tOg4ZKm6YIh8TJz8zMWb5n4VtJSIh+OAHJq
+jdVIBdlF8B7Yk5cRo16zm031c9UUrXtVbNfURSEvjNrP/b4fr52uj42mUOUYl7Ap
+LmcxZ7yBXkhNS32CRQIDAQABo4IBJTCCASEwHQYDVR0OBBYEFLZRGGP9Ba4wyL/X
+VYdgVZKyS5XUMB8GA1UdIwQYMBaAFJNfpe35u5XiGi6Qq62fu+oqQZELMAwGA1Ud
 EwEB/wQCMAAwCwYDVR0PBAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
 BQcDCDARBglghkgBhvhCAQEEBAMCB4AwJgYDVR0RBB8wHYYbaHR0cDovL2xhc3Nv
 LmVudHJvdXZlcnQub3JnMCYGA1UdEgQfMB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2
 ZXJ0Lm9yZzBCBglghkgBhvhCAQ0ENRYzRW50cm91dmVydCBMaWJlcnR5IEFsbGlh
-bmNlIElEUCAjMyB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQBq
-MaCK96uwB5wGOy1zCsGQvPRdQ2xPYUEvN4I5IJMsfkgureZM05K6gErf2VUikKbi
-5OjwVPrlILJwhiDbTVAsOTJcNzKQUofi8xz6gKL5An7p9Z6OgixE0yFTnAzm/Kal
-0pgIb0TItqRDzKjepJV+D/HwJxKJIl5z+zMBRdrUn0b0y2yiOAZvtZAGB5Tnhfna
-pVJEknHA6RWJNdSiSotYS8U2qWW0TsV5jnAtFvwAU+BBmcvgapTv446f5wOqM6SP
-WC6HzyclrIUyLKhqqJlHmu0sKsBi9+b0vNnoFZ0nWVX/hWOKzQxuWg2Do+QaL62g
-PZz9KRt+sH8X79bhpSDs
+bmNlIElEUCAjMyB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQAk
+CzEQloO9Zs27mH+X7wms+2rohKhN8ZA4k9FnK0mB5EFe8dMx4dNC9ZPECZpUrHnw
+fxu91GxjFj6fuRv3EGqsXIb5XHk5ENgE0or79wTTMXaVXE/WCMkZKTpivqAPkc4S
+81sED6DtikXIzsrD4iZOHTc6FOEk45MyBlSL/PFf6DoYFVHAAgO87obj0lHxXWsd
+WcqkPRII7diLogZru6yLn3CNDW2ZPWVBZ3HOUnGXj1T25Hm1DPDzKX0XyNtv0qxb
+JdvG0oLvaKZAHAisAX2CWln6KAli+L+4V9cmhdiQ41saOGspkQEaT+yQyRFcb1XL
+ItOkamYVWwVwlt7ZJn/D
 -----END CERTIFICATE-----
diff --git a/tests/data/idp3-la/jks.keystore b/tests/data/idp3-la/jks.keystore
index b7f405ff..9a835827 100644
--- a/tests/data/idp3-la/jks.keystore
+++ b/tests/data/idp3-la/jks.keystore
diff --git a/tests/data/idp3-la/private-key-raw.pem b/tests/data/idp3-la/private-key-raw.pem
index 1a7fac05..8c927f7e 100644
--- a/tests/data/idp3-la/private-key-raw.pem
+++ b/tests/data/idp3-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDrR9fBmMFUTXoxrXAOnZPL8CN2
-/hY12eviRCL5fFx44kPtlejK+BOeZFjrmPb4swvOYh9FnGnEoChxDqf+emh/8iiUkEkVoAiWAd8F
-TL2UnU1MHHwsv/a/Cxx2DQuJ7XRQiRE7IcsMG1XNyu9uQkz/1O0S8y1gHNp/TOVuiB8g5HE7vPU7
-x3BFRiC4aI3prmqOMnZD3Vi+7OhHBLrXiILPo2YoU2weqH92r80S+JXrhZI9k9+8efD6DDLCeCDF
-mjIbAgJfqIft5GMjhiiiSJTdh4uviBdiNa0Bytmcj/Z5vNUjRRJA0XLisTD7VhUZWcIMmHmX6Ui4
-4Wt/z9hDL7fRAgMBAAECggEACLo2f6Dp8vWYxcT4NiKUO+lhd2V/b2nw/Qin/3ckevtxp5t68iR3
-ndV9EuguqRUDKBmtrUhbCAck2OTBSIhD3hMefDxJ6bpw9xeErU6mbZ/UITGhTYulXHrOCHb9aZVc
-Tix3bikXvhA5g5O2g/GDp62/SYeptDn9xOEWVZ5JAVBFx1WUCbIqGPW0Fwnpej/afCCkLFxQXeiS
-dCK0Fid8tg/0SCieLBPoElC/NN93xA8Huze6J5lwG5LRy/cqCA8UvAZOOlpBktLaODYr7lS6nCAl
-j3v0rTKKNH1NwOsHw01OlferjkntKJFhYHIAqL1yvArTlqCf4ysGeeycozN5zQKBgQD9tePGbyUM
-+tQGYooaryJAazJDP3YzZIDuCRhwOs27g/578yXw5ZiARcOqbGQuMZZ1PmoVIAA+wjiqPorjr7F3
-ZwufmP/aw6d+7RhIPS4ktngETpAPahe14p8YF+DHVnI+7tHhHPDa91ww6ICl1qN/x+BGO+v9ZvJE
-S+LJzLk1YwKBgQDtZ2CRVlqXMZ1F9Z5eklaXcmN4utkCyg2VtHtGNE98QmmXUdTiPqKsSqLkdGIA
-XX8W3OPvHkF+TQAk6waeJ5a3o1He3O7RfMDV/U/ZZEvwOHY8VYqZzXH1HitqFzA31+JzUc2zTaIZ
-f9zZ+JKN05oyhrAGjminEFZkE0WPYKcOOwKBgEadlr1HeDeJpPP1/1x3/H+TlpTTGBIr2hrm2y95
-noOftHhJb/kB3pVtVY2cx7F3ydnuOlaQ5qCRLHZuG/hNkYabXsfYLPZ12KviUAzjQnGje/ou57fy
-npDYd9Gb68tvyzKrBC21AXDgwn82Z4BBIpbRSiIiUYfhXHMX8BKc8bvjAoGBALgU3bM0U2BDL2Es
-2BUawZwDLZBSyay5AZmgban9K9j9IiUcZcbcrISOBwrAF7GSzdXrh65FNqF5kXAO8X220s4oDHaT
-t3amllwXZE/7zkpBbaTQ63zg6ckYEK/dtRzIACZNOwQaYWQGWjiF3xWsCze8akdbK1jHeUV2EAzh
-9Ac7AoGBAOHOVU27ebmUUQAOJ6qIj2IisfR5IWRyMb0nHxPxmIpJ7kNN+4OyOTbRsbm9oOHFMpY2
-7/iPKF5gZGZZrPQP/ygGgIrAND+CSqhRrsqwjJPoWUdflP1Lo00mk5ddT4MSduUBfm0IferuzR0g
-s2eUncMHCDQLuwTSrEw4KHq9Q7a1
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcflxD1GmR4WqSrczDdz7z0n0W
+DbrffXmeM/0kKY1U/cjQuQFFZUHu4DvmFMwn5bB2du187wdq/yXz7H6GnU1lj2rxbGhL7eqR/pcW
+u9G8ee3YZlL0b3lBWne1xruDRUn5uvYMcMxyVNzPP/6kbkKHZpFVkJJ4INJRx/s1OfLLqR/tkQZg
++vOL4BLjfjJrhJ3WjoIPIx2bk2LQUQz4HxsUtAyWjsVm/UL606DhkqbpgiHxMnPzMxZvmfhW0lIi
+H44AcmqN1UgF2UXwHtiTlxGjXrObTfVz1RSte1Vs19RFIS+M2s/9vh+vna6PjaZQ5RiXsCkuZzFn
+vIFeSE1LfYJFAgMBAAECggEAWmoHFIlclRQPZr9TVntGu8gYzO0R0p3D7ktLLeFz7m7R3wWEXnuq
+JEEZWk0ZxtNFqKv9efj/6CmR2+P/Ffc8CDlcKC/h8jx7Ee5tjIznGGW5rRUxSFg/Tirejv9KxwT5
+QHdsQLPK6yNsj7EBhi7N8TypKy5j8VPFL8rCsHXSeSdOJuScrSUhYjhzlR2/fOcDXFjRBGu7jq5q
+k6UIqCJnemEqgf0nkg550rK5bZD2bO9bwK7TtP/s958FqH17sjFvRZYceDC88RepWuUgTgdPxkiI
+KMvM14lPGuISxqQfT7uf0cLHpFHqMa/tGU0b8MDkPKm+LyKolH3W9Brm+ksg4QKBgQDKXD9w796h
+Hhfhg6S/iME6AVb4mZgtBnJAIktacRZk9PdP9BqZ1+vHjGNHeJ4utxhiSFzmwTYX9rvuqV6PoVXX
+kenk+gRqeLeA8HJylaT2XUTkDAIHc9qPQyyqfFTcZPra9o/ylF0EToGL3GgjjlmB5QhmYNY4p0UV
+bxzHHegLiwKBgQDF+bDBS6tXaMsg5Nf1Dvap9nP4rvPRMesJ5LVLBYahs0kr0Z7/X8EUp9mTxPFp
+4LNbtDq4mjEfMtme9u/dOZKx5RzRa7ODznCBbNV74Fys5VWyc4XEHO2oRh0/MNR+QkzYJcVrZkkn
+50nnCDZnrRf322XBAxun8xqVMMQ/qnWjbwKBgQCzG07zkPuFs3MDoVbySAJuar0lsBymzWvWJAR5
++loN5Vv4ImBhBmGj7zf4DGRFiL1GUDIZ860DLNlN9g7CJdQqxvU0O64o5svUjf1eOeEWRZsyFQa+
+veYWoygnhYA+ygnWQCFMXdCufSXgOqbZwaard6Ilq1QwNKzKudvIyUmW3QKBgCabJmjLRMJq4RGt
+Dp/vJxLFyJ+6HjmxLlBjlSboEPT/bUlqO0M5fQF2KeuzABDRjKhZYQoWp3WaCO4C4YuWapDeSNxd
+0EfnvfC/NHJPskLVBf0iofc4XO/vnExyTT3B2BJeaz0iWSm65KJ064cULhRbaGBXJtF9irWFKP/x
+UbdpAoGAF0TxF8d41o4g/5Wlbir0DK5wmEeGIuj6DCDVNiP//yUuQigRsLXLX3ctE6JkgHbLKQW1
+ZX0Wn3v7PnAxfkGXWHxLzWotnQ/142CoZeatNZpwRoiEtK7I9477EvXxz8lRWdXrcCGzqRpvWhoM
+DUZIeetLMuekFsGtCKw5oeKO814=
 -----END PRIVATE KEY-----
diff --git a/tests/data/idp3-la/public-key.pem b/tests/data/idp3-la/public-key.pem
index 2534bbb0..5fca3219 100644
--- a/tests/data/idp3-la/public-key.pem
+++ b/tests/data/idp3-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA60fXwZjBVE16Ma1wDp2T
-y/Ajdv4WNdnr4kQi+XxceOJD7ZXoyvgTnmRY65j2+LMLzmIfRZxpxKAocQ6n/npo
-f/IolJBJFaAIlgHfBUy9lJ1NTBx8LL/2vwscdg0Lie10UIkROyHLDBtVzcrvbkJM
-/9TtEvMtYBzaf0zlbogfIORxO7z1O8dwRUYguGiN6a5qjjJ2Q91YvuzoRwS614iC
-z6NmKFNsHqh/dq/NEviV64WSPZPfvHnw+gwywnggxZoyGwICX6iH7eRjI4YookiU
-3YeLr4gXYjWtAcrZnI/2ebzVI0USQNFy4rEw+1YVGVnCDJh5l+lIuOFrf8/YQy+3
-0QIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnH5cQ9RpkeFqkq3Mw3c+
+89J9Fg263315njP9JCmNVP3I0LkBRWVB7uA75hTMJ+WwdnbtfO8Hav8l8+x+hp1N
+ZY9q8WxoS+3qkf6XFrvRvHnt2GZS9G95QVp3tca7g0VJ+br2DHDMclTczz/+pG5C
+h2aRVZCSeCDSUcf7NTnyy6kf7ZEGYPrzi+AS434ya4Sd1o6CDyMdm5Ni0FEM+B8b
+FLQMlo7FZv1C+tOg4ZKm6YIh8TJz8zMWb5n4VtJSIh+OAHJqjdVIBdlF8B7Yk5cR
+o16zm031c9UUrXtVbNfURSEvjNrP/b4fr52uj42mUOUYl7ApLmcxZ7yBXkhNS32C
+RQIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/idp3-ssl/all.p12 b/tests/data/idp3-ssl/all.p12
index e76028bc..102aefec 100644
--- a/tests/data/idp3-ssl/all.p12
+++ b/tests/data/idp3-ssl/all.p12
diff --git a/tests/data/idp3-ssl/certificate.pem b/tests/data/idp3-ssl/certificate.pem
index 9a63247c..ce2fedd7 100644
--- a/tests/data/idp3-ssl/certificate.pem
+++ b/tests/data/idp3-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEUjCCAzqgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMzMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAyOVoXDTI0MDgxMzEwNTAyOVowMTENMAsGA1UEAxMEaWRwMzETMBEGA1UEChMK
+dGVzdCBSb290IENBICMzMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyN1oXDTI0MDgxNDEwNDQyN1owMTENMAsGA1UEAxMEaWRwMzETMBEGA1UEChMK
 RW50cm91dmVydDELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDBcU3wceDLK6MGIRgDH603apPdo5kpEmtqWmBqNanu3PbAKHIqRpCl
-8N42H0joFmmUNZ1rBdW77ADqnzQ1Lfs2E+iGre+PIi/3Elbj/vgO2to6usgA70DI
-UmU9riDxOIVdkUA7LRLipvYGdxnysD5Sdl9AA2aPlqqqCTjhq2TBFMnCZ0kecEtX
-IALRQYvPDcP3e/DND+xeFESW7P2QsqJyBpQPJO5tkV/CySoYbz/SRsbk6tBwj4NB
-d1loQI/otj9xUAn7p9mQ8W8YsnSsZeK41WfxJnyxEK0iZDuqnc42erQCz2yxAFO5
-IHcuF6zChAtxhjhPMz0y8x/wcbzr/S85AgMBAAGjggFBMIIBPTAdBgNVHQ4EFgQU
-NIqHCfDXW8usouSDmqJ+ubTaMc8wHwYDVR0jBBgwFoAUIRdbYb70RxIJdOBPjBXH
-J5Leu0QwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBSAwKgYDVR0lBCMwIQYIKwYB
+ggEKAoIBAQCl+MC0uwQkzomtSLtfRYvFX4KpoEHTjWkW7yGkwkPr8UZCl/XJF6mC
+XDLtSnTRUumlEGmGeJnWoFDhmYLXfTKzx7p5LTsdl1qLV3EzDmUvI5QgAOdTLIdI
+oxT4Hgfn9vB+eiKLRv1hMXT2Xc2US3OJKH3rnP6lTEckC00pPcbRNTV9d0EhuZt9
+T+CkdvT0u0VdhrWo477vOla3oGZkb0Pbg1ww4iX8W6T3F2/NcJJrbOQNBqIEpCbK
+cqY5/alV1AkWNykdjEySzCbWEM3HmAzY3i/RUDMInXoa20Hm/uWSWMvcQr2keDwz
+tCJWjdnIlYdozw3RpXMgyeYTdPhRb8+zAgMBAAGjggFBMIIBPTAdBgNVHQ4EFgQU
+HGll0EKx+BBdqtuuov4CJaOONi4wHwYDVR0jBBgwFoAUS5zFBe+QqjyWszzLZTvV
+Y8HGmOIwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBaAwKgYDVR0lBCMwIQYIKwYB
 BQUHAwEGCisGAQQBgjcKAwMGCWCGSAGG+EIEATARBglghkgBhvhCAQEEBAMCBsAw
 JgYDVR0RBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMCYGA1UdEgQf
 MB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzBRBglghkgBhvhCAQ0ERBZC
 RW50cm91dmVydCBTU0wgTGliZXJ0eSBBbGxpYW5jZSBJRFAgIzMgd2ViIHNlcnZl
-ciB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQCsapstmMJ12/Ut
-MbjA0mlVAg0gae5OoudN0jZGhiC8liHfxaIjcOL5+NtUNCTGO7JhY0JN7sdkepVX
-5ah0wspyIMWktEc2g1FOckRTwWamW8sKxSf3qNBIN0aHmuR/HERSaTTiPWsae4Yq
-zjv9OVoCafoYx8SIEyszMTn7wheNEygm1V7ek+XITLkeFd/pTf+prky25Fj3GNiN
-z7OHmQVW59oT25LEIurll19CGkJKnzoGU9EC0WkK/bndtU8TwE2+uJ8xYVvZ/2AU
-mou+RER+am5JmHxL91ymPNohQfKtyuaHcU0wILX6b5umU5zH1+WSHWmhIFD6ImV8
-ckzssASF
+ciB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQAscygotupTQaZF
+iMtRdsT2eDsLos7R1D1mmQYEjtDQNJJk0Yh+cBBq0NxAAMpz3bGwwgAGpoqeB5qw
+Q6SLPm0WLK6N8+tWHsx3rO9TKPrZ7g2fs6LgPeFXKehn2pT+vWBEvpnne2s5E+BX
+3vbaYS6UWPsr/fsOgPBUACUIrELg8PBR1spb2v2ABBdHiimoZCSujUgDF3oO8bUv
+nf2p6itEs39Ei8Fn/x2P/9HeF/hUofhY7Sh9q5rSSwgHlZ8gYYuNJfwXhAxpYMHm
+rH/YLW4XZ28YC3MVTFc97HTO9C1mywxkgus+u6ujcnWrouvFaqeDEPyBIjhh9hDf
+WlqKwfja
 -----END CERTIFICATE-----
diff --git a/tests/data/idp3-ssl/jks.keystore b/tests/data/idp3-ssl/jks.keystore
index 014eb1a5..969cc776 100644
--- a/tests/data/idp3-ssl/jks.keystore
+++ b/tests/data/idp3-ssl/jks.keystore
diff --git a/tests/data/idp3-ssl/private-key-raw.pem b/tests/data/idp3-ssl/private-key-raw.pem
index 5d62a0d6..d7d1b41b 100644
--- a/tests/data/idp3-ssl/private-key-raw.pem
+++ b/tests/data/idp3-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBcU3wceDLK6MGIRgDH603apPd
-o5kpEmtqWmBqNanu3PbAKHIqRpCl8N42H0joFmmUNZ1rBdW77ADqnzQ1Lfs2E+iGre+PIi/3Elbj
-/vgO2to6usgA70DIUmU9riDxOIVdkUA7LRLipvYGdxnysD5Sdl9AA2aPlqqqCTjhq2TBFMnCZ0ke
-cEtXIALRQYvPDcP3e/DND+xeFESW7P2QsqJyBpQPJO5tkV/CySoYbz/SRsbk6tBwj4NBd1loQI/o
-tj9xUAn7p9mQ8W8YsnSsZeK41WfxJnyxEK0iZDuqnc42erQCz2yxAFO5IHcuF6zChAtxhjhPMz0y
-8x/wcbzr/S85AgMBAAECggEAS/U3y4CL6nt6CkAYc7GOjMIWyeMhkxUehKZ0UYA8+ARgB9hZ6+vF
-hMNuHgZu1GNolb/vzkR+RspHGdnl4DPr/rIWjjviY2vjNbtHz0MhGIQrSQBq5KMN5xsjkfK8ELxG
-8hTFCfeLAODannNKBxfZgPvmLvam4R8iaJ4ybbqlV4Mo1pG155akuroOrGs93SsxziuDjRiWZb37
-ffjAmmlbgLV6F1qisWEwj+Ysje6p7v1X3BuaKMLhb/mLJ2UBdSmU2OzEI+g+PWYdyJ7Wrh/O//Hz
-KENyxKSpnE99MQbksAdg+ehRXn7GwL0epIvaMd/vZMlfZL2Pi5H8zlQeTew9uQKBgQDxZDaj4mKm
-IGVTdzFYcNoHPLx7DdPvckbKDZaBjwwbcGoxqQW3LTrdTAWZ+r3WTqOk/k8tESId9PVpLNQ1POrI
-XPnJA3XL5qWK+HwYRaWaS1zsOQ7PqrEcIi/emYag1gUZaWBAiU/tpnfyyXFDE3AdjReskHO3+18/
-5hIiQAoVlwKBgQDNJjzG9wyMRUkBiW+ofaWchj/e3uMjW0uWEqL/hsERvUx0apJF6hcugzEGg+LL
-hk97VpE64EhOztsAPSwpYyohKgHif03yJx6YrGRyW1iN/Gm1p1qilCMPgkXRMZl6Ym2s5AfmeL5L
-I4LmdpJAPli8hgSyuE/xCpkGQd+q4uqbrwKBgQCL32zF480TxBvSlHN0ctfzb58rkqSmz8nzFJKM
-ei4izC3MnssgDEZaqs1oHuHXh3PNjEqmq5HgV+vISOCiBK1q8m0OrEGaqAhukXOewOSnllm+y4Uo
-khjUW37vdniLQ9hqlCPg4W/+HgLNHSrTGjVR+kqohH95MWBM72y8ie0N+wKBgHcFBiHQ1sDSuaZg
-nB0+uER1Rr0AxvqOTu4EZfilr4GhN6ga5D4Xr9dWWa0T+xJlG9vMv3lPAeRm8nvTAboJRDn1ax6D
-CS/CLmgZLDWEdX36wUGYlGbaVvT6eZMCma59SHAT49l8l7p0Ic+fXv5SrZzCjBs7/3Uy1tDgiulT
-uRUVAoGALRpUIO+rRdb4RBg/siKPujeELeiNdVqoHk2zBBKMMiND0P1/+jRnh3tIJhJ86VO1zBnv
-aHxQkWl04FoFk/qmEtMDaJbZmVsfliegO69JJEZhB9+vgSGbBmHNrmmYYfwHQH3VL/41AqrWR/9D
-vsNDVMpsmaf9+mk/wb06A2my4go=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCl+MC0uwQkzomtSLtfRYvFX4Kp
+oEHTjWkW7yGkwkPr8UZCl/XJF6mCXDLtSnTRUumlEGmGeJnWoFDhmYLXfTKzx7p5LTsdl1qLV3Ez
+DmUvI5QgAOdTLIdIoxT4Hgfn9vB+eiKLRv1hMXT2Xc2US3OJKH3rnP6lTEckC00pPcbRNTV9d0Eh
+uZt9T+CkdvT0u0VdhrWo477vOla3oGZkb0Pbg1ww4iX8W6T3F2/NcJJrbOQNBqIEpCbKcqY5/alV
+1AkWNykdjEySzCbWEM3HmAzY3i/RUDMInXoa20Hm/uWSWMvcQr2keDwztCJWjdnIlYdozw3RpXMg
+yeYTdPhRb8+zAgMBAAECggEAAy5JQy1yXuI2cUO7k4/Zpea2slmH6W4EXZQnqOiwNI1jM1OGOlxh
+u0XZFAMhSgG0yJ0P6KvXBu37ntc6UrbridaCFGBxiZek/JaobLoR5l1gMVzTEh0AWrwFYtvwetmY
+slPU5aZupLY176LMldL8W9ySzTktCC32DxLIX8n3TXsXp8L+dirX7iWX+4FEBtcyVNZzLGyqgujv
+UDA+HSw5UlyT/swG0U5OSTLRQtjTZUD2zUiiaPFqi5NhlPIZAXhXg5lY+aUj23+ejpbPm4HXh2XA
+CjPIajvpunmyg5jMHfjvajWecYauJsBemJktROznhMZ+Uf2AoB22ooXgnu6eQQKBgQDdEDscSPME
+kk1ICoJjdid03amjRmuDpqEk5KXLspHFgX6RB73Gj76Qor/sqCCZc6uZFCjQv6gddACBl0tsYncT
+uExHZbc5I9Ap2RX13LAZXTCyQzcTqeNjMaRt+FoEdskkqFHo8KUNGUnw89VcbHkGl3INL2zVtxEL
+eVbL8PQUzQKBgQDAM5/4laf/EqYI4xOlCiZTwO1gEPlDhduYUkEQn3PQKykASB5WLzz1cxkMlwb0
+d66HqRVRw2Ouo4FlyrXqsd2Suq8/rm7b3SeYQgAaTHHuVrqmVD+5DFDs2DXPl4x6od50A6DMuU2K
+8FJGYsRWnOQobKxFBOgvBPcR/kswSc92fwKBgQDDImKrMxGhRWuGXhB+r3tgw5HMmIqrKVkxccuQ
+JU5bo1UPvF+eeKBkl+UGh9pO2jXs6EinC6bgaNdRjTV8tOYbuCFNHNJBVAWaCxBBeM7RdNtZX8+s
+QdiAZP+aOxFqw1gGTbYQAuwOxfXpBbOe4/lpAiIg1W4isHgRQsiFOWqbOQKBgD+VlJmXYQF4eOc9
+wDT8O5u/mogKdXwKH5CvvYizR4wZizHlqeuXKxKEZkgM+qcLpPiKTlxDSInw25ECU9Z1yziMfAeU
+PGaOLlgnlYMdwR85H/yAqKgeU/NWv86Sc03qmP5GaP7xWp7ZTE6uxAdnVe+tq/wVWH6dpOMV/mfW
+M0UfAoGBAJV3tCGFpQVeRaIOlyz7HHEvvoh6MnBEiadliKIeAJEJ+URnNWXLq4tAkGfPMyIKpeEb
+HYRKnlJzvQewO3C6mML27TlaqR0G9cT5b0ih9aKJ8krQvsWPEgr+nI6AaU1Wt1dwHV4440/dZkRz
+7fZ8xqd+6YEPPmmlmWrh83Jkdpe7
 -----END PRIVATE KEY-----
diff --git a/tests/data/idp4-la/certificate.pem b/tests/data/idp4-la/certificate.pem
index 4bcbfe86..4be927fa 100644
--- a/tests/data/idp4-la/certificate.pem
+++ b/tests/data/idp4-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIEKzCCAxOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjhaFw0yNDA4
-MTMxMDUwMjhaMDExDTALBgNVBAMTBGlkcDQxEzARBgNVBAoTCkVudHJvdXZlcnQx
-CzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+cU
-fjE1aj0UhzRL5/cqstMHwgbA7oHhlbk7YricULsAEmprAc4oIw1vAUGTZ9gjGd0K
-9SMgBTZFoMXTHvXLrQWZgq2A+Bq5f60RmdNVZz2z+Q+zCkQlqr6Ea2ZHw9hx3FNF
-r+zbXVzZT0nNHYoQG8A6bStBAu+fQlXqJOQlazYQmkYoyvur7ec6ApXpEbH2tG23
-SxHvYmVv6ISK5GiTkZCCaLLU0Urr8A4sk5zGQarAnTSXnvDw9McFP7V6shcVG5Bk
-08lwXZK9vwQpyMCK0VtzQmxtq7kykCyEfHKd28Un/b9sfWfGEXCHRWB/ue+ZE5pr
-N/bg1sGu0LK859AQxQIDAQABo4IBJTCCASEwHQYDVR0OBBYEFJLku3dPU3irgS75
-V23Q2+ulzDv3MB8GA1UdIwQYMBaAFPzHFsRLPTmffN3UkQ/VHEYdCKAlMAwGA1Ud
+QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjVaFw0yNDA4
+MTQxMDQ0MjVaMDExDTALBgNVBAMTBGlkcDQxEzARBgNVBAoTCkVudHJvdXZlcnQx
+CzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo7t+
+Y6cmkd6wwA2bOx8CFCKmip63r3C1Ovgrb5xXDDQayf3E/OiSRoxF2Ieuf26fIaV7
+r+nuUyUPdKXeT6SFcjbTjzueNv7K7YwqAykaQSuHZsvPD9RBFSuK4F3HUf39xRhI
+FiQgyPK9pAm+A10G0VLy6s1ENXH5QTD1EhObI6c6gUq4JC8QlIKSTK4qMi1lJyjB
+1k5dKPjONU0mnTs8ncfl1yF4uM95mUddPZXnBS0MeS6TvQ9qYwAzAeesFShMI5bL
+g39n+Ak1hqWQvsuVEqxG0BQAC7TgTPA1Dcm48isdxgwc0EqANlSZKvoLODa4IDvp
+s8dYt+JXYjVPMJex5QIDAQABo4IBJTCCASEwHQYDVR0OBBYEFHx+6odR0TZeyP2N
++Jxj0soMreRGMB8GA1UdIwQYMBaAFFOChTRLADjBJRWdXNGH2Kt/9T7oMAwGA1Ud
 EwEB/wQCMAAwCwYDVR0PBAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
 BQcDCDARBglghkgBhvhCAQEEBAMCB4AwJgYDVR0RBB8wHYYbaHR0cDovL2xhc3Nv
 LmVudHJvdXZlcnQub3JnMCYGA1UdEgQfMB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2
 ZXJ0Lm9yZzBCBglghkgBhvhCAQ0ENRYzRW50cm91dmVydCBMaWJlcnR5IEFsbGlh
-bmNlIElEUCAjNCB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQBq
-moV54k9LpRDSU52+INXCndlUk2cO+i2Er8yX9OWK79UoxC0vJ93Zv3ZhpbznsXwe
-utRvhelFDNjUVCkVgNc8HGHn38Jn3ukJWAthpKElbQD29XyeCXchPJdi6PSY2YXF
-LJk8ZbIjngI/axkPcpf9sE7ipzdrZul3sPgzDQsDqFq1nBs0QU0qaK7SykCYQkC9
-7OSJXokUkbfSmg0KW71/mGmuyS4rkyNkDrNzm1aX3lFPlCsIpLFY1u5gGb5aRan+
-dkcUjQ2LyT3eDacc4Wuj1lsQvCc7q4P9tbZ+HxkPjEZC3Rn7O6uue7GRBGArAo0p
-q4hFCCXpi2tG2wo1w6/u
+bmNlIElEUCAjNCB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQAB
+mGE6XP9EXbgZw0NLzZOh0J3qbOxpRIh5rFLDIQCVCDvWdGbE/sjU2ELLD4K5biqE
+eRLAKgLhSpIx2naJ6zgPBfiFIfJIgKjlrAwdeYWYoaQsfGCw6HhNRbjoikVdsRKM
+t4dOfxLbFlLFytql2bcSotLlZIIqjlCUkrw6MIjnPiAAoysThx6m2xydJAQD93tH
+WPULwZA/wE5ScTBnKEEQNW18LBhCmcpjc6qGziddqq5tYnSdjALfsaYgxHxapVTN
+dC89JqjyJMlUv5L0LABhORN2+Xc3H/FDj7bs+DtOeVxk+0fSzbu8cpjTekZBLw2N
+NTTP4DpVHuF/pInWlr5G
 -----END CERTIFICATE-----
diff --git a/tests/data/idp4-la/jks.keystore b/tests/data/idp4-la/jks.keystore
index fb7f330e..e3f2cd19 100644
--- a/tests/data/idp4-la/jks.keystore
+++ b/tests/data/idp4-la/jks.keystore
diff --git a/tests/data/idp4-la/private-key-raw.pem b/tests/data/idp4-la/private-key-raw.pem
index 287853ab..038e13c0 100644
--- a/tests/data/idp4-la/private-key-raw.pem
+++ b/tests/data/idp4-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDL5xR+MTVqPRSHNEvn9yqy0wfC
-BsDugeGVuTtiuJxQuwASamsBzigjDW8BQZNn2CMZ3Qr1IyAFNkWgxdMe9cutBZmCrYD4Grl/rRGZ
-01VnPbP5D7MKRCWqvoRrZkfD2HHcU0Wv7NtdXNlPSc0dihAbwDptK0EC759CVeok5CVrNhCaRijK
-+6vt5zoClekRsfa0bbdLEe9iZW/ohIrkaJORkIJostTRSuvwDiyTnMZBqsCdNJee8PD0xwU/tXqy
-FxUbkGTTyXBdkr2/BCnIwIrRW3NCbG2ruTKQLIR8cp3bxSf9v2x9Z8YRcIdFYH+575kTmms39uDW
-wa7Qsrzn0BDFAgMBAAECggEAYD/8VHU2GagrgIcXLbBm33LuPpChkfSNX/fIKJmscA9VwVuql3eR
-SrqUo6soweQs7ZCCE6U5ADzWMUYwmnS8aDg0dpMgRf2XgsVXgZ1YuxtNUUwv37C7dxXnvCrTxYbu
-eGp2gszz3+ZsThkwUblSUUc0TUQVtCUYsF+N30wyvaA3MTYH/M//gbrGp6iB2mZkaFZNEQXVgXHS
-NfI4k6WSBfOUOTU23VxrwnKtWxtDjT48DsRx0/s7dSBfvfqBBXKzTSOEQXrz1JRM6UjadgjPYyhg
-CmKtCoarB64Bh4QjkUrG4L3h1k8iWLjdQcgFxX/+T1Ktfs6d+dNHbxYrvp9mAQKBgQD6HJkW36El
-k0g5BviQdNzET0kmDlsij49NoM9usSjJa0s7dvmU+u+376P/3BifH5d+vUNrNh1cUYMv25Udf4Ir
-H0PGsaVDqh5rtnnhZFUU475U3Ei1C7QJ+AFvcGMWVAsCi7Zv9vSQ/JhFmHTqgnAt7eCgKy1CoP0s
-GIjF/+X5tQKBgQDQs/vn26n/KCgrZc7rF4BnKv7rm317Zu8gsXXVg9TT6wpXDsYocm51Wf91wU8S
-E7HdVwirgyH3q/jJjgNgTzdMoGv8S9rHnZtd50JsajfpSLVjW5dQLskRcAqzJ/NeTt+/RJTqFiou
-mEsy0xMb0wXXdUqZ+4qODaOqFurq4kLk0QKBgQCeTkWTlb5As0UuWzwu6tjlJC3veXyzllwkzVkd
-/eIMAu5eWALHCkF6kaKjCqNG7E8OOCsZC+pviWRYgUqTniY8txBGDiDFgEK6+IeSYtf7Xd8VhUw7
-04mEGcaGy4LcGhvR4654lb3cmxSiUEoIOMFaQMtBdbKzDoTQSUMg18SvVQKBgQCZqxydILmv/WJu
-ad0MbtaFoDvpQSkItsb13JS1rQcFLrgDWAaB+5fnYmfdzYMp/URmhFIG71wQYBikV6OWw10lV62L
-LFMfzaV7Y+8doqweYgHk8aidSoWUCFpohc8FLrBCxf2byswuWMZt2srkHuHbPiq67GKdq99JOuyo
-HAdDMQKBgQDWfQnG303Z+a4gtjrrHUdXQK+6R8HFsI6AOHI+ui4djjnqFVqosaoX98J31GAVJtPP
-DzVhix7Adn88PK02EJ+VmnXZl9G0NImINGehaYr4ymO6EGF7uEdEcjdqsa/g0z0d2CQYPhCp4qrz
-c0remeNH3XCYmJFiSU3H8CKK4ESHEg==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCju35jpyaR3rDADZs7HwIUIqaK
+nrevcLU6+CtvnFcMNBrJ/cT86JJGjEXYh65/bp8hpXuv6e5TJQ90pd5PpIVyNtOPO542/srtjCoD
+KRpBK4dmy88P1EEVK4rgXcdR/f3FGEgWJCDI8r2kCb4DXQbRUvLqzUQ1cflBMPUSE5sjpzqBSrgk
+LxCUgpJMrioyLWUnKMHWTl0o+M41TSadOzydx+XXIXi4z3mZR109lecFLQx5LpO9D2pjADMB56wV
+KEwjlsuDf2f4CTWGpZC+y5USrEbQFAALtOBM8DUNybjyKx3GDBzQSoA2VJkq+gs4NrggO+mzx1i3
+4ldiNU8wl7HlAgMBAAECggEAIQcdQ7TgDuTA+rzD53Ul0jH7LlM98mHl7PNKr8T1ujx4eu554hp4
+B0sce8VC6enCp+LdxGqH7LW5HGqpIZ+qW5O7sVTxYV6cSLbRcrnD1gmV0qKiLis+xap25TOFlYCK
+xEtVn0HCa0asAn8EmWEWkvsMjVjCvZU0FnZtuSvDS7mJUiRNS6JMarS6Hpmm44Tm/ohPIdlzzviO
+PtyqgGHSRiQx0j+4Q7b+BXB1GcS62pmrSC0cbPSeuSVvG5mkHl0qDGVxJPFZu+XwxHleufMWxaER
+uZ6mRq6nOC2tEMrEvxIQo/pSi+tkCwEYorl1aEW4nRJH6+FefRkAl9ouCIo/MQKBgQDZHyy/kf+H
+QTVlensUDtfr1SwKfn31T490dgcxYHVcnVl7I5q/BmJ4tcIzjACHVyxI1dhsv2AlR5XWT8CjaMCF
+fCEoPpEsBsMn0+eYKdpr8Sf1MvdLoN7JJ4MBh9kQWJiglbAmGLM8oseid3jYBhBncFQTolgxX0c4
+4KV1eOlCgwKBgQDBDPV4nGsGA5MaoaM3p6MJ3lrzaLBOR6C1s5kfMxWbEH6vDLp/EmlAeUbWTis+
+YrQLQFZLqo0xySbQPmpF8WVd5nFs2OfA1j85alrDJhBcyCIJXtQNAQKXmEev83guVb3fDoetyQ8X
+xBhRfGQmiWJ7sy4mMhi94KH676dwUkhtdwKBgQCTCF6IWLlfgdREJV6F5ctpBFIvxRtNbZRrPKaA
+VJ8FmfUHw8O+ivdSYVvjBnMxM+JkbJSEiFD2zfR1TkrZHk4J11ao5z3uP6IXLZRPYkBtCsGRdfMr
+/wP/2scH2VQwkp7BWL0R/3YZoO5qYleuiuS+972oEi+BN9GGffLui3QDOwKBgC6A26TZMSK6u7Xf
+l/yxIiIfcRNPdaD1ui3q/Ii6eorm901dqJMxsS75x+mZ3OrjRfGr5t3FUMvcY8AoONtuYfezqkEJ
+IxKdyY8gIor94VUoVKKjODuFscUoxqQI5ztqJhnUWzSuyTb1YtJGP63UzGd16zkCOlmLAhn7nv78
+ozvTAoGAHLPnSfHVnF5IN+5lqdc9Xd4xwCvp1OQ2kCaIQ5WdQhgRHmcDiElaD0EldMsV8TL+Tnuf
+rwR8MJKRyQIBfgq09Qrcrkb2MYKL4cKxLPQT7tCA80R8Cit8vipt60NqHctQ+TKEaupN/N1Qa615
+prQbB4mncJuqA2xXpVRlTtMrRpw=
 -----END PRIVATE KEY-----
diff --git a/tests/data/idp4-la/public-key.pem b/tests/data/idp4-la/public-key.pem
index 27c9cc5f..04f494a0 100644
--- a/tests/data/idp4-la/public-key.pem
+++ b/tests/data/idp4-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+cUfjE1aj0UhzRL5/cq
-stMHwgbA7oHhlbk7YricULsAEmprAc4oIw1vAUGTZ9gjGd0K9SMgBTZFoMXTHvXL
-rQWZgq2A+Bq5f60RmdNVZz2z+Q+zCkQlqr6Ea2ZHw9hx3FNFr+zbXVzZT0nNHYoQ
-G8A6bStBAu+fQlXqJOQlazYQmkYoyvur7ec6ApXpEbH2tG23SxHvYmVv6ISK5GiT
-kZCCaLLU0Urr8A4sk5zGQarAnTSXnvDw9McFP7V6shcVG5Bk08lwXZK9vwQpyMCK
-0VtzQmxtq7kykCyEfHKd28Un/b9sfWfGEXCHRWB/ue+ZE5prN/bg1sGu0LK859AQ
-xQIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo7t+Y6cmkd6wwA2bOx8C
+FCKmip63r3C1Ovgrb5xXDDQayf3E/OiSRoxF2Ieuf26fIaV7r+nuUyUPdKXeT6SF
+cjbTjzueNv7K7YwqAykaQSuHZsvPD9RBFSuK4F3HUf39xRhIFiQgyPK9pAm+A10G
+0VLy6s1ENXH5QTD1EhObI6c6gUq4JC8QlIKSTK4qMi1lJyjB1k5dKPjONU0mnTs8
+ncfl1yF4uM95mUddPZXnBS0MeS6TvQ9qYwAzAeesFShMI5bLg39n+Ak1hqWQvsuV
+EqxG0BQAC7TgTPA1Dcm48isdxgwc0EqANlSZKvoLODa4IDvps8dYt+JXYjVPMJex
+5QIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/idp4-ssl/all.p12 b/tests/data/idp4-ssl/all.p12
index 65bc71ee..be2a005a 100644
--- a/tests/data/idp4-ssl/all.p12
+++ b/tests/data/idp4-ssl/all.p12
diff --git a/tests/data/idp4-ssl/certificate.pem b/tests/data/idp4-ssl/certificate.pem
index 3b6d5b25..d1258043 100644
--- a/tests/data/idp4-ssl/certificate.pem
+++ b/tests/data/idp4-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEUjCCAzqgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICM0MRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAzMFoXDTI0MDgxMzEwNTAzMFowMTENMAsGA1UEAxMEaWRwNDETMBEGA1UEChMK
+dGVzdCBSb290IENBICM0MRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyN1oXDTI0MDgxNDEwNDQyN1owMTENMAsGA1UEAxMEaWRwNDETMBEGA1UEChMK
 RW50cm91dmVydDELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDcGMyc4QfMrF0fmHOF0tjGjYtq98DaaX5zSHdFxcS88Nw/w59pJ/4Y
-2YQVHpsKqDWu09kEK7ZryZ+vS6lGQ08G/k1AG7Ks6aECJXPSN76cEHOu7aJ6KOXM
-QN6CianIEOSIJge6jq6wO/TK41uNSJi66BfluEhnXV7L9P4UorrLb9usbeXx1ZOO
-hC77KxNcT3xrRnQv7+AbAX9kOSXDWRPSy3vrvJPSNdwWQoYdyA7Cswz06a6z0yRx
-Bg2MXjDMF3QazbWq+Q1j5FPCe9XUDAlIN2DT0+/0nF9ifhqWzv2f8P8Itvbz3XQz
-o5lo1ShQ7S5rYS4RlZuIhE7VzrPwR591AgMBAAGjggFBMIIBPTAdBgNVHQ4EFgQU
-vvBoWmHCxfSKUTlswR1+Wr4gFmswHwYDVR0jBBgwFoAUnUhJab6uTi38HVdXYx8R
-NvGkLwwwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBSAwKgYDVR0lBCMwIQYIKwYB
+ggEKAoIBAQC7LWIPLKxvqgWP2vraei69HkVJt2UUObsPLJ+R22AfdB2exLi80Mt5
+1F+GDwmjDg8UXK1CHplRrS0mk6x3NikpmhmdP9neLDNOZSGOlDMIZzJSM8giXfIj
+Msaj1K+QViiM+c1h4thQJEjHRpd/vRIA1qXE9Jjwr39GcnO3koX/mmGvDlFc7gzm
+NLobLnDl/DeTnb5qN5/xCkrUFMVabnsJvBM2fEKvScrV0rEP1crfFHuuw2IJKN0W
+lkHGBQzbodwe5L8wU7G1Xlbxuv0v9XRAPZV3AYBPSKvLsUe9l8s1M42qzx4cW2Ph
+k/EFAkx3nt3rau6+Nhk/DLJ6oL/MqA6vAgMBAAGjggFBMIIBPTAdBgNVHQ4EFgQU
+psm01Vu1bJ/DlJ37VNEpyp3/xP4wHwYDVR0jBBgwFoAUk9Q8LdTCVeflHtwqo3o6
+uu86hR4wDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBaAwKgYDVR0lBCMwIQYIKwYB
 BQUHAwEGCisGAQQBgjcKAwMGCWCGSAGG+EIEATARBglghkgBhvhCAQEEBAMCBsAw
 JgYDVR0RBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMCYGA1UdEgQf
 MB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzBRBglghkgBhvhCAQ0ERBZC
 RW50cm91dmVydCBTU0wgTGliZXJ0eSBBbGxpYW5jZSBJRFAgIzQgd2ViIHNlcnZl
-ciB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQAKBUovqbYpBFJf
-zLNndMP0QDvQysDajQfCTBKzyBkXp3MMwriNvqo4bbLpCHMpeGZrLQKtcWKSW7PD
-ZSxbe8W8GNHpTazYs9ReorA9i+eajuHvxhY8zbf1ymLddgnoB/AELdQzPC4zrl74
-fnkbYTnJzA/lmmLkDb8yshFxVYlr2BlPNKW4J6IqgD1kGf6PLbl1fHIuybMuzfdG
-Mc+5mIPLpDjoPR2EHpSS/myjaFJZ646sFfh/HCqlJCus+aWDavh1Uc5L7a3z0l4c
-urMGf87usRhKGJyocbCmXbIz64hWCUldIgCAuhlmKAe43U7w/wu0CSI5WxVyFMxs
-DdoiXkvt
+ciB0ZXN0IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQCI33z8vcUjGZJN
+4LaK26rb4T4G82+jGFpUyv+kDVBIf3WfYZ0ecSpxG9NT1Dw6kNcn8UyrRbj7NC+B
+g0/tcu+sxNgszM5z2/lN8uoprII0TxWzGF98GjxLxyjxw61ECoRNUZUt/4p2iXSJ
+DMq3mUp61RdU2kTw5M5+Be4TipXRZFD3FCALBe18U3RA4VMjsyuLXkGRw7Sv7imt
+rRIGKY7i1gsWDQTu25TiMK+m9NLYjpqMwnHIlMtmYMK3iOfiAFhUB2jNcp9Vnbz0
+9wgoTm/T+gaRNHNcHX54v0kDEN8s6tY4VuWoNhE7N74K3sJit/WJIoha6hTPX+PF
+JHjNcisk
 -----END CERTIFICATE-----
diff --git a/tests/data/idp4-ssl/jks.keystore b/tests/data/idp4-ssl/jks.keystore
index 28bd0930..267a6237 100644
--- a/tests/data/idp4-ssl/jks.keystore
+++ b/tests/data/idp4-ssl/jks.keystore
diff --git a/tests/data/idp4-ssl/private-key-raw.pem b/tests/data/idp4-ssl/private-key-raw.pem
index df96a0f4..841812ce 100644
--- a/tests/data/idp4-ssl/private-key-raw.pem
+++ b/tests/data/idp4-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDcGMyc4QfMrF0fmHOF0tjGjYtq
-98DaaX5zSHdFxcS88Nw/w59pJ/4Y2YQVHpsKqDWu09kEK7ZryZ+vS6lGQ08G/k1AG7Ks6aECJXPS
-N76cEHOu7aJ6KOXMQN6CianIEOSIJge6jq6wO/TK41uNSJi66BfluEhnXV7L9P4UorrLb9usbeXx
-1ZOOhC77KxNcT3xrRnQv7+AbAX9kOSXDWRPSy3vrvJPSNdwWQoYdyA7Cswz06a6z0yRxBg2MXjDM
-F3QazbWq+Q1j5FPCe9XUDAlIN2DT0+/0nF9ifhqWzv2f8P8Itvbz3XQzo5lo1ShQ7S5rYS4RlZuI
-hE7VzrPwR591AgMBAAECggEAe4+QjyHl9wls3if/8skD2bPs6QhdxEAlNSMhkpIMeOXfQAzamXZS
-ODEk7ZZZBAqa2KMl2imQJ8LxWr/nMALpgsuRIsRp8pjWQxYzh3i0EXlK+JF//YSoPZrNUAtovWB+
-a9Ct1hX0DAwcySoKY661z3gsslJak2zfozDO01bn9vyykmzPNCMpEwLTMqglubcKCFI4pHXkq0se
-etjUaYV3Z5VLWhAumKRWnL4/ePh1iWfC4oQQN24bc1KV24TMFAI6Pfe7skvCklCU01PFrAKTXcus
-qUofvDR75kK2Rs5d7HQEdaKRQ4nH+I0Za6VfSa4DbC0LnFmk8HMfeMV6YBGWAQKBgQDww6/zd3uB
-RIhcqU3vlEhCEqamxRjBO+980tO+Wa6QtMtV6ZKfV951iKlb1XVZLh0IuWkRn+RACKy5iSLRPS9I
-YSnXHx3HTHaUpRihwlEp/robR5tyBpvSPPpzD6XQqsyWEuSOCbmclgUeOj9H89TN4ffCx+cLCGFJ
-7ULgY5cg5QKBgQDqBk3T96K7k6fyraGFSs5eXYx67pubjRQOqUfoNBqdE8gEucaW9MhK/eUeGPQI
-5Ziol9tTzKOO8/f2kMSIaQLm3fmi6m8VkM9/vd0LqJQUHCEvlNtqA3WOkyB8GWoMGJY8shXTsR5c
-3BhCyfPtuswGn6ybe75AuBQ2iKhqePTrUQKBgCGyAWn9itdok/0D5Nhm1EYK/i/Q3coNbVL23pOB
-UaEG7H41lkOetI+WdL1ZfnbgsUeLS10gF32uuR2uR6Uo/vkOQCDPRgeid+YNxQi+fUV3VOyEdQjc
-S+p8hkCcLASsIr3OHxaR3dxAUq8MT9buFRZLTbWA7KDqp1MFVZq51WjRAoGAOvoDuxt5Q1ReyuW/
-AtxrTZS9xm1Dgdv35gn7OSWIX3WQvsAisABYSa3ag88+EM/rvPEoMOItheUt5FFvdgEg3hWqx8fU
-3tZztHmgr0N4rei45EjbUsg0ZA3n7d5pv0qi8gDfR04nnLdK1eoXMx4UNMcgtL5mn+DEF0oxR0Pc
-VUECgYEA6TBU3lUw5rmwaJOpwCoNOusnZ8vYYhdksfMVu3a6gNChjEKq1jhKw+Dh9CrOB3LJajNu
-RyncKiGD+5XfVYGkzlkyku8U7Sb3gpEVwtjeyHe4j777VOXP5BjEfiATh4T431UWR6Ww3I+fZ8hj
-0MltCrVoOgKiibK3AIDmH3SqJLw=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC7LWIPLKxvqgWP2vraei69HkVJ
+t2UUObsPLJ+R22AfdB2exLi80Mt51F+GDwmjDg8UXK1CHplRrS0mk6x3NikpmhmdP9neLDNOZSGO
+lDMIZzJSM8giXfIjMsaj1K+QViiM+c1h4thQJEjHRpd/vRIA1qXE9Jjwr39GcnO3koX/mmGvDlFc
+7gzmNLobLnDl/DeTnb5qN5/xCkrUFMVabnsJvBM2fEKvScrV0rEP1crfFHuuw2IJKN0WlkHGBQzb
+odwe5L8wU7G1Xlbxuv0v9XRAPZV3AYBPSKvLsUe9l8s1M42qzx4cW2Phk/EFAkx3nt3rau6+Nhk/
+DLJ6oL/MqA6vAgMBAAECggEBAJqAS4DbDzrczNqBlq7gS9QvOGIwz25yeMV9v/lVa3KLFigHmbXB
+YzOc6XxuzTWaVTgph5ocR9HzcGF3Y9TDEBcW7C2wltWdBnyfXaOjELzO8eqIc5pqkYQcVXrGBGTP
+uYkkaTNzW7pLOQfEbSkzl7i5dPuuKtABDL3Jm1rbx1/DUpLeSG9gf9IY8Yw3QocN5QVo9o77Pe7+
+vu5M1R2amFfIMBvohT1iCX/ApswrhMokjpWZlwBAgYs5jo5L9XFf32jCU6RFGUxkQBPdXEmhhPpr
+Gp45dUavZvuUBmA3deVw68DeoVnFXtxshCK3kQfd4qA/yZRUiSDg0b2xeRw6kwECgYEA+TUTcTG3
+o5cxNU5YABcjIIh+aJR0N/gycO3i3o7SIb5Nk8muGQLVeoCL0mWtI9wa5E1avmRVvygThGhdelmS
+QzUVB2Dabg2nUTujhO7lA9W3/2FdgFtqhxdMJ7O8C9rlYmxlreQ4n+UOOR1sivgdg8Ygvq0Ig4DM
+I+Aj/Jcg65cCgYEAwEd495OVl3vfYmZtH7kKGP8XyFuMEkmSzo47Rjm0eXaWg8wXrcW1oA4N+aKT
+fCD9kCOpFzeuO++YC7IuVM+lXMDDsi0YNM64jak7W+cfXKxR2Pl0W2sZqw0CAIUi5Itp4DMUs0PX
+FUxZpfaY6xHLzukVSmWv+2fjL28WDskouKkCgYA4zmN3KwkcTkuWRhyDMML+GH8QIb74PyhoW6Ga
+b93weSu/43o/E0lMWl8E/85e3T54CjYELmTpZR5F0XB1glN35HK9stM3wP8B4mFc3QPxQtdlbHFe
+3/fBgYsHhc34udYOAH2RDPPnZtQ+KrniV7qKnjA6psDJESP3jZFGc8C6UwKBgGsTYjn85gFF6lBR
+2dMgqI7i/8uDr60/a5G7gybIW8iIUalzrnwG7e4D5aRu9NLbTFlIgpF7YHvgITviLgrs15mff1tp
+4WEG/Z9l7rhvLPfevnWl9TYznkezJrpDafr76CoCSDTMQqqJqiLSALZnYqgHBOQ5XJcUc1+m7RGu
+1A6BAoGBALutqgkJE5Bmsk2oYowEol9nLb1UoJC8djImY1cLxX/am4dYqlwas6rkdvIpoSj4YoRl
+znhrkF4ZhHS/DSXhwKsyafU6vc3NoTxbRTqjSPVUpVACGwKYtEaq96IeIJQfTv8NLc94gwXSLMzL
+HnQz1HwuUZ/WicRiQJuTYFpi+p/p
 -----END PRIVATE KEY-----
diff --git a/tests/data/lecp1-la/certificate.pem b/tests/data/lecp1-la/certificate.pem
index dfeefba1..b8645090 100644
--- a/tests/data/lecp1-la/certificate.pem
+++ b/tests/data/lecp1-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIELTCCAxWgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjZaFw0yNDA4
-MTMxMDUwMjZaMDIxDjAMBgNVBAMTBWxlY3AxMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
-MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ8
-PmYmg5scsDF+P2VdLgMSPdEG3UaNSLOGxsY8GjC9/h+NSlHuOeZzC+Z6vxLe45cI
-f3FQkS+U6PE2ECKEtlvhHhhuQmXE76MPGpK/sUU5ygYtj+XJa9OL9NuSgZ1vF+he
-nFxjVpuX82Qq/FQvAVD8PlJ2/iYGnwTWvNKMWlYjxW+3zlAv83epQ0zuJMnGCIiz
-Dd9fx9IyNb0a1MsQsD9YJoj0sbQQa40x7KW7Bv5PpyeEqEOJc8BJvCE22tLGZm2S
-AcyT3TVZUedKRo9/AX8Rh7Jj1Pr8+ww2O9jFIn6+C3Rgviwjii8CiHCv+/FQoUHL
-V5FTVaueEEOIoBdfw7MCAwEAAaOCASYwggEiMB0GA1UdDgQWBBTlD6VuC+1iWfxw
-c8ClimYC6ux4MzAfBgNVHSMEGDAWgBS1EmhUEyG2WiZ7dP9O/ZucHnIhojAMBgNV
+QSAjMTETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjNaFw0yNDA4
+MTQxMDQ0MjNaMDIxDjAMBgNVBAMTBWxlY3AxMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
+MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMof
+7OXQRXTHA4L/SMiwo45+MjYBhoZglLZ86fGIvTvuQpYqBjfm52611VlFgYSaoadu
+Tl++wYKM67PH3b//DKpSMyugsWp2SS8MCcuem8AWHX0frzczP3NmAOwJbT3shk4P
+1yFXVFiTPN0V2C6zJYmgKWiMzuN7BZkIWesEsji2A6SBUDjw9f9cPX23kItFJDQJ
+EAMr+5Irdm0BvOCrUl4WBb7P76Pt3degD+KulOxNGonuW/+eugJa7y2SK6Cz6xdq
+KJ6eVaWIwxj556YdoWfr31iiCZ/hZqE6xfaGggo5C2ugYcTPBTqbJhAzaT8G4N7L
+s/LZYxTneHTvzBiF+NMCAwEAAaOCASYwggEiMB0GA1UdDgQWBBQVMub4w5UFr1c9
+g+w4REpXYvGy8zAfBgNVHSMEGDAWgBQ9UQFI3DP3wjTv2P4kGNK/EthaiDAMBgNV
 HRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
 BQUHAwgwEQYJYIZIAYb4QgEBBAQDAgeAMCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNz
 by5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28uZW50cm91
 dmVydC5vcmcwQwYJYIZIAYb4QgENBDYWNEVudHJvdXZlcnQgTGliZXJ0eSBBbGxp
 YW5jZSBMRUNQICMxIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEB
-ABNUTH9eeTDXCqHXNNsgG74DuoVIQ7xYyCFLjYG9ySKtDFVesjGPhN3+x3UbQHxB
-OR5RQyr+h7yHVaU9sxrdI0FvpURjArYh8fqOsIsujwHCkiIM5KTmI+WScIJ5PzFX
-jHXM0u66WvVRLanvk88fNeJ1I0JEe83WWQZE5Sn5KFd8iXiOEwsB6wfw35JB1w/K
-TjjAiwvqS/wLpshxWTR8Kx9hdEoO8lB+14rEa5BLw6TXXz9BZoIYl3hLdvRKX74J
-YNzKMzZ0gIIFBqN2fGnDtuxxtoLGX+HgYiayF2oSbe3Z+wSMld3o9N0NOtcaXnx0
-jTsGBkk7n9NtKS9vsrBV6eM=
+ACcA1SNLvmB54N8DT6JMyMZzcW8LJstz12iYONRh+xF870vwUtY01+1lTx4jLd2b
+Gib+YVifbCqBls/kxQzWEmrv5q1kUy55gPXvluMxQNNQ1zpYRwoedDI9IPFyglkW
++UuikGXYa3aIxdTdqueOQdrZbYmvPxue5fHAFkP/a+/oT0Z1bNB3bm1+OifbXLjx
+LsizH7eBTcINl87QrKFBnXvMmnJ3kscIlwJWIkb+yOs1+jSC0GDEiOdR7ka4VcKW
+bBUw1D3V/0OG3zodjdcJdFQucU9A+8Yd/j11WhLhIbWSsPxSz3tZTs5o/lJUcSIK
+fHSFaKjwGwn4jO+PAedGHTY=
 -----END CERTIFICATE-----
diff --git a/tests/data/lecp1-la/jks.keystore b/tests/data/lecp1-la/jks.keystore
index eac8812f..3fdbe532 100644
--- a/tests/data/lecp1-la/jks.keystore
+++ b/tests/data/lecp1-la/jks.keystore
diff --git a/tests/data/lecp1-la/private-key-raw.pem b/tests/data/lecp1-la/private-key-raw.pem
index d0e69d74..d76ffd08 100644
--- a/tests/data/lecp1-la/private-key-raw.pem
+++ b/tests/data/lecp1-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCyfD5mJoObHLAxfj9lXS4DEj3R
-Bt1GjUizhsbGPBowvf4fjUpR7jnmcwvmer8S3uOXCH9xUJEvlOjxNhAihLZb4R4YbkJlxO+jDxqS
-v7FFOcoGLY/lyWvTi/TbkoGdbxfoXpxcY1abl/NkKvxULwFQ/D5Sdv4mBp8E1rzSjFpWI8Vvt85Q
-L/N3qUNM7iTJxgiIsw3fX8fSMjW9GtTLELA/WCaI9LG0EGuNMeyluwb+T6cnhKhDiXPASbwhNtrS
-xmZtkgHMk901WVHnSkaPfwF/EYeyY9T6/PsMNjvYxSJ+vgt0YL4sI4ovAohwr/vxUKFBy1eRU1Wr
-nhBDiKAXX8OzAgMBAAECggEALvlD8t5wBIKoXF49kQ/U7DoAyuJjmg3U9GqkJcfrnKhkGSm2RZnM
-4zmkCCSF5RGEFFvILqpli4BFTjZMSMlktQmqQgPCtcX+y4tOExEgNnffE4EqPe+k0SgkaSVFt4ll
-YWKFBEugn5J+G/60KfO1BPtd65YljRxw/XUGfOMzYzfWWUv6OJXTZNhE5ff1qN3uQHCis4E4iz8F
-4cbZLA/BYAYm6SYWluYQmGWxSGRRufxOwp48pfVRWLDlq+l9pUWnrRENej6MEee1IPIg1u3fpf/5
-ngaKmX4EZ+GL1OgeXztnUJRACsHLsYqYJR2lJr70Sd+HuP4k1BQEhUuJno+1AQKBgQDX0emlpVOR
-i2K79TJVZskoPsPmaR5brZnt3+qvAJxW0tymWkeUjQ4M7Z7TyxQpl2KbYmxdQit83xwpHWEE3b/w
-LywBpf5qFUBkP7YCSLDhvcggeg+k19BfVN0vVYwHMEdbY0vw+eTGev+GxGR2AWVaZ3f7QKp+33H/
-trVRZlZaVQKBgQDTtvF9ncyH/5NTmVLpBZsq4XX+jfHtJTHpVhy/3r63tJBLtdhWqp7+OwdRKh+X
-IlMH/Hi4LrIpBEqSHMhlLIu7TyE2mktDYsW1AbZv1n9r7XaHi+sYY6PaUpHAL89hfZOQESWnNvep
-xMd+WkeSOIapCYbekDdbg5xDeCoApjY95wKBgCc/RywWaqIXJPdlWafqLz6gW2O1Tg4B/fIiPD1i
-8QthATtHQ6kiFaIIPE/rqFj/7LCxL1+uPtZQhIB9lT0bTmJRUcFi/GcyQil45JJ5waDrsE8no1yo
-2n3bovWOqw5Lm05lOlQyPYZSq9FIObS0AEh2dH0+f0LfQ43rHgIViDKZAoGAc5rv3tHtv01VW07b
-sRY4ln+qeKd1tTKcQHefFz5AEfvs1wqi6SAd1WDSLAW+Xj6F7FR2bsxAyJjpR0OkQWrDmjIpRrGV
-62Ph5WbcAdG0nnB6SqWiaBzweeSgZbs1mFyD2SUj1Fz1e6RR8rLFZhirn13uYVWKhNQm3cid1uDr
-uX0CgYActqNat3CAltcHiMwgJvCt/fUN+wEs+f6Kf05CU0hjRMTk7OWGT4mUManXK93fcNsugVD7
-EOyTW4q0knUIi21djM4n4W6zCa5114fBdC3tDUCzBmySsIeRlY2Ibj43l+1OkS4ZzP9ZMIboQ8S/
-P3viGEoUPX+EtATTc0n2iAuC+w==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDKH+zl0EV0xwOC/0jIsKOOfjI2
+AYaGYJS2fOnxiL077kKWKgY35udutdVZRYGEmqGnbk5fvsGCjOuzx92//wyqUjMroLFqdkkvDAnL
+npvAFh19H683Mz9zZgDsCW097IZOD9chV1RYkzzdFdgusyWJoClojM7jewWZCFnrBLI4tgOkgVA4
+8PX/XD19t5CLRSQ0CRADK/uSK3ZtAbzgq1JeFgW+z++j7d3XoA/irpTsTRqJ7lv/nroCWu8tkiug
+s+sXaiienlWliMMY+eemHaFn699Yogmf4WahOsX2hoIKOQtroGHEzwU6myYQM2k/BuDey7Py2WMU
+53h078wYhfjTAgMBAAECggEATUEgkcImGflLDVG3pwVkrjzrwhqZKVlW3d0mqavi8Doj9zM+xzUZ
+NgaH8iQP2fgkW1Nc31mQqu5j1IZK6mx4kczzQ/Saex+U30eRouMPkr6hLMbkeIu878WICq+bsnRp
+7QI+7r5rPaOhOrtzsn3EljLCQPS4yteljxVTEPHtkKDJ9tn7Joyv28GbyhnFvknrKa0Mv0X2bId2
+m0Qz+6h9aMCKBtl2i+tH3axmyXTn2sfMb88nhgiWU8bSfx+EfR4nFYdzbAvvV3W/bJ5Fq510L6dn
+uhPHljxLGjXDyOqba69YR+VHLLrQU/H8qFVgIsxKY8OoiKAjf//OgbabEB3lkQKBgQD/oF/ty5n/
+diBHxlNkyxE5MYjb2oxklmBg3Iifk0CbN7c2+NoEJ44rKgOut8W0QZpAM3XH5qvttjuYmCTbC6k1
+58MACKHlDx2GDY4AC1U47UNs77gAfldOf7zH4S76WkDHh4c45jcOg8dEi58G8CvS7naPJtlxl94i
+OZjbHdP4mwKBgQDKa4lfZYXozl4WxU4eKFkFqEl2FZtkeLFUGmS+VwIx81eyZg/IVeCAnwjRpmky
+RCevctXqASz3ZsZJ8TEkwKI3e9j7PBuoZ66cE4yqvvCYVpCzuICMb+Bwd5OJSFiElnaQXVUBzwdZ
+v4WJ6LbsNuqJKRAqhwIT+BzHv/klDYf4KQKBgHKpqH4NBu3dOcuYPY4HvJkQDBi6JqF0BpVMNwiF
+T8SQMGG7LGgSqiXYecBkdI1Po/ZKXvmlEdfWF1NyY43R5Dvm0sRwGtaZeh/Icrq4WqjnXIg/2yR1
+h4oRqEdsTdtEoqwdsd0m/ulG2Rp5GoNNNgsupgW+YmkeuyhU96jJ72wjAoGAJschIwhk9euK9NvJ
+kldybnYF1Lxg74d7mTwRLrGmdwFCPKf2wA9LmfhdjSRPJNUPsTnTpyeggKjMtd+h5YON0AlG0SJ7
+vfBW8AmCujcoClcTE4r1/XF1UrZlqjgU1RmqDxACN/18UAIzx+6wFGKU3b/jG/KPQFoY0V+CkEme
+UbkCgYBC0MuD08rleEF3cN6gtwWxJyYFO1+LbN09zmydqiAet8jchecQ5gs4oiUp/AIREWAhRRq7
+WN6pI6I+DmiZ/dyuCTCIvzY8Apa1Dmb2t+2BtNmM4e/w2Ia+CkTb9NSOF+XKJ2w+U28zMr6rIg4Q
+t6t/iCpOEPqo7fxZd7QvWkw5vg==
 -----END PRIVATE KEY-----
diff --git a/tests/data/lecp1-la/public-key.pem b/tests/data/lecp1-la/public-key.pem
index cb3d13c1..4e12ae17 100644
--- a/tests/data/lecp1-la/public-key.pem
+++ b/tests/data/lecp1-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsnw+ZiaDmxywMX4/ZV0u
-AxI90QbdRo1Is4bGxjwaML3+H41KUe455nML5nq/Et7jlwh/cVCRL5To8TYQIoS2
-W+EeGG5CZcTvow8akr+xRTnKBi2P5clr04v025KBnW8X6F6cXGNWm5fzZCr8VC8B
-UPw+Unb+JgafBNa80oxaViPFb7fOUC/zd6lDTO4kycYIiLMN31/H0jI1vRrUyxCw
-P1gmiPSxtBBrjTHspbsG/k+nJ4SoQ4lzwEm8ITba0sZmbZIBzJPdNVlR50pGj38B
-fxGHsmPU+vz7DDY72MUifr4LdGC+LCOKLwKIcK/78VChQctXkVNVq54QQ4igF1/D
-swIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyh/s5dBFdMcDgv9IyLCj
+jn4yNgGGhmCUtnzp8Yi9O+5ClioGN+bnbrXVWUWBhJqhp25OX77Bgozrs8fdv/8M
+qlIzK6CxanZJLwwJy56bwBYdfR+vNzM/c2YA7AltPeyGTg/XIVdUWJM83RXYLrMl
+iaApaIzO43sFmQhZ6wSyOLYDpIFQOPD1/1w9fbeQi0UkNAkQAyv7kit2bQG84KtS
+XhYFvs/vo+3d16AP4q6U7E0aie5b/566AlrvLZIroLPrF2oonp5VpYjDGPnnph2h
+Z+vfWKIJn+FmoTrF9oaCCjkLa6BhxM8FOpsmEDNpPwbg3suz8tljFOd4dO/MGIX4
+0wIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/lecp1-ssl/all.p12 b/tests/data/lecp1-ssl/all.p12
index 759ca6ed..9ece760c 100644
--- a/tests/data/lecp1-ssl/all.p12
+++ b/tests/data/lecp1-ssl/all.p12
diff --git a/tests/data/lecp1-ssl/certificate.pem b/tests/data/lecp1-ssl/certificate.pem
index 93fc7bd5..033a003f 100644
--- a/tests/data/lecp1-ssl/certificate.pem
+++ b/tests/data/lecp1-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEVDCCAzygAwIBAgIBAzANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMxMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAyOVoXDTI0MDgxMzEwNTAyOVowMjEOMAwGA1UEAxMFbGVjcDExEzARBgNVBAoT
+dGVzdCBSb290IENBICMxMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyNloXDTI0MDgxNDEwNDQyNlowMjEOMAwGA1UEAxMFbGVjcDExEzARBgNVBAoT
 CkVudHJvdXZlcnQxCzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxGHQrXFqwV5Z+B6a2XaSbjxh/b6cFUduk5vVwySRfMCoCl4EVJ8j
-+oXLmkygEI4uPB7gxgsMDK39C+xsPfWGBrF5CuW5l3DBKCoff4EOCgSGnKWlK7to
-2gaOna27eRLmGjWQNW2cqUgnPq772qeGtepp00gI4i10uDQBvGoBvcsNfl1AsDMR
-0CMqknTwGiXu2A6ETFcQfOMIe0epw209o7qBVtxbSvdQmnohH4EjCFK6R+p9NTP7
-SkyuwY46/O4obAsGyYOdtI/0VTDgTS+NAnCBX2CIzakG/onuOCaUYAvEn1WJYdIp
-W/hjD7seUsTvdeqv+Bbql1CQKHtajlbd6QIDAQABo4IBQjCCAT4wHQYDVR0OBBYE
-FBP4C1VyjOgu4/OonjA9JCm11vKpMB8GA1UdIwQYMBaAFOK/oHfFNJ8cGOMXTbEU
-lhfupkKdMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgUgMCoGA1UdJQQjMCEGCCsG
+MIIBCgKCAQEA/S896fmUXTpBzzDK27l+YhraFKffizXrfHlqix0dZVvMMNZYQ6Vo
+TRbK9lvuQA13ykKJIkwqks6/yl1meQABUAwF2N97qqOCpoZsTgornvl/XjIAFHio
+B9kUUtC/xGQAZyPWzc1ri95oVI3nY+NwINK/ihUi2FrtGGGCOIA01q9lr+L3EXHl
+sZltSwb49wcoyeIm+GAnBeKFnR5A0IpTfL0QdJILGiFXnxZYVP9i8JiJyZJhoxSU
+BtgntK2D/Hc60nYivOs+QxSotwuaPbTa3Za5bPXi9+2/XQtrgrOczk2gQmKORuHz
+b4eGwBHt+inGmV+0KY/uYX/e7yH/OAciiQIDAQABo4IBQjCCAT4wHQYDVR0OBBYE
+FD+IB1sGgAS1j+VPTS7QUs9U3bvJMB8GA1UdIwQYMBaAFCmBrmt2yjXJWjs18g4i
+BkI/YOE7MAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsG
 AQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEwEQYJYIZIAYb4QgEBBAQDAgbA
 MCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIE
 HzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwUgYJYIZIAYb4QgENBEUW
 Q0VudHJvdXZlcnQgU1NMIExpYmVydHkgQWxsaWFuY2UgTEVDUCAjMSB3ZWIgc2Vy
-dmVyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEBAGUk6/i83HlW
-QkczdvIsF3whVZELrW/ytTMSqLsY0poEJXnckILnUAdkiGCY4D9Pv5pp1SK8+hKM
-40SwZpIDP3S2cRw5O9C3LGrfUuQUPOJsOEUBfDp9HdtHyPz/ODoADRSmgH11bt88
-/hjbEJ4kQ4G9zFQ9tupdK4tMtLwaHcb6Ou3ycWpbtdU0gPi02K/gVqUA1EWUJepY
-kqhoKnRkSb1hDbKWZDD1YqLpqBRBEc8vIq3VjM7SIOqdiUXlMSK9tLG2vtkjM9zS
-uqFHFyF8R26MY6gAYXOm8F+EH71JssvksRokJ80Wyth7hMpt6sTomkaqLtIkWX11
-CXu7dwyBM6U=
+dmVyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEBAG4+B1/ngR9I
+ml0ol3rULhv53Yy4YufOmwxFkT05zxizGXdumqzIZGgyWF9PkYzMlh15F4dSazxq
+cC2f+KsjXohA08WLozA61edmw9VPepkZzqZcH5TB7POyCqZdTBeyQ2lwkPuPI8l/
+++w5gmTuRCISAfBvJgQ+f38ivVsseJjK7k0VTYVablmMrYbqgjEDgXqVGTdPqNSi
+jqZBlqt7vd2LFdZstp7tQmyPrwpwL34QcnG5hwe0YdvX3TaHnAhukqDScAsugjW/
+Gu1EZgt5GQbAE3ITgnCiBEy3s9WF44kbqTOLEbCwRMZ1KIy3jkUlH8+UdPN7VNIf
+Kg+4HCDoWO0=
 -----END CERTIFICATE-----
diff --git a/tests/data/lecp1-ssl/jks.keystore b/tests/data/lecp1-ssl/jks.keystore
index 3af2cf94..eafb96e4 100644
--- a/tests/data/lecp1-ssl/jks.keystore
+++ b/tests/data/lecp1-ssl/jks.keystore
diff --git a/tests/data/lecp1-ssl/private-key-raw.pem b/tests/data/lecp1-ssl/private-key-raw.pem
index 6f9c1892..5c66cda5 100644
--- a/tests/data/lecp1-ssl/private-key-raw.pem
+++ b/tests/data/lecp1-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDEYdCtcWrBXln4HprZdpJuPGH9
-vpwVR26Tm9XDJJF8wKgKXgRUnyP6hcuaTKAQji48HuDGCwwMrf0L7Gw99YYGsXkK5bmXcMEoKh9/
-gQ4KBIacpaUru2jaBo6drbt5EuYaNZA1bZypSCc+rvvap4a16mnTSAjiLXS4NAG8agG9yw1+XUCw
-MxHQIyqSdPAaJe7YDoRMVxB84wh7R6nDbT2juoFW3FtK91CaeiEfgSMIUrpH6n01M/tKTK7Bjjr8
-7ihsCwbJg520j/RVMOBNL40CcIFfYIjNqQb+ie44JpRgC8SfVYlh0ilb+GMPux5SxO916q/4FuqX
-UJAoe1qOVt3pAgMBAAECggEAd+b5EEzlT3caG4IkLY5VzXSUp+bPSba5buqA04rqQW8nqlzI7BnW
-T8mNDIKoYDNPS2nW91QbYUqB69vIIvRbho6pRtwIOsyfQrSlUqYrOjaVMeN5O4BLfoLuZJuEkWHW
-mD4H9HceZcUmIQGZyGDswPmE73lV4zK5xxYJ0U4wDf5t8zTOVWuCyu7nkkZLzc7F/1uZ29NiW532
-ZvcTigelVgwQ54KBo/hbbLqgupgioZz63hRXaW4es7M6w4Bns046flKFcrPfmpETYZMaGHoPGpGx
-LMlDVBk+xLnFP+sPzftSHg8uYNV0crN2QBOm927/I/s+wK2EzjwRHkXePJgomQKBgQD/jxi1M9BR
-s8e+XfrQCnJp2VP7t4jklVvcMtYOs475/p/l3Y6d6m51TCw0N7uj4eTyTKIg5CrCW+Eww6e/zO2f
-CHp0RXOGygOJBq+9VufE8ybKaFMB+MsqO1pRBcxb64kOXJ0/C/ov0eKQS3fdUALZxlrceKEP9lYk
-1H3+Lf2BHwKBgQDEuJMp2seAQh5fPE8Kzquz48iqL5xEjhKN8fzecuxu1O/6trADyazn0B1YIwWh
-/nIAKPEwH02GJ0ibzPm+WmGeGfITXyo3TIG1q4mfQqsuBfEvIzUW9t+cG1tCfcEi/YfXoqO860vh
-lc54Kh2dmuJjxUX6f8dNAnLrN5cR96qX9wKBgBrAE8oD3m5u7x2SIMreDRPfV9clYwLqT29BMv7e
-9LxeVsZs5pzJCT7l9kqQ+ucwohJqyx2+RGuLyoqcMFb3UHgxHwBEtM8LHkudk4+yJRiMiybsvKOc
-M0f8ZnvMq5ODmBkUwLD0w/91bM3F2Iol8eZxyNkDF3jgRCwewgF1Nu/pAoGAT8K2iGXYNbyZK+v7
-8FnTbGCS383mAjXIeB0BdgAKtPVJR9ICk8aVgHf1LeMlSYUtG7t97xECEb6jxefZ6sAijEPgztHq
-//jZLpuadSRG26Y1H/OadvEpwNWmrtLmGBXLmjarRNHyNkjTKg2JbHl8CQ/XS7W7TRINHimv6u0M
-EgkCgYEAkkltBb3KYAcTxT3rMTsakSINl8kfnSjgekLqEYZnc2mm+P/Qqz3Ne7jRoIAnBb3dgSp0
-iirF9zVznN2GFcCU9SzV+IQE1eqINRhwW48CnxM2dGGtz4Nuv2L46jr7UN2AhETSgwjLi4uQ2Rdi
-Svdrwq24wMGAKT50SIzJmaVUjl4=
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD9Lz3p+ZRdOkHPMMrbuX5iGtoU
+p9+LNet8eWqLHR1lW8ww1lhDpWhNFsr2W+5ADXfKQokiTCqSzr/KXWZ5AAFQDAXY33uqo4KmhmxO
+Ciue+X9eMgAUeKgH2RRS0L/EZABnI9bNzWuL3mhUjedj43Ag0r+KFSLYWu0YYYI4gDTWr2Wv4vcR
+ceWxmW1LBvj3ByjJ4ib4YCcF4oWdHkDQilN8vRB0kgsaIVefFlhU/2LwmInJkmGjFJQG2Ce0rYP8
+dzrSdiK86z5DFKi3C5o9tNrdlrls9eL37b9dC2uCs5zOTaBCYo5G4fNvh4bAEe36KcaZX7Qpj+5h
+f97vIf84ByKJAgMBAAECggEBAPF9lAKN6bOak5a6JWO65A9TKVu2W4R+46QQc01JcfZxvqt+ZyXu
+qTOOX/zn5rH1pqKnIAI0wA7TYR/2Qn17QcVGEnWvhFdYKpAHe1pcXQr/UztXWbgs9ai2p6nuLlt2
+PuQhzQrzunbopn6v81rVXugP3F4qltfism8k4n5d2whA0oRwI4vpdoCPBUd/51BaJy7HCxBklxVQ
+/9OtcPvA8Zw5yD6qSdg+3M1ALij7nsXpjva+MUI+0aYXMTmLhH7pC1gs7zo/EqghcoiVAbNvTrPk
+t3sjClic4anlJ9Nq1aHG+6tTpvfOopA1hPpsJO0fSyn+JD0Y+RAaKp1pfmINarkCgYEA/sXWvEeg
+Mm75+flTxWr3TxjHBjhul3k/qp6MaeVDGXmcGaYzA1V4IdEifRz1kAF3ZLy3621Z7TSM5Zlg9t+A
+lRO63f18Bz3uDG7eW6cMeVgq/sZoi0Shc4/eKLoV+b1QulrrcOQRjBerhnufwW4m3WByRc3iSYQO
+Eaf4i1afEWMCgYEA/mdxzW0SY3ubgNLOFHIueBReNdfWVkfLBq5Hg7aQMR7bUy3Mev4dovQCu6fI
+7AQSW2C4poyuX83w94TqOMnJ9T9AH7zHiAux25AmdAfsMwSI1UumU4hhyY7iHMjiI71Vd1yBPL3+
+lM5nI73RuJgmKZ7Y2NDM2ZFU5NxWqGz11iMCgYBbhcixVG25EGLeqPGuDtIO6RC+LFGWOqljapd4
+hzKGmUg5cpoKzY5dX5qrJVcVx2EToDPV8C+I5gLjjCjoJrwzUaYkjyYaF+ZHMyDP/f+eK80uPypZ
+NWtmbz1YlhjE4Xx5paXEpTmkgPBOXGS0gRSXHEmQx/hNfpHrR9MigxibjwKBgQCGpzoVASY6gbJM
+/UcWi1kNNbqnxRYtlNJhNt2jWX34gdyUqikQ8G+/UGgh6yztvzn4I7mYbd3d16MzX6aZaDT9Gf1W
+zxTNbWM2U5YG1Cqw1jWWr/PZQtZ/WKFVmv4W7J/QDaZaADY/jQAKau4WRnHslacxG1NR1RqaCAXW
+H9X/AQKBgQCYTOzm8ziKH9xgusVg2pwe4UE3E9n6IK5Jl6Z9Ymwi1vXYd1Vv07X1v8CrEyhqT/77
+YaMpjdbGnGJLGf5otASgNT6KZ7OimGSzTRb/v0NjYZFu7IMlK76yjCNFdNMMcm8rlqNS0mkYiuOG
+xNLFlYPrUE56RApavuNIxJYleQ8v3Q==
 -----END PRIVATE KEY-----
diff --git a/tests/data/lecp2-la/certificate.pem b/tests/data/lecp2-la/certificate.pem
index 669bfea5..a5ff9178 100644
--- a/tests/data/lecp2-la/certificate.pem
+++ b/tests/data/lecp2-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIELTCCAxWgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjdaFw0yNDA4
-MTMxMDUwMjdaMDIxDjAMBgNVBAMTBWxlY3AyMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
-MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3V
-84ZUxJZ7EMG2tRkL05So11dlq7hqaImdf+UD7zSdhveAf2+ZtXcF4CgDZW2xEG8+
-tETpeEX5fPOsiryEtkEt7IYu0YKBS1qCs8JclF3+CLFlpBS6wM92aUykG8QRHwmN
-PWCqGgJ78P8vVcbGCif92hlhfkGyqMRFG9mc9nLeRMsW5ImoLo3c92MmDdpVq7UO
-Cb/m56O3ACqXbGLTAq5gtsnX1A3XNJUbD82Bqt98GzMhZtviM0vMIVQm8alj/hlf
-BfnEiFt5GjhtMRmg7ybtQlM0wxFUsRlEu8vit0VWTHfcCzXSCpzi+0KK22xo5PJQ
-lGN+1tahrPVppxwY4zkCAwEAAaOCASYwggEiMB0GA1UdDgQWBBQqYYayRqMrWl62
-aN8uVzoy69D49TAfBgNVHSMEGDAWgBQCV7Y16+xpaKvYKF30EQJPqvhuUjAMBgNV
+QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjRaFw0yNDA4
+MTQxMDQ0MjRaMDIxDjAMBgNVBAMTBWxlY3AyMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
+MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO6h
+ttYThwARFClGBfjO5PY4Eaj53D3L3cbqfouOtkJfVrVC0kOinrl6QSOE+eHjCWlK
+asgpn+hOiiUfSzeq02FAxjWMCevUsQ9f3LgkLZXlFLK9IAofUV1e0LRPMyOdN8BM
+cxUJ0RyuZNZC8lVcJITgKyQ59e12VCLtKHlRH7h9jFYjZ7gtLUUcjV0HGoBY5czs
+DnMOLxmnbEZKkJyVxvYwLFS/GBjBB2iBClctvRx+wouWOHiUVoCLRliZSJz1O8rQ
+PCeXZ1OjfD3G7yG+pXUEBZ/1MLc9TVsfcV0yV8ZWqJ4zyWDdAJi1KjcNxyH3F1yr
+PZNR9/0Owpp5nXejjmcCAwEAAaOCASYwggEiMB0GA1UdDgQWBBRHjgSphNidmraU
+Bahll4uAqN7y0DAfBgNVHSMEGDAWgBTyIFXlq5Fj+PERTuwR2/sLr54UcjAMBgNV
 HRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
 BQUHAwgwEQYJYIZIAYb4QgEBBAQDAgeAMCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNz
 by5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28uZW50cm91
 dmVydC5vcmcwQwYJYIZIAYb4QgENBDYWNEVudHJvdXZlcnQgTGliZXJ0eSBBbGxp
 YW5jZSBMRUNQICMyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEB
-AA9xAWvRlTa39VMg0ufgjFlQhiFvf1+KXr5h63JQbfp0QQpUpwss/a4oEERXcuFh
-76pDQDA5bBgaUXSr2volp9kk5lGgaecZOLBLxxgUIHFeCxT3SK9fbDKdvDy6BNMH
-2dlaZERVXOkR9YalTpjiqt7ifFnniinQ6IuKkUeTXVai6BwakUqcCmx+MvvYgMIX
-j7GWwSWgJ9zV6SQDkcNKwPCenvaVruXytDFt+fD9kFP6R3kYEMe5/jM7Y0RzFh4L
-Ql3uiBkxJarU+/4d6L1lX86lQXD7AfD2cvlm/U+B7KPijqXIoSicYU02AwnpGqZX
-b7Tmsh8nidL+CBj9qwEe2T4=
+AHgH4ZhIhy2l02/CcJg8sW6mg/MPQW5feFCjau9ow0eKL8aR7uV2gfrC9wCnekXG
+HkTk9Df9JolbLNi8NcE0ard7EifaDMLIthxvN43d6Oolr+gdhtMmNkz3ae/dNgcV
+/W2m2swlGzBm9SCrXtnOYt+D4ENS1iA3gCXJMt3aVDh33mJUE2/OCC6fdVL8M41b
+FkvntPX02+JnGi82SeJL7Eyw3KfYSAudUBjKCnDPqQL4wkpTHAWOoTcYrW+lMhDY
+gdKrLtdWbynXDR0oK5oE3UiYHzMOjM058RnkBCnkn+L7txYOxepXAuRwwF69uqNi
+LYd0LYRGMy7I3S2LL8hgQ3w=
 -----END CERTIFICATE-----
diff --git a/tests/data/lecp2-la/jks.keystore b/tests/data/lecp2-la/jks.keystore
index d02970ff..1152c6c1 100644
--- a/tests/data/lecp2-la/jks.keystore
+++ b/tests/data/lecp2-la/jks.keystore
diff --git a/tests/data/lecp2-la/private-key-raw.pem b/tests/data/lecp2-la/private-key-raw.pem
index 3f1be505..dcfcddc9 100644
--- a/tests/data/lecp2-la/private-key-raw.pem
+++ b/tests/data/lecp2-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDN1fOGVMSWexDBtrUZC9OUqNdX
-Zau4amiJnX/lA+80nYb3gH9vmbV3BeAoA2VtsRBvPrRE6XhF+XzzrIq8hLZBLeyGLtGCgUtagrPC
-XJRd/gixZaQUusDPdmlMpBvEER8JjT1gqhoCe/D/L1XGxgon/doZYX5BsqjERRvZnPZy3kTLFuSJ
-qC6N3PdjJg3aVau1Dgm/5uejtwAql2xi0wKuYLbJ19QN1zSVGw/NgarffBszIWbb4jNLzCFUJvGp
-Y/4ZXwX5xIhbeRo4bTEZoO8m7UJTNMMRVLEZRLvL4rdFVkx33As10gqc4vtCittsaOTyUJRjftbW
-oaz1aaccGOM5AgMBAAECggEAZuwuguLsEdqjfFlhoI57U4BBfSAHh4UdlII+q0MWXxbNoACOuD0B
-sewsM5XPJ9Q7xYRzG2oqi8K+qhGCpdUuVNUjycyrUjhYd3+XZv5n6b/WlO2f6AWh15r7+CivAZEW
-Fe6b3DPyIX/b952xpFzuQyT542sOeMdfABUWYe/Mg46d+qN3KWNzeFaSnyX1vkCFe/9hGCJXQOfi
-jzIy8OkUtNRhawziM2PA26vEvcqJ32GYsr3+1qp3qTyAjENuT86x1kUT2v5zwVo0K7aGGvOICiUD
-pmZkaN24w3MDcwJHgSQRpoQQom0tV+hAnYLpF26ORTpBQexTlL27StsSORrgAQKBgQD8XdKUmdJ9
-YLr32PYBLlkEhLTYw9CannX8djbVXouUiWi+G6tnNUb3lBbMk2YXseKH4J7NWBi9lSDS1kpHoY7x
-pbG7EROXwHJXcI/S4A7BHvFw8EFh474SxNQcc4T1vt7BNv0SG6KsX+CsBnXMEHOXAuKoUWieVRAF
-8ShEPNESAQKBgQDQzJ/u56SYOfG2X+OMFZJ5YAa4FvMCy+uiG711SpZJrbepMI3I0pRscW1Awwbg
-LI6nVYUqUDOnZnw7qKAJ09vZDo0LKYtPse58HSKlgYHITjic2PFzlsi2Sbk8ad4GfoyFV8svHFu2
-AXgMWZmMFVMdEKBaUAIVz/nNUntvzrnhOQKBgQD1q4fxbQTBVMbtu2FPqQSzJ1S9p3GM8zE8QQAE
-GfOa92DloB3tbKnXHWxMXjkGW/5/86Pjlh0PgPrhBAZvUNDMYFZyGp+OHKOyhzsbN05lpW+4V8nu
-NzuzHbS2taX7bIGAab1WQVzMnNEj5W4K5wD/QqnO3OERMRFWF3rxYprMAQKBgQCzrsQbRcDBN2wo
-88/P52iLhvWBSk6KI459jL23yB4Y/aPFt4DsRztvLxVD3BF4rR9+JPxZ83bgIjPa6zv9+RGCcyEx
-b+jxBkAjEreUEiTriVTytUbjn+jN5hfAQ6LLl++5eFnkCtVphU4X4qtef6Nsqbg0wBFrT/S6mraa
-+x2/EQKBgB1ru59ULrBOG0DQIvKLP6VL7rIgKsLLK6oZGnV1PzbJGEaHZgwp+tc/VFgLntTHDEpA
-cfNHSEVEscy+exSvY3dsIpQERWVrltJxJYWDQ4yAB4oPWMFY3e/K9GRHNWh7imzWW2vQiXBo0SWW
-8XYncXMxtJaW8nSUIj8VsH28ZFD3
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDuobbWE4cAERQpRgX4zuT2OBGo
++dw9y93G6n6LjrZCX1a1QtJDop65ekEjhPnh4wlpSmrIKZ/oToolH0s3qtNhQMY1jAnr1LEPX9y4
+JC2V5RSyvSAKH1FdXtC0TzMjnTfATHMVCdEcrmTWQvJVXCSE4CskOfXtdlQi7Sh5UR+4fYxWI2e4
+LS1FHI1dBxqAWOXM7A5zDi8Zp2xGSpCclcb2MCxUvxgYwQdogQpXLb0cfsKLljh4lFaAi0ZYmUic
+9TvK0Dwnl2dTo3w9xu8hvqV1BAWf9TC3PU1bH3FdMlfGVqieM8lg3QCYtSo3Dcch9xdcqz2TUff9
+DsKaeZ13o45nAgMBAAECggEAU/2xV9oZqylXuks+MNvJdOw5Mwt2vH1z+t5wWfiKKARchYIWdd3Y
+Fhp0sObN+ParSlb6DKex89cpAnXoSJiku9dLrG800r/S7kFkc5+wN9EgnuS4UTfCsKV9uekia8eb
+ZuDBpMcGxhyPu2Zm2yqKZAZuyNppuAHtDToCA+lMy+cer2oaDJuSDBFADinJpWZW/Daima5lby+O
+txOdfhkPvm8+gbd/70LurVMdU3B3iSg6dV+oRJo02XBEChrMbGSaWJVjld6Tk+uHX168YVcIsUvo
+yw9cPwAOEbEGcUsX3Y6B/BA9xJ5DVl77ZRQ1gQK0vM+wi/1YFvOg8akUdGBI4QKBgQD3WwQ6OH29
+TSu6tnX0GOKnSVA1NbweQOKSB8YAHSe2U7lggFjCILALwErgXaIoSFMl21AqrL4QwhwjxtkC9wee
+3Vsz9wUAQ17rvETHvjad8LKoLJ4sl+q0r4hVOZ9xMppSycMwkCl2VGp6uOBjmRgGZrPunDivBqTK
+LxO3LRBQ8QKBgQD2+KY23mlvMhdrszWgRTaad4Qcn6wJcBd6oIKr5B3tZIO55UTP83CduEiwydY3
+ZeQfUVP8aenETK1hBn5rz/qF4sXKgOudhDVj3tTIMxKLYYHrEuVKWN/DdM8ZLu6uJakYo7/7yioI
++ldtwhR0u/nN7Clj5lpaMdNCX8RX2mjU1wKBgEcBdKQ15Tp7Natih1er8RxuejzcEQVqQOAEpT0R
+IX5AaH2gOlp3wbGN4LCpkEwZ/uxmGYw2jFUJM8S9Zzxnp2NeTbkMFv5tWIk5QVFJdCpAlziZnkpU
+zcZSgUNdyDxZd11+l66QI6bZMrvJ6HgO0Yu83bgIVmk/8fwsKW+y2vUxAoGAYxVM8hR3LmJlXRMv
+/5XlG0G54hX5Wmv7L3p4EmhZzWUXKBygZ+GeG9jUaQEBDYa2aA4j6M/BNr0gjh2h2LU/KDnb6qug
+W7iwBtpeeddrqDm9esdA8HwJggw6DjtzDLEVT0pa+rSX+rQdIW7M8Cx+QyxtSqQfObJltGphhnGc
+v08CgYEA2simxg/IuXnoJwIemlgzS3NaXmkUbnUbZ22U7pAE2jSf71+cBuYTQbtCWyzajM3CvHg4
+VrBwCKCOJA5T4VQwBtZJ8KKFTJd2Rp4p9qPihkJhmm9ek6gjowjLsF+DjSeLhacLQeHUmYOihb/d
+bzT/42gTtERh/jIdcX0a0cVrQaE=
 -----END PRIVATE KEY-----
diff --git a/tests/data/lecp2-la/public-key.pem b/tests/data/lecp2-la/public-key.pem
index d4c799b5..00f50143 100644
--- a/tests/data/lecp2-la/public-key.pem
+++ b/tests/data/lecp2-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzdXzhlTElnsQwba1GQvT
-lKjXV2WruGpoiZ1/5QPvNJ2G94B/b5m1dwXgKANlbbEQbz60ROl4Rfl886yKvIS2
-QS3shi7RgoFLWoKzwlyUXf4IsWWkFLrAz3ZpTKQbxBEfCY09YKoaAnvw/y9VxsYK
-J/3aGWF+QbKoxEUb2Zz2ct5Eyxbkiagujdz3YyYN2lWrtQ4Jv+bno7cAKpdsYtMC
-rmC2ydfUDdc0lRsPzYGq33wbMyFm2+IzS8whVCbxqWP+GV8F+cSIW3kaOG0xGaDv
-Ju1CUzTDEVSxGUS7y+K3RVZMd9wLNdIKnOL7QorbbGjk8lCUY37W1qGs9WmnHBjj
-OQIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7qG21hOHABEUKUYF+M7k
+9jgRqPncPcvdxup+i462Ql9WtULSQ6KeuXpBI4T54eMJaUpqyCmf6E6KJR9LN6rT
+YUDGNYwJ69SxD1/cuCQtleUUsr0gCh9RXV7QtE8zI503wExzFQnRHK5k1kLyVVwk
+hOArJDn17XZUIu0oeVEfuH2MViNnuC0tRRyNXQcagFjlzOwOcw4vGadsRkqQnJXG
+9jAsVL8YGMEHaIEKVy29HH7Ci5Y4eJRWgItGWJlInPU7ytA8J5dnU6N8PcbvIb6l
+dQQFn/Uwtz1NWx9xXTJXxlaonjPJYN0AmLUqNw3HIfcXXKs9k1H3/Q7Cmnmdd6OO
+ZwIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/lecp2-ssl/all.p12 b/tests/data/lecp2-ssl/all.p12
index 867f0d06..a827cdea 100644
--- a/tests/data/lecp2-ssl/all.p12
+++ b/tests/data/lecp2-ssl/all.p12
diff --git a/tests/data/lecp2-ssl/certificate.pem b/tests/data/lecp2-ssl/certificate.pem
index 4818c04a..d8bb4852 100644
--- a/tests/data/lecp2-ssl/certificate.pem
+++ b/tests/data/lecp2-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEVDCCAzygAwIBAgIBAzANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAyOVoXDTI0MDgxMzEwNTAyOVowMjEOMAwGA1UEAxMFbGVjcDIxEzARBgNVBAoT
+dGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyNloXDTI0MDgxNDEwNDQyNlowMjEOMAwGA1UEAxMFbGVjcDIxEzARBgNVBAoT
 CkVudHJvdXZlcnQxCzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAuulfj7B3dCp8yNLCRh95mpjkLGJ/TFIVqFQ4A6ea/FmqL92x2L32
-BmnC5rSZYqFfQs2zMkrlOuAHji7hdBjSiVZZ6+1e+B/WP9ouVEEfO3Ouh5+GZENv
-WmEp+t/t5LfihENvCpwPj3Uyttagc6kyXFyS+m5j+K8YErLL0xYA1xu74MhDo5lA
-UkmLOcg9waFXC6fG6TQJ+CBk+PoTeW5+BYAiTBUNv58uxdJZvHtPDoLGm8KFVM6I
-wHW2cwHY2f3PN/q969hey+IYNAzQwOcowr9EqOFTzByqJTXV2qItafUNYZb+K3aW
-ukBAySVBE2Wr7wYEVJKeK5bHf+EjTz8NtQIDAQABo4IBQjCCAT4wHQYDVR0OBBYE
-FLSAVWciB9v2gFjCGFJAMVMl0dyHMB8GA1UdIwQYMBaAFIRnyZ/KuE0PgbERmPrK
-1fPk4zX3MAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgUgMCoGA1UdJQQjMCEGCCsG
+MIIBCgKCAQEA3ZhTvw2K01+7RUBn9z6hyKg2CUUAVXrF3JcLrYMf/Fnx4YTSQ5io
+bBGWiNn8MspefOH2Tm16SqaG/WE2x2SCFXn/MekSvHqvzZwz8DZiKcPMf3EhsSFb
+AlrQXA/PqYmhnuDXoxDAEalgcLwBioQ1TbsYrl8Wyi9dyn2Z5Z49RYRGmdr0YnCZ
+xnrUJ1SqMusqbkP/HJlEhy52MKvwwNRhOJ/n2E++1ioVhjCT9NQEXasdCYHpEPud
+xmhjajdGmLAmNmYyPatRBg3ueHIb/uFHoWI9rVWhEiVK6OWertn3flBDT9chwES4
+T/Tz/qUBxxlnW2nKoUYfBI91fJeb5aBbHwIDAQABo4IBQjCCAT4wHQYDVR0OBBYE
+FHaFAMrDq2ov8vmf2BogAJ4nZ42mMB8GA1UdIwQYMBaAFBu3TanHLXJ57HrvkVMA
+1AAez8/wMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsG
 AQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEwEQYJYIZIAYb4QgEBBAQDAgbA
 MCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIE
 HzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwUgYJYIZIAYb4QgENBEUW
 Q0VudHJvdXZlcnQgU1NMIExpYmVydHkgQWxsaWFuY2UgTEVDUCAjMiB3ZWIgc2Vy
-dmVyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEBAG/0dUSHfozp
-h3eOoyeyGev5/CxZ6sQFZd3WMd9x7Nim8Py47X/AOkJ1w/X+Qh+R1L0ekwt2tgG4
-qnw7o9HwKZ3koCFTXyKdkHdBhOJUk3azX+WxjmqJCy12yrA+c0DFTC/qAYffh+0N
-7ywA4RxsnF6y27m7suDOqoqAAzwmPIAwxGfCjQ/eludwapNGdEdiUwNcJzDMSlPM
-P8PIm4nGQ52bL+pIeCqkmwv0WetkcL9yjbyWiOYkMU1MxcLMc1rF3O9xWSt0hyck
-CyC9EFrRkdRXkYydT8o/EMbp1n6kJSe5Xig7UpsAMh/KRWn2unWTbIwRT0HTUpAC
-eG864CO+s2k=
+dmVyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEBAFoGOsq+yeXT
+CIAh8koXX05aByiCLizt9vGlCxSU5fUPg432rRUYZXayqoOCuGm01USZE2YPKCss
+F00vkYEBElSum/EeWqBAXocMslO/JBf9jUFxzEGnmdZ2sYzy3BtOUS3Ii1GJxg21
+gTLkR1AXv9iecuJ1sKnyNh6HsPodUPQ2Jumuxn2EQIs7QYar50O8ADAB6BTVTgoa
+cofxzaWS6ous96/sm7CSSnJPNo4eZqodR4e16oZp/SiolKnEYBc3IGuJY62wuz+j
+HPGglf+BfpB0Jrsu0w1I05IX267kKVjaIqYonVkO6hgCxmhHTvDluLxLcnMQ6GI1
+BKq8gzYBBwU=
 -----END CERTIFICATE-----
diff --git a/tests/data/lecp2-ssl/jks.keystore b/tests/data/lecp2-ssl/jks.keystore
index 69660269..8c9b400c 100644
--- a/tests/data/lecp2-ssl/jks.keystore
+++ b/tests/data/lecp2-ssl/jks.keystore
diff --git a/tests/data/lecp2-ssl/private-key-raw.pem b/tests/data/lecp2-ssl/private-key-raw.pem
index 3c48582d..91c18f90 100644
--- a/tests/data/lecp2-ssl/private-key-raw.pem
+++ b/tests/data/lecp2-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC66V+PsHd0KnzI0sJGH3mamOQs
-Yn9MUhWoVDgDp5r8Waov3bHYvfYGacLmtJlioV9CzbMySuU64AeOLuF0GNKJVlnr7V74H9Y/2i5U
-QR87c66Hn4ZkQ29aYSn63+3kt+KEQ28KnA+PdTK21qBzqTJcXJL6bmP4rxgSssvTFgDXG7vgyEOj
-mUBSSYs5yD3BoVcLp8bpNAn4IGT4+hN5bn4FgCJMFQ2/ny7F0lm8e08OgsabwoVUzojAdbZzAdjZ
-/c83+r3r2F7L4hg0DNDA5yjCv0So4VPMHKolNdXaoi1p9Q1hlv4rdpa6QEDJJUETZavvBgRUkp4r
-lsd/4SNPPw21AgMBAAECggEBAJ/XJZautWjNUMs4mVT4Y7jWmQJv9SbiZ4z9AK33bi3xy/2FHCsb
-QEL5vOgod6eGEv4BBQa0T9YKccugwcLT23ABPYLqCrYsG7+dKNN6oWfpJM7smDQ0Cw0CXLEjQMDA
-lGDBfjtXfGMVOZpsbuiaP+wGatbpAmtP6UlMR8wrW+qXXsqYf1t7exSRf5Y5NzCTGkXSElRDIo8B
-+802lwULGwFMtUtqbDOFBZRTgxOA47abuUuSBB+zWy3GgXkxBqFWhPpvDX3tnNQvTb1SPxC72lVu
-vWdafe/n8QmjO4PaU1+zigI1wlVHl+G0EaEJU6/GohtMbF+JbzDftlhxN9y9vkECgYEA+Qjm5c68
-yofSEcKbnbhHw3i/Oqbos83lYFGBEjJdN0+YAkKfdkgRwF8pJBP+4fblgkwpzirYEZLtPF9w8bh2
-OuiilQYaQJnZ4BR5flhNepbRA+rDp5HKW601Hwvp+tIjBcD5wgFJR0XBiLeFGCfZN5uSqRSdbph7
-IhJOeLH4sSUCgYEAwCOq0Y5EZ/DztSiDjDV2x2G4oHlt+Fs0HNNr/rUnigvuwTuJdpH9WG7eauZd
-mOwTt+fksBXOv9rYLIkZ7o1Kndj+Xfq8T2skZehenzYCGVf2qbM9lPCHqap9LiPJHZX3YIo6iqN/
-OlGVdwYDu9GZBoDxbGpoJNNGu5zn8MelrVECgYBi1PaVs1NXaUmkRMBveof4en4h78WgPhFPBWmc
-6CH4Zn0kQH56eaWZ2+o+6DSaRtrUuBdLO9OePdoqwJHZTGSXgmWrkM1wX96IwHdq/e5ZvWrcDBpz
-8TcG5RmU5ayJH0ZI7UnxhYMoZvWkpXiLmpzpJbOxqH3GO3t6jRtZaQAShQKBgQCQ8xdt6db/Vw5z
-73F2N+s4tScUoSbuQtfIm1MQn1eJ1EC1NBYbBj3LFjDjEpEvyYGCrwWeNYV4xT9qMbAHgD33YPlc
-qsifXWPjIW8oyxTAS9UA5wChOOgPflfblBGoKTerc/yAFKHpvBx242mzqoa4GlSHhqq0hVMKPG/Z
-/LOnUQKBgAn+bAtiVHLX+PVe8HDRPcHOfSU7C2DWSjbl9YLia3Ssbk2TpqKhkkRFae00FBAtTj8X
-f8rDaVxbrYckeFxS4JuMoh55SojC6WnfqiuSh72cgxN7q5enX4dqB4RvUADLZljuUvYWE/kiNDZA
-kuKO6+mQ3nnCllZUtijl7OTC4ceJ
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDdmFO/DYrTX7tFQGf3PqHIqDYJ
+RQBVesXclwutgx/8WfHhhNJDmKhsEZaI2fwyyl584fZObXpKpob9YTbHZIIVef8x6RK8eq/NnDPw
+NmIpw8x/cSGxIVsCWtBcD8+piaGe4NejEMARqWBwvAGKhDVNuxiuXxbKL13KfZnlnj1FhEaZ2vRi
+cJnGetQnVKoy6ypuQ/8cmUSHLnYwq/DA1GE4n+fYT77WKhWGMJP01ARdqx0JgekQ+53GaGNqN0aY
+sCY2ZjI9q1EGDe54chv+4UehYj2tVaESJUro5Z6u2fd+UENP1yHARLhP9PP+pQHHGWdbacqhRh8E
+j3V8l5vloFsfAgMBAAECggEBANe37XbkwQuqew0ceNlZMHe9QPVfJccRAMMQi767Eo1AJlcrTOGf
+H/4sVQYeZwQuuzMJahTJQK6hVHIfjAspjfVIUSUORz4SlUgs0ub6mi8cO9yojmr4FLfDHmkwvzDF
+GgAn0+Qbb08COy8j5sAomhd0lr9RNEdZOw3fnczJcc5T+U8+gKS9WcKsjAO6a4pkBkSG3dy0226p
+POKmfGREK1RkubMHLBDdaWc91hBtqhNRDWA+DXKhKMene4/YG7WowhBLIYr94N3ciHL1BLxD1R7e
+QGmuU7rho22ZtIe1KxgDvHnU2EYCIDvjtxAR2nEWdLrMAn5t/zsw9I1R3N0qkMECgYEA+9pOYx97
+/CU+eAW5mvjFxSditDIPNe7z68q5UeWXBxEgaI5zHsZjZYb3tIodLD27BrEuVyaNNJ3CFUbIveQZ
+6OqTQ8hhTbcyakPmOYr7wDCOWK7N+pJDLEY5RlN91+k+hF39qIZd3P7WLJeZeLqOPvG8p7MD7w+H
+M1FiOu6XWH8CgYEA4T537ExpyzNq61sh9D03q52We/CZdPIuNSvHkbQ/ODrAElfl/onHAeZKeIRB
+atyW/iG9xdP7e/ReTmXdoPJMfzgRsn9SrDUgiCz/MSOChktZOFkq5sXG/kTSaotaDsPG1Sf9gZvt
+lLLzobBeH+tHjuv2aM7zQ8tx5TAKwpuGrWECgYEAkQIi/AOWuZkgHK7/LPFrvZZtyF7CT0VkADFa
+/oJ4sML1q/3I3sFPXZeWa8bSATURyEqf6eHyj4b9xo5Y6qy5Flhpri9jhwGh73lkx2D0jrXmX71W
+L52jO4y7UXilDnnnWwNbF3s19BZuboJjBRY07Jz3CH+UFkMUj0Gek1vonDUCgYEA0+iqeIR3b7YD
+HEPT0O2bJ3kOL7JvHUgPUvTKP/k9FRCozVkmx28l7FKVs4Zx6TB5WcOyv6Cs07RW2RkbBqWOdI3y
+kGUbCWq+HX9/4uIOlXvkB5BUPWLK0UM8VwKdipCDytxhswNY5HHrpi3Aj/URkJPMclRpJ1oK4F1v
+ciFR9mECgYEAy+6H40bwsm4EhNnFPFDQXEAjIsonZ413Fslu6NmL005zcE8Cem2HsgJieocR2OL4
+of75apiE0GpnUAlwjbB406AbahnlkHZFHOd/Saisz6AV16fwfZG4i7wW2shF3j09YPtcZ7KON8fj
+2lrDQbQodEJFzrnSZKl1p7l6L8J1QkI=
 -----END PRIVATE KEY-----
diff --git a/tests/data/lecp3-la/certificate.pem b/tests/data/lecp3-la/certificate.pem
index 91d29596..643d0615 100644
--- a/tests/data/lecp3-la/certificate.pem
+++ b/tests/data/lecp3-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIELTCCAxWgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjdaFw0yNDA4
-MTMxMDUwMjdaMDIxDjAMBgNVBAMTBWxlY3AzMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
-MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANI4
-ixGK1inmP0Pt0eCLhgK1aDCputV8X9K6mHyjXroe8mYhKaL5fetQ7JtR4qXNep+z
-7HyE7DzW+rCj/RpPFJ35RBmTvrM5pf5qs58KGGHqNmleUptb6vrLIJEeViO0f/Ly
-PRqUgN94aSNEla5S4Opchh5D9qYd035KEWk1j/D+p+UudH367S4HPqfood6hNb+u
-gwkkyQ197C+fH7czEw6jmvuWG/PhXlQn0K77Ht941BR6j/aPsLBPUmimCXNx7Pfr
-MG4kN5KngtORuEbz7tL9rTglOzmDoB3VDOCcccrXXtgqUCJ7zgFf4kdLQcIWF5Iy
-SzMPK5bQ8hZncerJwPUCAwEAAaOCASYwggEiMB0GA1UdDgQWBBQ+VVSUXKoAe0XJ
-yZ1svKiRcgGRJTAfBgNVHSMEGDAWgBR24uq3ElibNOYHuXV07iR/+pCk8zAMBgNV
+QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjRaFw0yNDA4
+MTQxMDQ0MjRaMDIxDjAMBgNVBAMTBWxlY3AzMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
+MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRE
+Iy8LaTEeaW/0mc2xWnCTplhczlTv0/QyLrtesbwfsoiOSdfFXke1C9WBCug7j3ds
+mEDa5fl0xShHoXKP1gBTubZ3qfqGkw74/uIVOY/49r81q/JMhc7INCHz0+TBx44E
+cbNmtidvNYnXQqIj/w46Ue7tdagYAPdtqpeelJqrWcU0h5gowulwkNZ/pLzQgDw7
+5W2T/khlWrjNZue57kbv9pFNGwW/ImwAIPx7OXvJq7PboXxO4+49gzHohjDOLQb5
+HbBzcAxhNl/WdBkISQnbfsu4i5+RtJFeoxQsMcTHknS+BSVCfrTcTDJPiPlUGV4w
+rNGO1bMObt3jiz9uYTMCAwEAAaOCASYwggEiMB0GA1UdDgQWBBT/dedpz2j2DsEh
+pc3dV1irJysoXDAfBgNVHSMEGDAWgBSTX6Xt+buV4houkKutn7vqKkGRCzAMBgNV
 HRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
 BQUHAwgwEQYJYIZIAYb4QgEBBAQDAgeAMCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNz
 by5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28uZW50cm91
 dmVydC5vcmcwQwYJYIZIAYb4QgENBDYWNEVudHJvdXZlcnQgTGliZXJ0eSBBbGxp
 YW5jZSBMRUNQICMzIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEB
-AJIMc/yNSMj8z8TRMDjYGxXyWHBqkBYsfhGIjHnhm4dNPdQBUTjSmG0rLAq9pPlx
-YV1eyFELNuz5VV3vsCi1EGJ+v1z1PdrLrFfZxSG03edvDdWkDWa+D2IktrB45bie
-c2Z9L8QxUrr60jlmycLjnuNYwkrO5HaXlJGqNWI8tLX9CylZ+4ES08xqkpBld3mR
-OKNRM1NMcx0FsOEmMAmi8NcfQwjhhcc0JGVT/JAbQ8o/n/bdCtKpDwIoWrY7r9pL
-3/sfjn57vIK7VFmlSsLtZNYChLeEAOpGsMn+hOIxCQoFiucBQcBfbHwM8DN25kQ9
-ytQANP4l8tIn3Hs4jtYp/NQ=
+AIJ7sCPO+JxqW2q/KRPyed9Bn4e03NtaiTreNlmwy+9B5QKYYQe5FKQ8Z7keuh9o
+BHcRVc4OOBeLSdg6fTGIu7OyPzw4D+tbZITNyfrWFi2sh7gdx/v8bM8B59lLTEun
+32dNz76jL7Q72cfpDvHVvwSVNbEWMPWQGdWboUABiqoEMD2ROnm2AACre7bLcV+t
+5UyfXmXsYg5X7cxuGCW8IBxFGORMQ4TruxC1zQJ3KXZQYB2pQD03VWsapA4+IS4Q
+PiX0kOMNAGhAoOwpSbuAY8LGaKbt0eBt7GjEJl9CCJnalJGdzi8YrPqfu8Lh0qzn
+rpHJn+2x5QMIyI9Vskwkzi8=
 -----END CERTIFICATE-----
diff --git a/tests/data/lecp3-la/jks.keystore b/tests/data/lecp3-la/jks.keystore
index b8ac8e3f..dc67d049 100644
--- a/tests/data/lecp3-la/jks.keystore
+++ b/tests/data/lecp3-la/jks.keystore
diff --git a/tests/data/lecp3-la/private-key-raw.pem b/tests/data/lecp3-la/private-key-raw.pem
index f3b765bb..4e59becb 100644
--- a/tests/data/lecp3-la/private-key-raw.pem
+++ b/tests/data/lecp3-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDSOIsRitYp5j9D7dHgi4YCtWgw
-qbrVfF/Suph8o166HvJmISmi+X3rUOybUeKlzXqfs+x8hOw81vqwo/0aTxSd+UQZk76zOaX+arOf
-Chhh6jZpXlKbW+r6yyCRHlYjtH/y8j0alIDfeGkjRJWuUuDqXIYeQ/amHdN+ShFpNY/w/qflLnR9
-+u0uBz6n6KHeoTW/roMJJMkNfewvnx+3MxMOo5r7lhvz4V5UJ9Cu+x7feNQUeo/2j7CwT1Jopglz
-cez36zBuJDeSp4LTkbhG8+7S/a04JTs5g6Ad1QzgnHHK117YKlAie84BX+JHS0HCFheSMkszDyuW
-0PIWZ3HqycD1AgMBAAECggEBAJ0jHvDx8rxHG6tPLb7HDFkh+MvHU50Y5xfB2xHvnHNLhq3IxDLK
-g9FOIE7Jmr2NJsgR2ggJ4/xmReWb7ymnSyX6mWj1A2s9AFN4tuN+zFMEm7+PffgbcT4ecC2Jm6H8
-3ldfs0UXFG32t8BhF/HCidUlbCtbahcp3FleTD10iC//D89bmBSZhIgnqogWfJW3xRDY2J68QXRJ
-wD3eRqEZveTTdK/WmvbkYjc2r/F5kypre23CFQ9AiKoNbq7aXqGQEP8QOpeeLJ14vBtkKLPy0fXB
-ymW6OzexzBo6sK3RIXWPyWZEp33Qw7BBf9KUUbLsEFnnza1l38wRuRHXA1virgECgYEA7ytao/1g
-8D97LEn3kz36vJrA7MIMutcYPozIYJyq+9LbZOD13ltuZ/vxp7TX9X/di01Om0oj8XTTEHyPzQG+
-NLW1hxfcB32RYRCm0aPobs0TsBURuGBoyDO3m3Atw6sJb1dP8aII4dXRvssqX1xi0vbvJq6pyvUt
-9vBO1iDRI6ECgYEA4QOuW+zEP4Ux0bGx58neiqhmAIJkNFY8mdfF8BUzCpg6teNh/1v1fwgrQMjs
-bxstTbRkkUW8lGNw7Jgnzs7Pp1+dJNqoPHrQjuVNP9nFjGULlEopZEcXb/FFKigz541EcMczuHoC
-ahBlWzZKYCIchM96NBrGbJlEeOdtotFxnNUCgYBJFRxbY/+NKji/LdMDITtPCpLNRfaR2UxFQMuy
-Ce2Nib8UslEvIw03pRsQvggHsozGFldgyGT3UVV1gjqG0HOIs8XGhBnuCAa2fFodUVKjGPNdKPMD
-PiKGmpcOXlb9pXP6m9mH4pWIPMgc3wQRo69m+6HUVib4J7dl78SHVfvSQQKBgCd/bevU893yk3wr
-pP77AIV2afFM8in9uUWICsbJ8du6PRQQhfM9QSq7VFxa6KXYL2ukbsLRavjhO8FMNDCpPOo0bnE5
-sK5tII700UqT/4lVc2LkYb+oewS7ZVixFetfcNQbI4kOYb4cgq4wKX4WfssRYHIlAQ+vF8XhWe1q
-tnbBAoGAPCAKWzEKcnCsz+aKT/iCW7MipH31K94wG6mUPcjAmaf7xoFEI/2Ybmaqu4LQpJS1v54L
-5TjypaUKet7SrPrJZNgIh4wmcIBbfzlOQqjejQ+XQil3wfTyKmIjS3ZgVUNuk+LoBJyyGZOacAse
-2t5W3u00LhYQidUtZYMl4IDSDWE=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDERCMvC2kxHmlv9JnNsVpwk6ZY
+XM5U79P0Mi67XrG8H7KIjknXxV5HtQvVgQroO493bJhA2uX5dMUoR6Fyj9YAU7m2d6n6hpMO+P7i
+FTmP+Pa/NavyTIXOyDQh89PkwceOBHGzZrYnbzWJ10KiI/8OOlHu7XWoGAD3baqXnpSaq1nFNIeY
+KMLpcJDWf6S80IA8O+Vtk/5IZVq4zWbnue5G7/aRTRsFvyJsACD8ezl7yauz26F8TuPuPYMx6IYw
+zi0G+R2wc3AMYTZf1nQZCEkJ237LuIufkbSRXqMULDHEx5J0vgUlQn603EwyT4j5VBleMKzRjtWz
+Dm7d44s/bmEzAgMBAAECggEATgNPgOmmPHH8MxYk9I/khQ8LdeAd28EgnNY9oRi4yTBIRONaErxP
+B229cHZEoZ7bHfs6Yb0g4JE7tRET6Xem9qZREWhrVjubxL3QgokxQjsRyVtKJ5unLFSD9GL4/NrR
+uW+mykqvaOlZfJrlz5FDVqJz4ubcd55i8/bRckcEhp2WWusXZxT3SkHbeDTYV+ERLBjRx+41yg3C
+ltiiWnfuyQmkeIKIr0IJ5qxMz8nuXpmd1QdQEvy8Ib2Hf6y1AcneLEeftHo5dZKyA2J/aAV71TUg
+OZ8FXZBGmH7N1pSp7BEEFBcx6uxeIVS6aHaWTBF3L8WAjBTVvyAPysYxXxzjsQKBgQD6fn/4NrIK
+pEGyXR4pY246VZG7y8gBGb/IC5wbIXugddKG/Et6ijEUVkLK72vR2zN4q1NXVchm9WYXNxKxs9vT
+SD1xlink/q1nYgFmUBxXFtjCdpcGGIeq/UDASjXR4R4rLLzmo85c2YneX9Px1WicRl7/2Mqdqh6r
+4bufW1u7xQKBgQDIlIDYjYGBqHJdhTCnlZdolG4omkTtCxOXs77B4xzwHUCaRSjslkIeRfM73s5J
+sDFJ8bPGNPGdKVUer7u95nGJCEhC2g6ZlIfigfbpKdRNWwhXwMk+VUcLH6tvNO/dLfxiI/wbcDvF
+vS7lbYcFl5vRC4IwkBKubx9MAg1s/RIglwKBgCFcJ37PCfcQ2Q8AB7xLWaq7KqVwBjrfSwNBSJD0
+bJp6FoeTohm3vcGPm2WbbSiNoNU5O+gtrHrJw8bjtsGjymrg/A3cicfNgxp5muYdVSjkCgob8REG
+w0qqX608NN62tGXbl2y/9AO5lPrgmEFkwoHNfWllXdaRiXQqo+odKKJhAoGBAKF0+KpYbdEC2Nxy
+5BFiFvi10l6Yn7b33ZOVuo2z1Y1q3p/P3/thkGNyBzNATGmAjIxrJTz9TSgnJz+GUeew4d9ebVxy
+zqHNr/wihbB2XVDPYE3S/6tPVdqcaZEg2Zv+8lPFh6BGnba0bFV97twPh/uj+e5BauhCxryWQlxi
+8f6NAoGARPuoxP5tZVKrRlMmUSKlqyxF6mveS/egdQVaFHfna0xN5Ajk/4GqP4Ew+/oxt3GtEAd/
+j+bATAR+q7Sf/CPmstsH5IiwFjkahyH0R9FeiezCVNjAKAJGn11XC1mR3MRvNquDBaPHmacR2Co/
+4BBmsCPiRI65UFxyQGuLOs9k0Kk=
 -----END PRIVATE KEY-----
diff --git a/tests/data/lecp3-la/public-key.pem b/tests/data/lecp3-la/public-key.pem
index f17be4de..3e4ca0e2 100644
--- a/tests/data/lecp3-la/public-key.pem
+++ b/tests/data/lecp3-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jiLEYrWKeY/Q+3R4IuG
-ArVoMKm61Xxf0rqYfKNeuh7yZiEpovl961Dsm1Hipc16n7PsfITsPNb6sKP9Gk8U
-nflEGZO+szml/mqznwoYYeo2aV5Sm1vq+ssgkR5WI7R/8vI9GpSA33hpI0SVrlLg
-6lyGHkP2ph3TfkoRaTWP8P6n5S50ffrtLgc+p+ih3qE1v66DCSTJDX3sL58ftzMT
-DqOa+5Yb8+FeVCfQrvse33jUFHqP9o+wsE9SaKYJc3Hs9+swbiQ3kqeC05G4RvPu
-0v2tOCU7OYOgHdUM4Jxxytde2CpQInvOAV/iR0tBwhYXkjJLMw8rltDyFmdx6snA
-9QIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxEQjLwtpMR5pb/SZzbFa
+cJOmWFzOVO/T9DIuu16xvB+yiI5J18VeR7UL1YEK6DuPd2yYQNrl+XTFKEehco/W
+AFO5tnep+oaTDvj+4hU5j/j2vzWr8kyFzsg0IfPT5MHHjgRxs2a2J281iddCoiP/
+DjpR7u11qBgA922ql56UmqtZxTSHmCjC6XCQ1n+kvNCAPDvlbZP+SGVauM1m57nu
+Ru/2kU0bBb8ibAAg/Hs5e8mrs9uhfE7j7j2DMeiGMM4tBvkdsHNwDGE2X9Z0GQhJ
+Cdt+y7iLn5G0kV6jFCwxxMeSdL4FJUJ+tNxMMk+I+VQZXjCs0Y7Vsw5u3eOLP25h
+MwIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/lecp3-ssl/all.p12 b/tests/data/lecp3-ssl/all.p12
index 9c9176e7..dfe63825 100644
--- a/tests/data/lecp3-ssl/all.p12
+++ b/tests/data/lecp3-ssl/all.p12
diff --git a/tests/data/lecp3-ssl/certificate.pem b/tests/data/lecp3-ssl/certificate.pem
index a780350d..46d9a335 100644
--- a/tests/data/lecp3-ssl/certificate.pem
+++ b/tests/data/lecp3-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEVDCCAzygAwIBAgIBAzANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMzMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAzMFoXDTI0MDgxMzEwNTAzMFowMjEOMAwGA1UEAxMFbGVjcDMxEzARBgNVBAoT
+dGVzdCBSb290IENBICMzMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyN1oXDTI0MDgxNDEwNDQyN1owMjEOMAwGA1UEAxMFbGVjcDMxEzARBgNVBAoT
 CkVudHJvdXZlcnQxCzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAzCC1j2w+rEdIFAfeHA7qxaSfTrGPEAq1iTgNCySt+wuMxD2eVG0D
-HHPj4GSP4PlqFQGSIZeIJEbltIAhAj1cv7O1uEttVOl1e4BZSYCQgV6+Wk4juK9d
-TnWazhPOX69PW98UCq/pLOASRIZPoGQEZ1NAgxWD2iVUWq3p1uw3eI+GYaKdRS6Z
-efakPEs387WKYNpHSQAlBivutHO2A5AML5FzwNpK8ryCiDsBtXrNQ9YQ7MosPmZ2
-3A13cKVkyf5a2fdBA0aH+NT57jFwCuznbLec9G1Z7QO5GEd5as/9ewLVJt0A1ZDN
-fxcPwnrn0KW0XORFnWM9Si7kTNtgrhHmxwIDAQABo4IBQjCCAT4wHQYDVR0OBBYE
-FFbcZHL9lzeHMNB8Clhxry9iJVRfMB8GA1UdIwQYMBaAFCEXW2G+9EcSCXTgT4wV
-xyeS3rtEMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgUgMCoGA1UdJQQjMCEGCCsG
+MIIBCgKCAQEAw2pA+Xh6nvD0HDOAK8v0M5AYrYsrshQuijd+JtY5h2EC41NeTW9T
+NoFxSPDRO/U8zOQPaLH1i86nyWNgQ3BwganfhlHekpfDFgVpJsiUDekqG49MSFsy
+n5fpTU7rLQ8+B0CE5AtSiFM8lukViAHLsHxwG9W3TSozKT5a8KEVadC73+kdBzsH
+2qBkTgyF3UHlkOZVPTRIx/vxnYPkDmwaD+AswVelxkkrr52I8Z1sy8l6c65tCKnk
+QLQ+nDIxnCadVW2q3tHVoA7Fz4Izh3K0VRASLytNz5wR6QtGlUwgiI6ohnJ05Tzk
+6auXqy1eJbkZxKRLTVrgq+zNsNyE0QPC6wIDAQABo4IBQjCCAT4wHQYDVR0OBBYE
+FCIVvJpbrKR56q+rbnujzGTH4k5JMB8GA1UdIwQYMBaAFEucxQXvkKo8lrM8y2U7
+1WPBxpjiMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsG
 AQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEwEQYJYIZIAYb4QgEBBAQDAgbA
 MCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIE
 HzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwUgYJYIZIAYb4QgENBEUW
 Q0VudHJvdXZlcnQgU1NMIExpYmVydHkgQWxsaWFuY2UgTEVDUCAjMyB3ZWIgc2Vy
-dmVyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEBAIpYTsTFVtZQ
-Y+wHzvSkJ2vNNYnN5bsfuxeESlIBV8t/05YaRIcYtwoTdZX7gi4YBuZBaqm+vJ8e
-Abnpp75LjrQpBMV+HLQGCEPBzd8dLcizQAwH1bVGQsGS5J+mOMnh85IwCLQzxk7K
-qIF0C4Orm0IE6imDjppg+tiqGp40oMo91F6rQcj6jwCaD3I9BbKQ5RsTk1I1Lwrr
-bxFcXTV6LTTp83oRgiL+sqmXiV0QIw6bd7La0Ac9abkLtnGW9vYbHZJZtuI2m+lr
-66AWpact/NI2sHv0zj1xIMrHzXvz6STk//M89SygzT4jEdq2E/YkOmVSqCjcdZBK
-eEiFMDgu/Q8=
+dmVyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEBACZmz75N7pnj
+qPnfJZvoJqVXcXmVWhSAZBW0/qIAf+L4GBacWhz1ushoQuN6/LHb05wFqCGo2q1G
+CHGpHeGGGHDyAhc/vv/SV5IRp9hMwR/JfXRt+AJhNesVnkpD9kG8KT1rcIdq4E1E
+kcWOIe0kfu5xFN/0ClBTzRJKGIFb7VEGk3381OREN48TbcJF/TIn0iCwtlVvKKTN
+HptQbkiJ9mTMXU3dugQnWlwpeSeNGOXs3ZaIxVaO80Bezfv1QupiEFdyrYqx7hi8
+9j1LROnOnn4QEXkftXb7buXf4vr8Zu8gJydcdxHeJYrRJRDkcqdYKJAXtFz/GICV
+iftnY6sQYec=
 -----END CERTIFICATE-----
diff --git a/tests/data/lecp3-ssl/jks.keystore b/tests/data/lecp3-ssl/jks.keystore
index 486e1d21..d168183f 100644
--- a/tests/data/lecp3-ssl/jks.keystore
+++ b/tests/data/lecp3-ssl/jks.keystore
diff --git a/tests/data/lecp3-ssl/private-key-raw.pem b/tests/data/lecp3-ssl/private-key-raw.pem
index 967e2fc3..4ea97484 100644
--- a/tests/data/lecp3-ssl/private-key-raw.pem
+++ b/tests/data/lecp3-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDMILWPbD6sR0gUB94cDurFpJ9O
-sY8QCrWJOA0LJK37C4zEPZ5UbQMcc+PgZI/g+WoVAZIhl4gkRuW0gCECPVy/s7W4S21U6XV7gFlJ
-gJCBXr5aTiO4r11OdZrOE85fr09b3xQKr+ks4BJEhk+gZARnU0CDFYPaJVRarenW7Dd4j4Zhop1F
-Lpl59qQ8SzfztYpg2kdJACUGK+60c7YDkAwvkXPA2kryvIKIOwG1es1D1hDsyiw+ZnbcDXdwpWTJ
-/lrZ90EDRof41PnuMXAK7Odst5z0bVntA7kYR3lqz/17AtUm3QDVkM1/Fw/CeufQpbRc5EWdYz1K
-LuRM22CuEebHAgMBAAECggEAcBKtXHdj2ZaxXj4LloAiKi1+Qeh+0aHvlc0ubCXRV/o5aS0jltrb
-UG3YeUT9Mdn+glYAc20NFE3QpE+Mz/v8xkvWw7614l7jX9FSNGbf8Aein1YzipzNr9wmCGsbbbGE
-8r4B9PQsI7VKklDjuv3u5QPycYYIhGbmb3r43kWHFytK54tq/+dvRpZw98ojLH3E8kebshKHX0r6
-CbiBURZAiaOZTbKDRLrtbXltJYqTJ3SwBGXAtrjZi9a0zgNgwA66ZSQitHhw0lIEDGPgQ7RYfvGg
-vFyQYtvTREcvfE+Tvox9phBQRgpPqXhwJ1JTgtvjGE7h/cZbVDVGBrrLFkR78QKBgQDmhg5HqGTR
-88Hej8cY3m8kj6RtEbellOyZumyewpgs1e6GBzKcDVuuoo8/zChYs63HvFfW3vC7yRq2iAcoiFNU
-c7O0DrQTMeKJWS6dQtU3fxmCpHKQeGwlnwkCPI8VzKb0ZeKZDNANqo2n/Ui1qh+NFeB78vPH6d0L
-EmY4VuKlFQKBgQDir91XXhOQeIUAFWvPlE7MCln3daJyBn8ViY4erzS759ftGqhfoTfjiEcYP4aA
-VJ95fXi+NhWGOKseVVfaBWy9bq8RjeKShnfLZAxlIiGldeB4fxkTbHOPi6rzolCOj9XWEErw6Og1
-m6Wq4KfAtK3svIydbA0uzxdAHuO8LQMLawKBgFm/eVHGqrHez+zBV0dEWksGrYJVMoWBrHfRT7aj
-ljFmfL2rkbWVscsUuOaiqlaWZaLsndom49yIWCEWZosOQDsR7LW+P7d1ZXgJw48wVOiNUDY/pea/
-K4OeHhjD0QUwrxNZk1X42gtoCkyL3MH1YOFB0isPlH+ReiB0Yl2u3gBdAoGAIxj9mUBcoRq35Pps
-FditlpPnuBPDkgoFdS02DvQrowhTe0eMWDoa8CSydUOorIftpR7TKggvrvdpLyohjwUWAAJ6Iqqo
-MO2W8KvN636sXPTyS1XKaSJ6hfgnAM/Zzyjf/+PH5qL5CQvPS7S65HBVGXlcACexptSzkd72fbUu
-an8CgYBVAGVOvi6GRgykgGS7PAzRWcM2QRHwp//Ufh3lIhp1ut01ImuXE7WXTsAkpc7ZZctoGPUO
-jDmO9GZJnBIUODkIkWclPocLrj5XxGPqEYjYvmWmSuxsY+T/wlKKHCeG6825kFkZuM5ixbEJtuj8
-ROQtJNcj4YtNh3ISeZJv7qqCMA==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDDakD5eHqe8PQcM4Ary/QzkBit
+iyuyFC6KN34m1jmHYQLjU15Nb1M2gXFI8NE79TzM5A9osfWLzqfJY2BDcHCBqd+GUd6Sl8MWBWkm
+yJQN6Sobj0xIWzKfl+lNTustDz4HQITkC1KIUzyW6RWIAcuwfHAb1bdNKjMpPlrwoRVp0Lvf6R0H
+OwfaoGRODIXdQeWQ5lU9NEjH+/Gdg+QObBoP4CzBV6XGSSuvnYjxnWzLyXpzrm0IqeRAtD6cMjGc
+Jp1Vbare0dWgDsXPgjOHcrRVEBIvK03PnBHpC0aVTCCIjqiGcnTlPOTpq5erLV4luRnEpEtNWuCr
+7M2w3ITRA8LrAgMBAAECggEAKxnpgNzQ9vOgdAPr9j0C/MiAmO6EUb/fz/6TZY+EmtaL44YE28F9
+Mh101ii/jaD2qx52Q5pU1WRcX6/6kIVhW0gTlDXEiMLOdbH10mcVOMg/0FpX8fGjhc3k2HdaqdKd
+1M2nQgE5T/ZD++knJZt3yNJ5i7oktvFi3WrydfahmXfcmyMCvSGIyHSG7HztJoi5PapJR4DLfiRA
+3chMiP13DS6xVlJ0nTfAQI39rVfT7y6mUokYDse/CnWMg/8MGi7KGbXaJmiW8QjslMZdYqEw5/fe
+ERjX5yxDe8nHyUMFXI7b45GXTzq5c+UU4VsDO0zoFJTpdh+F0Zy6zI/1LfVwmQKBgQD0WM9Hjb8O
+TdBK2PoFe/3h/bZ+MHbdPoyFLsKoy2PPW9rPTGa2852VgdN256ih8zmuU5jhko98pv961333KT2A
+hcLybFUTQDJrsG3Cu6/QZUM0a3uBzQdcp4Mp/6Y+gl+r0ZerapyMNdc6AvBaO3i5BVpOQdPPawFt
+asXxawKwpwKBgQDMvAsVY05tBTNtyu8ES2nh2RRWUYrgGyii0eAhSy3WKLeyaXyB8mH1EHmJ0wc0
+vBLO2XLiZxIaD9KAH6vHYc31OF66kVxX8XVJLZplsRjqrnQw5XqvKPSvcjZQ6tHGeYIOtcjm5hK5
+Y4pAvxqhKGTWGogh70M0BCVwuKjLk5RAHQKBgCK8wXMVtrSs4VDSufCvqO9I53nXH/7iFo4UkL34
+dE8Vau0Pmoal6aBInayI0JN9hZS/87sV3+pDv4xSOGk75q9v1MAsIIglF0XyBhiqIBuLWduI8D0K
+zeIhOmdtHdBDLqC5oktPU8QnH1ry8gKR896x4R3BBAC34LMSe+OPaAl/AoGBALcx4/EFZR2kM7qg
+hXMgT+QpLEt4t32Ej73xck4YSTGCSa05OpHEYua4ESjETYRgbavtYyE2/TmYwtCmhjzoRTSRdiIX
+A7wlcL9EMQ2hhBwqcgl2rWqiiR+cYQHSvFaOT1P+UYBaipKcgQ8icR+XV3NFVl6XC1k2BJJyiYdv
+zI35AoGAQLNnfKAMELagnTv27NasVqqKJOf1CP2zo4xDIcpXqoBEBxvvXXr8B5FO1GwBeit/3Koz
+u6HRmvPUFSgf+QcAtj3U9V/x2mtrnKFJUlWKtfcfLbKkBMp/NeUD6jFAY353KhJEDRELGgetHFUV
+uPlvxHkSLcz/EbiM3TWqkJeJ6XQ=
 -----END PRIVATE KEY-----
diff --git a/tests/data/lecp4-la/certificate.pem b/tests/data/lecp4-la/certificate.pem
index e3fd7024..b614069a 100644
--- a/tests/data/lecp4-la/certificate.pem
+++ b/tests/data/lecp4-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIELTCCAxWgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjhaFw0yNDA4
-MTMxMDUwMjhaMDIxDjAMBgNVBAMTBWxlY3A0MRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
-MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMBZ
-4PA9h9y4QZEL6PtIAkxEzhey3cJ57aR6fQu0cGqRJIv/pDFjDM3vhxvCHJUPuZR5
-jGoY4apTEaWnPtr2Q9FRT0JI+wtGbTTDEvMhx2Vb3xH6+59QnuC3fRWxClbrlizy
-cRMOCA+QYtJH3T31cQrxjbEEg1JN5+yEXXiI1E+VeUmyz6uPFZhN16CdjYBIFPqX
-3lWAT2ZZ7+T5o4q9w9XRvPbZszj/GdZYyjaIXI90IcvnYURO2knsxEEq5UBswmwj
-VCUQazuY9FhQpFqGFZFhFzGdWmxCTwPZsX4CRuIwDW1lKOagZ1ZRdDtD8j0DUSyI
-xOwc91mBBV2Lgl2/ggMCAwEAAaOCASYwggEiMB0GA1UdDgQWBBTWt+JrekHEjJrL
-DcA8/uST65T+dDAfBgNVHSMEGDAWgBT8xxbESz05n3zd1JEP1RxGHQigJTAMBgNV
+QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjVaFw0yNDA4
+MTQxMDQ0MjVaMDIxDjAMBgNVBAMTBWxlY3A0MRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
+MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALH/
+iLepEu10mDMrhRP6QCQfA8j2lbuBDdEO1tKnInxYRe35Hrf0wzpjX12zAwcTy3Bu
+JMRPmzBO/scHAityRI9WHeyBG579CJT4/qCiO9KZizJLU6/4uAbKOTdWRgFsF/V0
+cAl97g2YRnJFKa6+qmIhcIS0XQpHffWhb34kngJ62Q5al/kGIbVaCo22nud3Jq+n
+kaCmOLHWXMbtRCYkC+yK2wOGyzbUJ6jA5j9Ofu2DuNldifpkkBCteQ6S4LsrrTqg
+gHrCmlSA3tparRvnwLI2JdAJVuBoWtqnoQE+j1bGm9n8BnZCPnAFYWvErEGOV6mA
+6vdrrLfDSeMvZBvKRekCAwEAAaOCASYwggEiMB0GA1UdDgQWBBT4JLpTivtkm4O1
+0+DRm+AgC0WUfDAfBgNVHSMEGDAWgBRTgoU0SwA4wSUVnVzRh9irf/U+6DAMBgNV
 HRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
 BQUHAwgwEQYJYIZIAYb4QgEBBAQDAgeAMCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNz
 by5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28uZW50cm91
 dmVydC5vcmcwQwYJYIZIAYb4QgENBDYWNEVudHJvdXZlcnQgTGliZXJ0eSBBbGxp
 YW5jZSBMRUNQICM0IHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEB
-AKlHSfThNmPzMW2XdCDZ5nxvr/kYdhxkIw37DFMbNEfn+7wv4gLT+gtgnvkTg1RZ
-e7diWX1YlE9sXuBjeXkU2tY2SW8EzOJKVY4G2N7MhFfoSl+ztd0iXcrVeA9M1qYg
-Mq/NaVjJMEav+l6iSmU3bmDpGh/Zzn0Jueq4Kxp1LL9OeQU6XlHiDsEalWSFT1Yu
-AoqWUdE5GCDz5SA4gSb5z8JCwicoy00ycOJBADFyPlMBscu/wZnGDv5p5fumpcCZ
-dV3BXDZpe8cLrQ7jUmmhP7dnyNmKiguDZ+P2ORF4owpcxe+v/fgf6ICRrraM5WXY
-CM9HGGYugig/16aYsJw0+6k=
+AD5rVgOnM7M/xZiwSQ9toHLuzgv2aioZ06rhWtloeWBHAE9nHwtTJhJdY5f+IZYC
+jW64xoWeuLngMilC9acWvLMbo0l//wyOmBiXJdtwTSTmeiG3jNnV7GwqSHg6Jphf
+gaigyIIhmWFoZfZLGvOesC68ojEE4VqSRTyJbvVUpXE7av306dOAZAZ5w4JWyHc4
+xD9qyb1hNhcHSVXO6VI8N6y3+SDXyn9+7gp/lvrj60Nuwj2qXE0ZxRPZBl6BuA3o
+ZycpGS4eW70nJVWM8mJayB9HlJe3lEbqles5hVIfZeeJ6d06jhinxvjPJHv8WuuH
+1tFvZnasR3Nn7ohpM4F+aWo=
 -----END CERTIFICATE-----
diff --git a/tests/data/lecp4-la/jks.keystore b/tests/data/lecp4-la/jks.keystore
index 4b07f1d8..a9ead375 100644
--- a/tests/data/lecp4-la/jks.keystore
+++ b/tests/data/lecp4-la/jks.keystore
diff --git a/tests/data/lecp4-la/private-key-raw.pem b/tests/data/lecp4-la/private-key-raw.pem
index c3ead521..f081405c 100644
--- a/tests/data/lecp4-la/private-key-raw.pem
+++ b/tests/data/lecp4-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDAWeDwPYfcuEGRC+j7SAJMRM4X
-st3Cee2ken0LtHBqkSSL/6QxYwzN74cbwhyVD7mUeYxqGOGqUxGlpz7a9kPRUU9CSPsLRm00wxLz
-IcdlW98R+vufUJ7gt30VsQpW65Ys8nETDggPkGLSR9099XEK8Y2xBINSTefshF14iNRPlXlJss+r
-jxWYTdegnY2ASBT6l95VgE9mWe/k+aOKvcPV0bz22bM4/xnWWMo2iFyPdCHL52FETtpJ7MRBKuVA
-bMJsI1QlEGs7mPRYUKRahhWRYRcxnVpsQk8D2bF+AkbiMA1tZSjmoGdWUXQ7Q/I9A1EsiMTsHPdZ
-gQVdi4Jdv4IDAgMBAAECggEBAKS00a4log7YIBzJrAhvkrgoOqmEWevLaDhtQmIhchlui3LtxnUb
-sb0tm+2i+8KQIoMGybuX7rRgST4lxebM9SlpjIrf30e6WIzTdYiHpiwezRaiaY/0Ave9ZviKDqZ7
-OK7oMvb0Dub05gnVy5bgcpnCWWf4y1JQr4WRmlA6KkKx6WYmaGp5bJ+R95KovbM13Oj9j3k2oVVN
-7oVLEKUJIXNdol71+BJb0BARB47UZuT2KKGmWeW2AaTGc9lTHVtxLy3LrgRna0CV389uw6XP9dvY
-YEjqH3BkyITKKjPR00Uk+gX8moNqMSvRB37wcBJVHFnqMp0roL56gWlm3yWT3hECgYEA5HusV4GZ
-xjHiDSV+jRcfvFTglDbq2PH3pmVAlZxa8Mb+oeqc2qgvfWHKJp2XJUpzY4icBmRTCqSXpNnO8DCL
-doHn9zPeqFV1stsjB/ouukRO27fXejxfDe28NkygztUHfEzuF9Yl8pD8/+E79OiDPgs36japezq+
-+umEb7RbIGcCgYEA14Q5n33qJZ5RoNZ71TqVXS/ffHN15He5/k4zoXW6Hfzv9wQPtOZfeH2Q/ExL
-d9cj9ALU10/W/bdznGqxrggyDAbd9xzohLQB4Tg1wy+FwHb77v7ZMFhN7HB0Sb4tL4FGGEL8bwKk
-yYCAE+WT1P2xUit1dLf1gZEEQrpsnc3dIAUCgYBdFNEqOR83ch0AdBTxT8lbBU0UtKbKSRE2FavR
-B4i47KjRt+282qW2M7+SKcNoqsMFeqLtq7N084bf3ugCTBSU6+lfeR8tfttbSRElb9PXiHqD4oqD
-PtMOrpptmJwuhvTsu76HsXN2NYEMkWrGpG7LOPDHlwtGq7EgMUAF7fjt4wKBgAcYtYUI8mLWub1g
-EqfMzApLf0Jr0t/5CUjUbmLMq5o9L/GkUpgUVeRzzghgwsNpdCeeyD9mw5+LIOVvpfYjEvLObxSq
-AQYNn1o5LZwFvpO910HhZmlvHvHAKjQbbQV5bkNyQTmujpqL/qupDZsf12zrPWzgedcQXWGNHfJ8
-SuG5AoGBAIu0pJvhulSFkcQC/EeXyEmrlxNKFq6UK20cRwTum25xwGWxmNH73An49y6B9a+YAOaM
-EilMB6ZbqL59nEMqEeXy4hBaBLkwxwjsHGfDrlnWW7QmlsOV5Ny6I07Zk/c4EoZjEUyp8PGAMJ6F
-NnNtvLdb/PYW3i3UJ/b3f4EklvQj
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCx/4i3qRLtdJgzK4UT+kAkHwPI
+9pW7gQ3RDtbSpyJ8WEXt+R639MM6Y19dswMHE8twbiTET5swTv7HBwIrckSPVh3sgRue/QiU+P6g
+ojvSmYsyS1Ov+LgGyjk3VkYBbBf1dHAJfe4NmEZyRSmuvqpiIXCEtF0KR331oW9+JJ4CetkOWpf5
+BiG1WgqNtp7ndyavp5Ggpjix1lzG7UQmJAvsitsDhss21CeowOY/Tn7tg7jZXYn6ZJAQrXkOkuC7
+K606oIB6wppUgN7aWq0b58CyNiXQCVbgaFrap6EBPo9WxpvZ/AZ2Qj5wBWFrxKxBjlepgOr3a6y3
+w0njL2QbykXpAgMBAAECggEAFKsxevIdComxaq+xAkLa09buH5XSiTVRH2dztn5F2N5/METvNjkr
+uknztvOkdFvuEZ4YktsTkCZ8GyxLKjRYlbRQQTg0tt928aWAG7L681d0/GAW1aYx6EfvIOfZtSyS
+E6RzpgaDb/ywoXA6iNoG+uIbKK2w6BKpI66dPa6O0oazvm1abzD1+CLLILPRyrt4sgOz/BRVZ1yl
+wPJU1Zy0Y/f/Bak/qeoQRMTIiIjcZoCpWnn97uiGOoYRmmCDJ8w63FLQy/HOSotzOStihJaydFd0
+kh3crD3KdBDPJ7l5oIaKJ7rK6iNyXHPhN9VFQGNCuIUrCst9/EC4LQu2j105AQKBgQDVtmiMoGBy
+ik56Zwy6qXS89QmIYVf7lD+EfsHB+DvRyX4bl08SSF29dujyeZn6uOJVxtIPRB/DP8nXFMOQMJpO
+kPv1frPd1SEIYqvSqtbAJnh4eOOLVA093u2NubKEt3bSC1we9Tv+wdrYHhZzgk6AGNRzO2P0TL71
+849fncOxuQKBgQDVOASVp8nouQwgSBHjwLEXQtiAm/B3yzym+rpZ4WznKHyImeRAMTagmJyihWfr
+ot3PJyeODu2iZPZVD1Xj37KVeidukSEpv5FuTCHplJ3Z5Gs6gg7CQpn/HakloQISfnk1twt2k7dQ
+CGFhaob2BFQfj969koAgCaOh2qMxZiYNsQKBgC+IEli0kr7m4+11Xe9mIQClvykF/XuGzVm6l318
+qFFQbyvTy1JVpgOtnsHPKeAJns1VGwMqM6ZJWarsg1JefPNca61+MKL19BLZXz3LoVe7NrAUswcZ
++pf4LP2If5vk8hhlTmfUQzO2CeZnSrcGFE+JNjcqzmBXcWFielDZ1dyBAoGAS4IoFXuzRGhsA+6h
+7z8pN+yjUYBn+3SNCTFX10a+02oCGDovnBARoXQKXH/UGp214YujNWrR+yW4Gs1whF+PFeKJnl1l
+GizOavopNFg+QpDi7Hhsk50UfkVZxoqrejMx57ToKVkMnRoqql4YZ32G8Rp5Ljd4il//g+0yx+a9
+6TECgYBZwsKrgMTqGv1rWfppze5YA5KvIVcPK+KhU8u6/vrXRPlKz2AcHKlUqqMf4tNYFin4FViw
+fDrX6mIvro0Xi9L7HekD9GYd9sQdp1OsY9AeiNJudHSh35B/R+mL7Z8g/VgtQ0+zlL41GzkiiFt6
+RNfQUGy0G/+5YJyJO31Fic71ZA==
 -----END PRIVATE KEY-----
diff --git a/tests/data/lecp4-la/public-key.pem b/tests/data/lecp4-la/public-key.pem
index 89fb1801..a444c836 100644
--- a/tests/data/lecp4-la/public-key.pem
+++ b/tests/data/lecp4-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwFng8D2H3LhBkQvo+0gC
-TETOF7LdwnntpHp9C7RwapEki/+kMWMMze+HG8IclQ+5lHmMahjhqlMRpac+2vZD
-0VFPQkj7C0ZtNMMS8yHHZVvfEfr7n1Ce4Ld9FbEKVuuWLPJxEw4ID5Bi0kfdPfVx
-CvGNsQSDUk3n7IRdeIjUT5V5SbLPq48VmE3XoJ2NgEgU+pfeVYBPZlnv5Pmjir3D
-1dG89tmzOP8Z1ljKNohcj3Qhy+dhRE7aSezEQSrlQGzCbCNUJRBrO5j0WFCkWoYV
-kWEXMZ1abEJPA9mxfgJG4jANbWUo5qBnVlF0O0PyPQNRLIjE7Bz3WYEFXYuCXb+C
-AwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsf+It6kS7XSYMyuFE/pA
+JB8DyPaVu4EN0Q7W0qcifFhF7fket/TDOmNfXbMDBxPLcG4kxE+bME7+xwcCK3JE
+j1Yd7IEbnv0IlPj+oKI70pmLMktTr/i4Bso5N1ZGAWwX9XRwCX3uDZhGckUprr6q
+YiFwhLRdCkd99aFvfiSeAnrZDlqX+QYhtVoKjbae53cmr6eRoKY4sdZcxu1EJiQL
+7IrbA4bLNtQnqMDmP05+7YO42V2J+mSQEK15DpLguyutOqCAesKaVIDe2lqtG+fA
+sjYl0AlW4Gha2qehAT6PVsab2fwGdkI+cAVha8SsQY5XqYDq92ust8NJ4y9kG8pF
+6QIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/lecp4-ssl/all.p12 b/tests/data/lecp4-ssl/all.p12
index bb5519f3..2eefe134 100644
--- a/tests/data/lecp4-ssl/all.p12
+++ b/tests/data/lecp4-ssl/all.p12
diff --git a/tests/data/lecp4-ssl/certificate.pem b/tests/data/lecp4-ssl/certificate.pem
index 647aefab..f590fb57 100644
--- a/tests/data/lecp4-ssl/certificate.pem
+++ b/tests/data/lecp4-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEVDCCAzygAwIBAgIBAzANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICM0MRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAzMFoXDTI0MDgxMzEwNTAzMFowMjEOMAwGA1UEAxMFbGVjcDQxEzARBgNVBAoT
+dGVzdCBSb290IENBICM0MRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyN1oXDTI0MDgxNDEwNDQyN1owMjEOMAwGA1UEAxMFbGVjcDQxEzARBgNVBAoT
 CkVudHJvdXZlcnQxCzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEApvdnVElmRyrzujgp37ZTNVa9oa87AQy73+8pnxeKQSCtADcaBsvO
-VK0thWHsdQILCOCFQDypTmLoZslzijPKbE46IzsB8hFjnIWks5h7jC9anEMXdLYk
-Lzp7R8KhvS3Bbo2u/LSFlUdOhvzYWPeCYUoqsoSUa9952MTxFKMCQtgNcZl3udZM
-C60Lm30/cOFT8P9KGOavL07739HqcGoT2ulSOfG/oGzMFsq6J6/zZUNFxuveL3M/
-qVdwF9CIDPArgNWt3qllVYYWGGdKfbuvNySMgiqZe+wcXOBHrd8W4pV2XiCuXD3y
-1a5IusUgmFN6WHjP6Ir+/XXLD9/DzZGwCQIDAQABo4IBQjCCAT4wHQYDVR0OBBYE
-FHB/Zm+1Bi+TLGS9k/ePpIvxxwdDMB8GA1UdIwQYMBaAFJ1ISWm+rk4t/B1XV2Mf
-ETbxpC8MMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgUgMCoGA1UdJQQjMCEGCCsG
+MIIBCgKCAQEAuuEKd2NcgV4rlXlQhQvQ4SSZdcr+UCo/z66rUgfpCF2Y76mJj1/C
+IRruq98Blh2rLCYsCK1u+PdzRKqNJv1GyhIy2bfhFIhBoVTtfYehkFkCX/cmC/e/
+aE0OX1yrp9dy7MtlhPt1jBdPz6nWdqJZ8KfiEE+lQhh8LdaBLU0XB50aPz2jlUAv
++ShcwVEkW0qP7iEf5X9Tey6oyGVroZFpHQRJadQaIWaoUsNjMJdiQs993a9F+5QR
+8vMRWCN3q236r02MxAIt0VfT1Nd2tHqHYrIJnmMgy/ysJ42oBPdOFgD7QEbwmHsk
+Pw2xdgIkgKK7MgSroZXSfx+RQLULrI+KFwIDAQABo4IBQjCCAT4wHQYDVR0OBBYE
+FNa9gzuNqgNn5fNoKZ/ZaGffGjfyMB8GA1UdIwQYMBaAFJPUPC3UwlXn5R7cKqN6
+OrrvOoUeMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsG
 AQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEwEQYJYIZIAYb4QgEBBAQDAgbA
 MCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNzby5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIE
 HzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwUgYJYIZIAYb4QgENBEUW
 Q0VudHJvdXZlcnQgU1NMIExpYmVydHkgQWxsaWFuY2UgTEVDUCAjNCB3ZWIgc2Vy
-dmVyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEBAF1OnXfdDazV
-qF+597G8nkkUPjJeNAeE9Wzi6g9BZ5k2v+zApT/E8jIPxDYFODoY9P+BepvhQglT
-VXshriPTTBGhy8EMth5Eci6JLcsscHiaJx3qu+2VLVzbIRpEwYbmbvHcowDM4cme
-41LzK/Aoj6zNPMRAQYJIUZp60r54AAUoZ6ZPCyVKNsP69AqxzgVwDlRj4AkzCbbQ
-l6yt2cQOxSarXVQP32xTzl+zYvj1FBVHzweVmqaPLB1VY3hc/10Y889RVPRcWVqw
-goNcx8f7VgrKrD59lj3RRupNnB31p1UxB5GBzwLkRxvNwIskHKY/vMXzhq+3UxRd
-f5+yW4SyPw0=
+dmVyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEBANBC4oUjXkX2
+UmCyhq2+e0XjMqhZJs+uv9AljBdCW4eimQ75iO2Hf9X4TWuJ59pCqRCIhRD9Xo2o
+ykDZsKI2K/olpKyWHVoeBvDkV6mhtNqPl/GJh6AzHl886rhDF4zHg0zw+GAvivPx
+y1gyHmdxf/ZqrxFhsJnsiRKYPr4g5IoxqGm0sCam8Vc0jSZGOBYOXKfUguF3B8iT
+WHBnelNtIzXzWBaHOQHDJyMxU5JrEqS/tvzf0r8ThMa19R7iSlkn34+XTSuCEBkG
+rgVlue3ZAV+WY41virBsuxsaFG7lQe+ZY+rcalQfISE/1/RmeUFlyw3s1VpNUQh/
+7eP+zAU+jlA=
 -----END CERTIFICATE-----
diff --git a/tests/data/lecp4-ssl/jks.keystore b/tests/data/lecp4-ssl/jks.keystore
index d912a724..50a8c2e8 100644
--- a/tests/data/lecp4-ssl/jks.keystore
+++ b/tests/data/lecp4-ssl/jks.keystore
diff --git a/tests/data/lecp4-ssl/private-key-raw.pem b/tests/data/lecp4-ssl/private-key-raw.pem
index d59e612e..f90fb8c6 100644
--- a/tests/data/lecp4-ssl/private-key-raw.pem
+++ b/tests/data/lecp4-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCm92dUSWZHKvO6OCnftlM1Vr2h
-rzsBDLvf7ymfF4pBIK0ANxoGy85UrS2FYex1AgsI4IVAPKlOYuhmyXOKM8psTjojOwHyEWOchaSz
-mHuML1qcQxd0tiQvOntHwqG9LcFuja78tIWVR06G/NhY94JhSiqyhJRr33nYxPEUowJC2A1xmXe5
-1kwLrQubfT9w4VPw/0oY5q8vTvvf0epwahPa6VI58b+gbMwWyronr/NlQ0XG694vcz+pV3AX0IgM
-8CuA1a3eqWVVhhYYZ0p9u683JIyCKpl77Bxc4Eet3xbilXZeIK5cPfLVrki6xSCYU3pYeM/oiv79
-dcsP38PNkbAJAgMBAAECggEAP5EbltxnAxtYNYKidpicr0b55W+oYCrv8D7GstosecUt+FICJ6o6
-QMS5+vkgJCAGAXgxYxZ1QvGnF1MFGQ3EuF1EBxu1DusN6I58+R9JkkKJFcr5SCb8ObrjKpvwJe0g
-oq1wfKdh4EaIoB3tZFm/Grk47kRJmZQ4eI3qVvgEqVuoa+QuCc5WhyS6hirEjKQieQN2If3XwT1/
-acJ/sFBmNXbATJlPkqu7KW7DbO2gRW977TB4rEApoKCx6hSQgEx+OtGczH2idl1e38Z9eDhPX66B
-K3onLzK8DNK4+bdH0ZGjVPs51EXOCjhgxUrqD9S75WkaP/YIh/W2ZIdrOLc0cQKBgQDcXWzy6llu
-UxNUU1CocHiMJLnhycoEqC3/t+L75m4x0qZDw/UDYIQAiRhZ/ObO+3WgTQabYfM0YDVfWEOCKjx5
-UCamrR7VUW3Q7GqexjVkPiBffNE/xc/KCTsVWvW+laVK9N+75VmnYEjOxyFR7ImX6mbgrMpS4M7l
-Mh6tfblNbQKBgQDB92ic7AHK620o4ggjepRlH/vprJJSR6BeKG09SYoNSlEiwxXxU0w/gvcpL7XE
-5Bs4KHT8aTWT1FGDS17oeKILEf9RP/upBRd87HvCntSsi+Qask+GVDhB38J7IqfUIaAkSMZUm4Ys
-8duE3zHYOc+nSglcTDeaOobh/EUOJLpXjQKBgBxaKNpYLIl1RtdioM4LKnddgkz6mXNf8AsmrZ2b
-WDIw2BN/8tYsZM9s1CU/1LJsyAWH44G6aIAkoLlTsdvdc0podZCcVYs8ntRyloU3G0d6ds/ST1nV
-KZbk+SUWPuf2eP3b461ZJN/UE4oHNNJFjK5vCi1+Dcn8AqKagDfyJRVBAoGADQjHKuRhKnWvnDO0
-QE4YcsM3dnh2TLkreahVzuyGLmZ0FVXuv4zNbucqHMZr/JMnkRqG4f9f7lMyNxR1iEGzAfNvqNIX
-4z/IWEi7+FQcDoxIA9M/rNM0BJk4xHWLuaGY1VdenIjm91Y5XjBxdQpNffxnrKAijGaqcb02FsE5
-FHECgYBOi7FEU5VJwy6ga920erQ6Z/XR3FmpwSzAtk4fcUg9uApHzveyaOxhl8vLcCsWe6NDusRp
-KKrIsuiSdPzjpxR17krXNP0fUluoyB1qvvvSCv5P0TqMi67gzlH6rXdamwhPH5KVptnv5wIyGKNp
-/4V2tvttLUMR3OxBN7G5bhjioA==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC64Qp3Y1yBXiuVeVCFC9DhJJl1
+yv5QKj/PrqtSB+kIXZjvqYmPX8IhGu6r3wGWHassJiwIrW7493NEqo0m/UbKEjLZt+EUiEGhVO19
+h6GQWQJf9yYL979oTQ5fXKun13Lsy2WE+3WMF0/PqdZ2olnwp+IQT6VCGHwt1oEtTRcHnRo/PaOV
+QC/5KFzBUSRbSo/uIR/lf1N7LqjIZWuhkWkdBElp1BohZqhSw2Mwl2JCz33dr0X7lBHy8xFYI3er
+bfqvTYzEAi3RV9PU13a0eodisgmeYyDL/KwnjagE904WAPtARvCYeyQ/DbF2AiSAorsyBKuhldJ/
+H5FAtQusj4oXAgMBAAECggEABGlJgPX0eg1KBBZAA1P7E0V05eXryOKmbPWXj7EmHA9xi765w4uk
+HnnvRllWRT/gCYPBKFdHtlLJAsbv3ArAgAab8q23f2+T9QX3MS5hbvHa7377A+9OMl0XSML8PlME
+oHhQpin1ZWArfyBoMpa0fszHtlDa+stvKvnURMh8Ea7mVngw0fSV9nQXeNkNf8/1BTAuwRblqACb
+8BNB3qXm3LW2nJbGf1kovM1KWQzx/uZ0L9ksaIDyZIO7DoAQ5jO+eAVcU1QuxpYYSAmWjXcNhYHv
+9+y2D0GmmU0dMjP6cT/SMMBcqyv8vvNqVC9wpZqh0hxkIwEYZDl6wayFCWZxYQKBgQDoNiDPcnox
+3ziRk7sPguC/uLm2fF2EnBhqauHJQXLb7JgShJchNDT4HMu2ylPfbIU5KWCktBxE45oAkaxkX02C
+5b/J9pEbEeSEefgMuZVxVOVIwr8fAzZV8b3MjA/JkMG5TJa6tqiES+S9BP4ohjm4U69fPAuU5Kvq
+Edk5lv5xRwKBgQDOBgvmz6JtdsNKm+Ao5BZF14rVlzGSKAU1e0TCqPgTSyKv+lsTYhS3AIMmTY72
+iMU07v5UN9qcVP7Ilkop7ImaaW/qvCXDBiHqOU0yNDd/idXGrDNRDijSfqvdkjG2SvQ4wXS7qxr0
+MLFD8E8kBHVaHqujij0Pi+kl6qJySJ8IsQKBgQC/gcyDaZUPRlof7WdLfpOeall2/5AcyqN0OFun
+oDt61t///auqLaU1roHvaWPMknI410Al9YiO4+phZ8J2MQb62kHW7Wt0mMgO3YxN6kwuYGaMIFiA
+2iRYsvrmE+j9Qk4SZPC2YegO24x0uwZlI3W85/9tGlcu33xMmZW94iJMBwKBgBYvPn7XIuVooXTa
+PhQJI4DXyeJgCn1zg8QThv7zFOt27sBGVCJNMG/YRUcNmPRhG+MsTQSikw68dEcDL+89wj93VQ7Q
+vbw3X9WJ4A8k4kkAfZ2ME2aKAMlRzI3qXSIFBjFKW5iNvzRGPgBT0yHMvRo8LT1J+HNBHJTxpBZs
+TXuxAoGBAJ+4cgh0pyerz/RCAGJKm6amocqiA/QsUWY2Tvyo2ucteJU1+tO164Mdmsq0CQt2jFxQ
+wdAQDUN+j3LTOrUb9b/a2IlkxFco7sNI0QuI3OYb7ODVmeuretk1XYTFEfcVi8hrvpSPBKTZwKbo
+2aQTfeppYHXGA2xwD6pSHji7uImt
 -----END PRIVATE KEY-----
diff --git a/tests/data/sp1-la/certificate.pem b/tests/data/sp1-la/certificate.pem
index 6066b4c4..7aec49f6 100644
--- a/tests/data/sp1-la/certificate.pem
+++ b/tests/data/sp1-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIEKTCCAxGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjZaFw0yNDA4
-MTMxMDUwMjZaMDAxDDAKBgNVBAMTA3NwMTETMBEGA1UEChMKRW50cm91dmVydDEL
-MAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+GmTx
-BIxxJ3Y4SmZN/ZERfzrfjxtrd/wEGlEJh8+RN3rxoyclV9LV8xKI+mt25YOUdRvD
-0ILPPyyrcAB0VH/xrh0ZuzOPdQRbXcX9GtfQUqj3SUAsGJ0hE507hrBBnLx4qWPM
-oD+okOGpoYAJdlyCC3s5vXsiUxXZs9UzAMvBzJ1OOnQyrwRx/iXpIEEyM1oRVJ8f
-fw3Zu96muO2mmzNSmEJ9ckzkKGXQXAkkciwFgGl2JWV4Z+KF18rdkXQZ63exfyYT
-QlPqOICx5CpBv4V3spbmcN3F/h76ZbIBgISf8IRw03GLgXYxyYT39n5Es/+InQs6
-z0vMN5FqY0THhr6DAgMBAAGjggEkMIIBIDAdBgNVHQ4EFgQUPkVCYx0+Vxn63VQt
-x2g0u45v7VEwHwYDVR0jBBgwFoAUtRJoVBMhtlome3T/Tv2bnB5yIaIwDAYDVR0T
+QSAjMTETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjNaFw0yNDA4
+MTQxMDQ0MjNaMDAxDDAKBgNVBAMTA3NwMTETMBEGA1UEChMKRW50cm91dmVydDEL
+MAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDp31xe
+vgm/duevyJBUBHYfD5I1gr6GK4czZAGv45YPBHmkSJDF19NroBm2lcM6koYgDsOK
+794lTv/AQ5HDRxLc5kOSSl/NLxGiwkEDyVRa5K1weTntiO9E4YTJY8hRqvS+beEP
+aaNf40uZL9ORcdH9+FIL0r0HBPnau2rohF1AESaRkYGxiku9THQaod684ZhM1ML/
+bm4GG1C/EhAWR+To4GfPmrSBsFARj3gVs3ARpruLtad8PF2y7cSCCt/hjp5THszp
+ZuF5kAQcrjvOlbNpvX2opVDIuCDHOoQb5Tr7CLijL41B96+Yf/Kof91DXKrhrkyl
+DTxqaZthT1iojCLxAgMBAAGjggEkMIIBIDAdBgNVHQ4EFgQUMz7UqfXVQbNyu/+g
+/12wHF8YhlEwHwYDVR0jBBgwFoAUPVEBSNwz98I079j+JBjSvxLYWogwDAYDVR0T
 AQH/BAIwADALBgNVHQ8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
 BwMIMBEGCWCGSAGG+EIBAQQEAwIHgDAmBgNVHREEHzAdhhtodHRwOi8vbGFzc28u
 ZW50cm91dmVydC5vcmcwJgYDVR0SBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZl
 cnQub3JnMEEGCWCGSAGG+EIBDQQ0FjJFbnRyb3V2ZXJ0IExpYmVydHkgQWxsaWFu
-Y2UgU1AgIzEgdGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAhs0F
-PUvzHCpM0EDygPQBa1fvvYmTEeXxpDEAA078EHmN3fQmADJDrEreZBQElCY1T0bI
-P+tO2sMUJCkrlHAJ6SAK0OYn1hLp1eLnjCYkGFL6JEYNb4R0NU03P6pH70JN3Tep
-H3N8943CH6TvjVQRCLqvC0ujUEi9q1XR+G9COz6gh8NyGLbfJDEzRjrlqxsM0vDT
-29gfckNP9pGJrYys800oKJbIOHTbXg/VAOiUP7v5dDlIYIsbZjpmnkGztMoXUBGj
-lV+KQWa5IWWPQ/5Rpme17B4J+EyuQjnvKkqxBWZXVVMOUrtLedmHfBxoddvmneBh
-NFM1JpF5Ou87bR+sWA==
+Y2UgU1AgIzEgdGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAHMsK
+R9wa2hPlts3KKfv6miBGqfmKH3L4HHBOcMSWQupo03PZ/zkztggcdj9n48pvMx3I
+pqoI1hV67AXV3BUf8vwFve6gxO+ansguO1+YltbKdcYVdE7ctk2BzoUFfywEgh7R
+kI7oC7qPQH9EDus4VE26l51ZdzuRpWd2PpVs7LQUihir0ZLQsnYnoav3uXuUwLDJ
+d+0E/Naym6kbkl5UFZoADVMuGHyjnz2s9E4na6FMaw4tTdHPHvwlralfDqvtc5wm
+8xOepX/fKTOXjlL77Pueb0yAzUplaFGUb+B3gAprXAXtKoyK+f3HIlpwSzyfEcQ9
+BpkotYp9ca/aX7liZw==
 -----END CERTIFICATE-----
diff --git a/tests/data/sp1-la/jks.keystore b/tests/data/sp1-la/jks.keystore
index 632afac2..bfb95e50 100644
--- a/tests/data/sp1-la/jks.keystore
+++ b/tests/data/sp1-la/jks.keystore
diff --git a/tests/data/sp1-la/private-key-raw.pem b/tests/data/sp1-la/private-key-raw.pem
index a93ba8a5..5d7eb1a3 100644
--- a/tests/data/sp1-la/private-key-raw.pem
+++ b/tests/data/sp1-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC+GmTxBIxxJ3Y4SmZN/ZERfzrf
-jxtrd/wEGlEJh8+RN3rxoyclV9LV8xKI+mt25YOUdRvD0ILPPyyrcAB0VH/xrh0ZuzOPdQRbXcX9
-GtfQUqj3SUAsGJ0hE507hrBBnLx4qWPMoD+okOGpoYAJdlyCC3s5vXsiUxXZs9UzAMvBzJ1OOnQy
-rwRx/iXpIEEyM1oRVJ8ffw3Zu96muO2mmzNSmEJ9ckzkKGXQXAkkciwFgGl2JWV4Z+KF18rdkXQZ
-63exfyYTQlPqOICx5CpBv4V3spbmcN3F/h76ZbIBgISf8IRw03GLgXYxyYT39n5Es/+InQs6z0vM
-N5FqY0THhr6DAgMBAAECggEBALvlSrAOVuHgpzCsGMItRh2NK5ubzvZB+Y30lPRekAJwW8xJ/n8i
-dvmQ71kEawNxhsRNm8vHZAOD5ZrtcQWKH4u5FHpCVYwNlOjZnr+0sGrvyKHifNMY4PW4dUhIsB2p
-1X9NrZ6rJUBvMxx+zBaOLpE61+kSJ4qdpJMw9CEdQEejSbJ8CfqSRQJ3OT/0xIxKkvYvZQz2EDX3
-krwgG9Ad/NcZop/u+YfHF4lxo+n4VatR6aH8WBoIQBMWUksT8JtJJuBWbIisoCIpRIO1MTF9HCBb
-6gK8yZ6kNGDcBE+G7BrcC0ksI1Oh20gvwFr6IEUTCeMBJ8aT0MpOXcCnIHKxlsECgYEA5prjOU3k
-ndhWrTcd5dByO9gXoBoONkgoTLeZz7mWKmh/yF1t90PkkYnZi5kt0LPwno+1NF0x2T279R52ysLy
-Bwipyf+/LiEvLaNasCMN5nn8HjXE0u80n2LpXMEtJa7Hx6fnhc+SZcs2T0ZF5ncsnbbyS925ygLt
-W+RYj4u8DKUCgYEA0wmx23rr2lR96ZoFHxWwLKtddCTKzXeOikzCQlDTiQFG0ftFphBP2KLrqGbk
-HffFpdR87NIcq992xlf6RX9Xhc4ewRhQPdmxX0XT6jTE2njT7cWbZQ8zJjkbwV2/fEZ1038hbhco
-tJwG3H4lFmYpM0FjYLRU7raLZwHtncRN7gcCgYEAl5UCfZ2FBHi7aPrM7U6aeFnwFa5q3yWJT/xz
-34aHffLY5BT9/sYjDcPGOywCYKiXJzMhkn0cEkexMEvJHDkOrK72JLC2s5TelSpGp3czYOeYYSdI
-7LqOJaL38J+OlLGR4tyspFmwSrdMSMnRks+NhVJHbLUftfk8muW7jQf2IX0CgYAriUR30tP1JpkT
-KAMGdqLxlCijXTO5T4DIZy1sIOCC0xCZIQ0tRRAz0OhsxU0qIYNUwpFDCdWAX4lRQbUPwUV9BRiz
-HSDwoYhF71HYbyptJ6AQ3UNBhfE3YXCoY36tVJvaFc//tidfmxCPTDa6eDjnqgWmXY1n8aCwj2VF
-tsmc4QKBgHXtYgk15nmdxPZUdT5/OZy6G1qtFJSMWnIjPirNX585nJvg2lvatc5zsAck+vH8cOyA
-tyVIXndxQvKc8QvIuBY91smiIR65Wh6ipX8TrzSfRYU7OCWkks5F6w1Cg0fjMxljFI6D6r1qG1qN
-kGCc/A6vgpnmqdNg3L5BUlXs4l74
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDp31xevgm/duevyJBUBHYfD5I1
+gr6GK4czZAGv45YPBHmkSJDF19NroBm2lcM6koYgDsOK794lTv/AQ5HDRxLc5kOSSl/NLxGiwkED
+yVRa5K1weTntiO9E4YTJY8hRqvS+beEPaaNf40uZL9ORcdH9+FIL0r0HBPnau2rohF1AESaRkYGx
+iku9THQaod684ZhM1ML/bm4GG1C/EhAWR+To4GfPmrSBsFARj3gVs3ARpruLtad8PF2y7cSCCt/h
+jp5THszpZuF5kAQcrjvOlbNpvX2opVDIuCDHOoQb5Tr7CLijL41B96+Yf/Kof91DXKrhrkylDTxq
+aZthT1iojCLxAgMBAAECggEBALf81ohabQTJoH+0A4d1cxAAif+6+fRHrjeJx6H+I4Fw/dl2lR5w
+Ko2TCGeR7mLX/tidhMx65ILpYV56SeQcuAQ8yo/+Htwm2XL363n1G33eRWwkkqQChGnmGTbuXxuQ
+qLZfbx1W+AZppIHBFGpp5tAsWS+f/MHW8lFX/EUsTMgmtPTOL5lb5wnC3gRVSn4KSrZ6QhTfKbKu
+dxNsoDMKVlZIwgKifqbx7cq0sHe9oUkSDdi1pvXKokwwOAup6AU2fQhL0/UtkaAVPNW0z0ypPMmY
+NZr4m90Dh8QrbkxXRn85At59bVMe9yS9p6/kp4SnydfEl0LxJqc9yJKcntjRWzkCgYEA9rHBYXAa
+TlthfK+y98txzEfUv2VLd3yASySQkriVmBlVwWUuObgT/+Xbv3OLuy2p3Ss8LT4sUp/zw16GIooR
+kq0pSQmXMl5Y7dvqP9lvg/UfpF5DCfdsxBjNyMJ95/snDtO3uPFng+w0pUnGcfEyUCP1u+PbCY3U
+IX3uv6w6+AMCgYEA8rHKAbs363q3BVMQRk9ERwkYt/IJJpKK0QB7+F4cZC8lyzYjBtxldoeB+SPl
+viHoegZTzXab+/xK6Fe70OtVCLcBa62smGgiDzKWI8WZVT9DwLTg0VItHp3nfbsxJhnaNHu44B6S
+Pqlmf/p5OyGg1+2Qc2b5kRIqw2HgeeVTqPsCgYBXT4RM0xtMXkU7lwe1cdi93zJp5xT1nifd8HwG
+obO4WEckooXgwci6SgUjVma/AaNb9sBeluGjAJ+Kpvq8YLdlfUneYrmThxbcYHggzvkL8AaZ6w65
+CUwCf3DdvBBJuXcSZVZh63ail0futBS7IQ2YlZGURUmxsPPCQsrsJa3dNwKBgBQffbprBZX21NoS
+KxVJWUXykSQfY3bZS71MpvrPAtejuSSCVqEpARi036gCu/fp49bKU4SDwyc/og5lx+LowGI6mlmN
+SvRQHhLYhO5uYepZloqR9NomUCtruFgKf2bDWf5kC845erLLZP5TjF3EygtdXU7USPkoYndU1EIH
+K8qlAoGAHnxhxF+4Expc3iQWRWhIfD3m28hHM8jAHuXZ9eDWFmQK7vrqb4NBAzu7ExlMtsv1mFPN
+0BApqwEbS7dhY9lMvA5bi2gEIKEartE1+gepfOgdqbaV808+S2Ggmd1yEpFosj6ZxjsZtmGU82fW
+l1Lb5OB09DigVuwuv+ar5pGwly4=
 -----END PRIVATE KEY-----
diff --git a/tests/data/sp1-la/public-key.pem b/tests/data/sp1-la/public-key.pem
index a51f85b9..0792dea5 100644
--- a/tests/data/sp1-la/public-key.pem
+++ b/tests/data/sp1-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhpk8QSMcSd2OEpmTf2R
-EX86348ba3f8BBpRCYfPkTd68aMnJVfS1fMSiPprduWDlHUbw9CCzz8sq3AAdFR/
-8a4dGbszj3UEW13F/RrX0FKo90lALBidIROdO4awQZy8eKljzKA/qJDhqaGACXZc
-ggt7Ob17IlMV2bPVMwDLwcydTjp0Mq8Ecf4l6SBBMjNaEVSfH38N2bveprjtppsz
-UphCfXJM5Chl0FwJJHIsBYBpdiVleGfihdfK3ZF0Get3sX8mE0JT6jiAseQqQb+F
-d7KW5nDdxf4e+mWyAYCEn/CEcNNxi4F2McmE9/Z+RLP/iJ0LOs9LzDeRamNEx4a+
-gwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6d9cXr4Jv3bnr8iQVAR2
+Hw+SNYK+hiuHM2QBr+OWDwR5pEiQxdfTa6AZtpXDOpKGIA7Diu/eJU7/wEORw0cS
+3OZDkkpfzS8RosJBA8lUWuStcHk57YjvROGEyWPIUar0vm3hD2mjX+NLmS/TkXHR
+/fhSC9K9BwT52rtq6IRdQBEmkZGBsYpLvUx0GqHevOGYTNTC/25uBhtQvxIQFkfk
+6OBnz5q0gbBQEY94FbNwEaa7i7WnfDxdsu3Eggrf4Y6eUx7M6WbheZAEHK47zpWz
+ab19qKVQyLggxzqEG+U6+wi4oy+NQfevmH/yqH/dQ1yq4a5MpQ08ammbYU9YqIwi
+8QIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/sp1-ssl/all.p12 b/tests/data/sp1-ssl/all.p12
index 6a5634a4..e4dd67d3 100644
--- a/tests/data/sp1-ssl/all.p12
+++ b/tests/data/sp1-ssl/all.p12
diff --git a/tests/data/sp1-ssl/certificate.pem b/tests/data/sp1-ssl/certificate.pem
index c192de80..3e565229 100644
--- a/tests/data/sp1-ssl/certificate.pem
+++ b/tests/data/sp1-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEUDCCAzigAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMxMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAyOFoXDTI0MDgxMzEwNTAyOFowMDEMMAoGA1UEAxMDc3AxMRMwEQYDVQQKEwpF
+dGVzdCBSb290IENBICMxMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyNloXDTI0MDgxNDEwNDQyNlowMDEMMAoGA1UEAxMDc3AxMRMwEQYDVQQKEwpF
 bnRyb3V2ZXJ0MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANOStS8dT6jlUDircMhXPweCAQxeZtMPGShL/HnlE5vNbJX8OCaszl2o
-n2MTPrnmUwjVWTqCUBTTmBAe3X0pDPvkBgkfIgpahlcsCue7ysxxkIbuz4POxrVl
-OLLWv9vtAyDArQ0+BFvM748x8z1c5CBKD9wb/DKhmOgQt37lDogz1WKJzVAeqIvW
-e57ckpFN8nUATURYds4cvw3oY/SXQXeki1KX8Y8jcPHSZMKgWVfhu+llevNh7dfR
-lIshvd3yydRKTXUXIxltO3NPTwylCYcXux3dLjram3FYXNTr2+xqC/qnktuJd0m8
-zaUHJK0SF8jY6mNLgYgJ7Wy8z4KpUbUCAwEAAaOCAUAwggE8MB0GA1UdDgQWBBQG
-aCrgdCQjy5b1YRZeEdXF5BlZ9jAfBgNVHSMEGDAWgBTiv6B3xTSfHBjjF02xFJYX
-7qZCnTAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFIDAqBgNVHSUEIzAhBggrBgEF
+AQoCggEBAK0KLyWwqC3kraG7EJpkIpiTgdpaO5lTrJUehvnn0Pbvyzkj4DjnCw5b
+XU1OkgVAgFEQHRU4OcLZSu7eU+hxOdJ1IMg7V4VZCf3trXCaE9SvlVo7jQyOnUBT
+mrqg+UPbSqDz1ayoGPb0M0I9+mg/rhQJ8m5L22/kMxDaH9LaTrWWKmXYbYvtlDYD
+a9ln0wmNKLfMn/UKgqHj8+wOo4Kg0giyzzw7aubsXN7fcH98rYoZ9l3kfHmqPx/L
+zGIpgKspCx+qgOnWsU6eVtZU62e7li2OyTnRRaZK/8RS0CCw/taURpMc+FHE6zbN
+mW9IGDiKzJQQyOxMBExzEFduMUw3xQ8CAwEAAaOCAUAwggE8MB0GA1UdDgQWBBSG
+quSBmFjpTjq0eFZ/uLN90p0BaTAfBgNVHSMEGDAWgBQpga5rdso1yVo7NfIOIgZC
+P2DhOzAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEF
 BQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMBEGCWCGSAGG+EIBAQQEAwIGwDAm
 BgNVHREEHzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwJgYDVR0SBB8w
 HYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMFAGCWCGSAGG+EIBDQRDFkFF
 bnRyb3V2ZXJ0IFNTTCBMaWJlcnR5IEFsbGlhbmNlIFNQICMxIHdlYiBzZXJ2ZXIg
-dGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAaHdtczHdlH2jLtGB
-k6hE72uAkNUzAeNhknDRQkdbrsnYSVkGhgCmXKJv46aOjKDWQkAt05WHil6vmT+B
-TMbl3fKWqi9seGWrQee6SQgSmrmF1D0/7CF2B7HaF7FZyFA1hZt4O60JV8f82fAJ
-PkIeNepBItHv9q1RTMj0s0DmnFNaL5XLqHH7JM2rWfsmPvkWy3yQIOzsT+q0OMhg
-4zNrxOkiyhbmDe+5CXI0DC9v0Mk12YALG2xe4YM5jZlwTMUj0dop/h7TBtnZ+9HB
-xBnZNvXohUfvqMUzUTat38GCp69RVQ4Tch8I+ybbKp3bgcXjqSajpizSED7BVXu7
-w51mNQ==
+dGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAUIoyhCCBt+LdduBs
+Wn3NXnxvNbZweWPr/vfGtCkwnYdC8rWg8GDMX07GemyBpzbvve74tq6O7VLpzhfK
+Or3krfPbm4wcY3ED0SXRNiDm6rhZBuKzd8wil9F13oprbk2fP7COkrgnSWBImOEO
+UDvSMtdYo0Fj5b37aCkeE6Sk3U2mC9hwBEZXWbD/kC3AV19eVtzRLIBVWW7nO/wp
+EV1iAEifjHDU0bWsvwWUElxFvuMevUk3PCsC5owF05HinK2tV2OcAyhy35BLU8k2
+zKynTUBJEsnFvApkG1MBOSTC3z1Pqc1+JCuLWQcS8w/AZT44/AExOpjX3gsyKSoI
+7Sjerg==
 -----END CERTIFICATE-----
diff --git a/tests/data/sp1-ssl/jks.keystore b/tests/data/sp1-ssl/jks.keystore
index 84178d7c..62676e71 100644
--- a/tests/data/sp1-ssl/jks.keystore
+++ b/tests/data/sp1-ssl/jks.keystore
diff --git a/tests/data/sp1-ssl/private-key-raw.pem b/tests/data/sp1-ssl/private-key-raw.pem
index 4015824c..775b8212 100644
--- a/tests/data/sp1-ssl/private-key-raw.pem
+++ b/tests/data/sp1-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDTkrUvHU+o5VA4q3DIVz8HggEM
-XmbTDxkoS/x55RObzWyV/DgmrM5dqJ9jEz655lMI1Vk6glAU05gQHt19KQz75AYJHyIKWoZXLArn
-u8rMcZCG7s+Dzsa1ZTiy1r/b7QMgwK0NPgRbzO+PMfM9XOQgSg/cG/wyoZjoELd+5Q6IM9Viic1Q
-HqiL1nue3JKRTfJ1AE1EWHbOHL8N6GP0l0F3pItSl/GPI3Dx0mTCoFlX4bvpZXrzYe3X0ZSLIb3d
-8snUSk11FyMZbTtzT08MpQmHF7sd3S462ptxWFzU69vsagv6p5LbiXdJvM2lByStEhfI2OpjS4GI
-Ce1svM+CqVG1AgMBAAECggEAZyQVGdPTOsYXtpi1UaVev70735jBzdCFdiSc/5uSVJjvf6rGgOwr
-anNCyFzgbmX/QsYnSqOugIiqj+lMFrEFeGKwIpA/2wZIiYSaCGB/O+19BJq1JU+PhWzEGEMiowdH
-SBdGBbefDlW4z3kNWHPJbohMdQRbjR9EWJWVrtHhpLmkZfrt+W+UGO2zcsI7I+9qhOV6oaTbqiWz
-PH4hOFFmQeByo2NU+VNaCHFvAlBnumdkwA2rXkU8jSwDifCT5cNIk/Mr5VrExx03/95SEUqXPcOO
-M9vZ3xsIrhNB1DipsK1YuzidPXj+Va4U0Msp5wI5UvJ10ysF4YRy3IO4kuxtwQKBgQD9gUsmFpDv
-PTAxJ5Zn7Uv85dMyLcyUnl7g+CgkoK6XOr5xL2NBG/bfRmZ6XKFLJKTymU35Gkf3XLRmK/HEMYtL
-MjcMPL4Vgot7HpH8JKf816gCftTPui4l80vdrv96VnBi5BHT6J+d1n4O8Uh/NQGsNuAcM5YljQC2
-4z7FvrvwMQKBgQDVp8Q5+cyxI12/jYcy8tU0Sev9ZEpYOPo7j3ZGmYr5nkGgurYmEGf08QRIaAET
-CItf2F6iGZVWPP6VKwPsIQ+NQSmq77b8WMp5KTAE563AO4yhq1kPVjkHWRQRy0VdHKtrqGP7nvIe
-wVec0zwtRqwjQOqbzhcPAW+AQ0u5qh48xQKBgQCTkpuznXlbu8v9IWV+NHaCzytlz6GDdroWzn9X
-6y4XnTvV2dc2xNeu3GW1n4zJmJhpHXN1qqXwSsg9niFMq+bBrIa9GfMxxF/8GSy0koY0Ozpz0W+D
-SYep0fr9Hu1cQ0uDVe9G4+lfUcjqW+1vF+VUYlGOOT2TuISM8rbNGJ6BUQKBgEBEC2ko82Ig8jUJ
-HC6+DlWBGsQIY7hvww0hVQFddAkrijAPmXSPoMVzrccdyZzxCANXcPevXFUpWaaC3tYrB6OEg0UQ
-f+kdyCFzuybujTvybZW/lbVgSR0ltTy4+O9ODV3/s7tfDxMjMvhQLZys0mB0SV1+Oz9fPivFkkSR
-oDDFAoGAM/LpKHMeJM8LWjumsmETNxsktBc8G3Sih9tWxBJ7NOeqrhUsoIgTzn5SGMNLp/eMApaA
-mdCNyupZ6+ZFJcfei+5IjAxeKlWoa665lz3hOuXlsr5bEIzH4tylxGpcyaWgp1jvR4ICv5QTC3sT
-F3AfcLNCCj4vbARkfOPxGstHGeI=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtCi8lsKgt5K2huxCaZCKYk4Ha
+WjuZU6yVHob559D278s5I+A45wsOW11NTpIFQIBREB0VODnC2Uru3lPocTnSdSDIO1eFWQn97a1w
+mhPUr5VaO40Mjp1AU5q6oPlD20qg89WsqBj29DNCPfpoP64UCfJuS9tv5DMQ2h/S2k61lipl2G2L
+7ZQ2A2vZZ9MJjSi3zJ/1CoKh4/PsDqOCoNIIss88O2rm7Fze33B/fK2KGfZd5Hx5qj8fy8xiKYCr
+KQsfqoDp1rFOnlbWVOtnu5Ytjsk50UWmSv/EUtAgsP7WlEaTHPhRxOs2zZlvSBg4isyUEMjsTARM
+cxBXbjFMN8UPAgMBAAECggEACrbouHK51y2jurH0kzrEEaKAld6kdhgCRbGANhUukTvD36PjDGLy
+Ak+R9Wl6DS0zRNG0m03B9diylRvbIjdwlyF9iCh0gONEhR6kcKZ5t9+vZcjuMOrbvdHvcMLq7FK1
+ykWO44P9F72DNwTTboUS6Fa9VisISWNd7hszgUDXQtMRd0d/B5MOW7O9UUlRNyjUVBhWWCR91v40
+5CAsHoF2D7KuLRFecJxfE1vfGCKI7575kkDIVNrc+2HTLsPnBZN9dW01MkZSkAyX6Lm/Kq8f6GkJ
+pDy0bpuMVFeiOygwH4adnHv6mj2Y9qVCRKOU2QggDTRNeeUIZodHezkhqxvScQKBgQDWX1DxRQxN
+YhdLMeqgKp7It2GJYQ3J+GkY+BeOH6M1Vkh9k7tU9uT9I8PjUkT3UsrtJN8hJ7lolSk4iy95VzHH
+QsjhYC4Gr6zDW09xPlJ36aSHiY+JV6fRvJJhp9pYe6kJZwl3IyK9PDpcixg1vUwTalsqNVFj6oxX
+xjRkuq2FewKBgQDOpC6ECCr26f79Ire1zkYYh+IqW0itVtXU4DcpqEjmbv5TMCmQUwWATMZbl1m1
+0+RYwkWqtEdGcHeEiS/quF2GK7IkznO/iq7178A3Y+9z1pd8RwI6xf75C6pQxaZfNokBrSyrj8Wv
+CTJoTOsHKIq8XAd2M5p3R0yqh9m6IelIfQKBgDgWijwGH9jjUErpTYUIgbDsYgWqsgvlBcJ1rtwN
+pQsgfyj0DTCGxJUC1Y7ViJvZOqTfX83x8c3OMRHNQOeTi7+h1qM5IfG35xDaBCgR8UvUgqq/sCF0
+IMF8gCQy4asC99Aw+EYGmGFAr9hkwDnXRF9UFXQurRPiW0Pf5Pdx7FKfAoGBALN3GAcHaPkk5JZI
+jrDRQ0OO0DflK8uPvQqy6HW/eADZqPvquk5kLETvaN6nJfyq2IjVwNeu1rAwgTyUQQ9jq6YZURBy
+VUinU6i43oG8w3whhVMkAKW2y+jT3sljv0i1/mt8UW124kNQg3zeQMjoxwUsEDbyPlcVj1oTvl7P
+kOGpAoGBAKyFBqg7lfe2Q9Rc9bT0UmuRAJIG/rZXTKXxp2Sh68DlF0Ku5LMJNLEQSM6/O5sr4f/d
+EMytM0/DzHvnm7VL427FxJPqOvyv9zBM+LqMAdwyAeY37nzLFgYvEN+Bhb0W3I/C6jeZwyzKxg1P
+aoAdIEmioWN+N+xrbg8OASTFeNS5
 -----END PRIVATE KEY-----
diff --git a/tests/data/sp2-la/certificate.pem b/tests/data/sp2-la/certificate.pem
index fc869371..aaae8df5 100644
--- a/tests/data/sp2-la/certificate.pem
+++ b/tests/data/sp2-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIEKTCCAxGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjZaFw0yNDA4
-MTMxMDUwMjZaMDAxDDAKBgNVBAMTA3NwMjETMBEGA1UEChMKRW50cm91dmVydDEL
-MAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCza7rk
-nHgk/1IKrhU0eF8D0vpn/BPkkftWdOFsZSE4fFTIwztB6BdoN2WfujNSQrzaoSRr
-ZzvVAPMLvYRWSRf5dyy1k8DAzi2xKXVqXEnr64vIS/2MN7+qZNqB6vnH7xoKTeSV
-2CNTbMsVqzLuG4ktXe1jUstunZXRxqCEBJRL8EDsG52zzNTAaP0MqtYXNU3P8tOr
-fAyUw/S+/A42WHUTBjiX045gunxD/9AqgiWjSrorsjxCghOWtF75cWh/2uhYxrwU
-6WOcw6PMt0y1snvCdEVOo+Z8bexBT7FQQqe6L0UPdwhBqgS2+lLxb9ltZHB4DKqX
-SzuBgEIcoqxezlX/AgMBAAGjggEkMIIBIDAdBgNVHQ4EFgQUUt7z+U+bIALGEbi5
-0Bk1PrKdhi4wHwYDVR0jBBgwFoAUAle2NevsaWir2Chd9BECT6r4blIwDAYDVR0T
+QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjNaFw0yNDA4
+MTQxMDQ0MjNaMDAxDDAKBgNVBAMTA3NwMjETMBEGA1UEChMKRW50cm91dmVydDEL
+MAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDctMqW
+iUc2sS0qrvnI5lyVgJdtV3rxIsAmyTAvQ/srsamg7fnfkVuLlq5PxH7Pxf6O0quw
+Wveb0vBTI0e1++uSg3WgbBrm1KoGkz53icZz5HqWss1cxFDmbvn5bXQGpkXrlp18
+WRfQpun4ENF7Pd/AQQRoyqYTueWRehBi9IAaTOYevpGboEdKMvnkPirFBj9QqUmt
+eZf2HQs1KCC7sMYae5lputQlORNiw9UyKmCkE+B7HX5ZjkXCgw9J9O11i2ZWGHcP
+g72E730TxMWz6eklemoehXVwKKyNi645UnDg1JBDyCtFr9/q94LK29mA+J0+nibt
+H57KF0LWuiHutt+pAgMBAAGjggEkMIIBIDAdBgNVHQ4EFgQUecIAm3qIvPkmxT9e
+EXGo6PFgnpMwHwYDVR0jBBgwFoAU8iBV5auRY/jxEU7sEdv7C6+eFHIwDAYDVR0T
 AQH/BAIwADALBgNVHQ8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
 BwMIMBEGCWCGSAGG+EIBAQQEAwIHgDAmBgNVHREEHzAdhhtodHRwOi8vbGFzc28u
 ZW50cm91dmVydC5vcmcwJgYDVR0SBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZl
 cnQub3JnMEEGCWCGSAGG+EIBDQQ0FjJFbnRyb3V2ZXJ0IExpYmVydHkgQWxsaWFu
-Y2UgU1AgIzIgdGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAC+Gj
-tdH2G01fv8K2F70ZRhsLyWSu2OTKsE/6T3XWMeqyXoZbAgIFf/q4wNegVJJbGojO
-4wBSq8/gN1JiDoQwYcLukzezH6aoahyeenBtD78h2ahtMBQCqfUZcsuJRICP3AcX
-IrYbiIFgnH2ui57k/I1u6+47gcG10zbIosWoYSUsD0Q+fYF9Cr2u6OborAXYjGMf
-8uz7RUP95VD4/qUcKjQXWOsnBRUVKU2hK73806UxTXsiWI02jiA1v3REn84sZppW
-5X5YrjhsbebL9LYoGOECi/IO9ULvPAbpZsyLw0/DRCbJ2s2ctNPLO11PnZo/TxJ3
-X7JNbOGQ3Y/5OxAn8w==
+Y2UgU1AgIzIgdGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEABjEx
+YvYVVunrJa+/+/bAxM3mkZX+IZqrRCc8uijKzqpGfp/p2OSJ0idI3yi4y6rxwlCo
+5vvUknOAspyr68t9GTgzmALSg6d5NzEws8wRV4tUDkEEbJnrIdyiqPl36/6Yxbs1
+euX3d9m0YkkIuXzXoQqahgkUOulZIniwuZEPaw5ESgxcTusecbECQf82Xoukc2Rk
+sf9ymaswdZkLhyepdUL+wXPWcEe3jLMexm2tNQCTWz+/wrUkiduf59ki/+4yPSJ3
+5e/p4AZ5N/IbhMDjQ5j7D06C7h7bvrstoasP4GP2Po0Sm6hloYSI1q1kwq6HtwCF
+PnIpFChFm2WRMRjXyQ==
 -----END CERTIFICATE-----
diff --git a/tests/data/sp2-la/jks.keystore b/tests/data/sp2-la/jks.keystore
index 0fcdae20..c8378b3f 100644
--- a/tests/data/sp2-la/jks.keystore
+++ b/tests/data/sp2-la/jks.keystore
diff --git a/tests/data/sp2-la/private-key-raw.pem b/tests/data/sp2-la/private-key-raw.pem
index 43b741d1..daf58b46 100644
--- a/tests/data/sp2-la/private-key-raw.pem
+++ b/tests/data/sp2-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCza7rknHgk/1IKrhU0eF8D0vpn
-/BPkkftWdOFsZSE4fFTIwztB6BdoN2WfujNSQrzaoSRrZzvVAPMLvYRWSRf5dyy1k8DAzi2xKXVq
-XEnr64vIS/2MN7+qZNqB6vnH7xoKTeSV2CNTbMsVqzLuG4ktXe1jUstunZXRxqCEBJRL8EDsG52z
-zNTAaP0MqtYXNU3P8tOrfAyUw/S+/A42WHUTBjiX045gunxD/9AqgiWjSrorsjxCghOWtF75cWh/
-2uhYxrwU6WOcw6PMt0y1snvCdEVOo+Z8bexBT7FQQqe6L0UPdwhBqgS2+lLxb9ltZHB4DKqXSzuB
-gEIcoqxezlX/AgMBAAECggEAaO+nHTIOasURfMGYEVodaCUq40phcBuZPlWZykXTii/dfpYAwGk3
-13Ie8655ebEit1Pr8w0rx0aI3+L11Wlmpjb3ZTOHVry/qJAw5gYYDe1zkbAwGKQ6azQVQErnz/Gd
-70zjVmhVMOO+W2wHm49rSadXwfGYnZd5GnnrQ4tSGJ7u4HlcJWBoW80qBz0u4gFGWL046/pCTEWQ
-24EBLMFiO2LXKthfehgqBTkohXzs/zO6Cp7VW8moGNcpvRsaigkkY/enL8ktXlZ5d6RVsfpmEfJk
-81wQpNEMRVKpFzKDiexjP6Lxtc7rlFOYSqrfMXF276Tj3iOEPGmfA520rwMwYQKBgQDd86LtqGpK
-gvkFh6lXZRvFznzhqcIxA/RGmWDKhWXC/PAzmDtC3AjxdaPRe3mzzM59sDmIkpjwP/B7ikjbrtww
-4LKvN53mPA+yYsaErtFYlSF2Tkc2ZlQswLgHB0eo2f4bV8PTX6foS9h1HdrVaqFHw4QGWy1c5tcm
-Y41BnoqY5wKBgQDO8dgtd9vldU1pZB/elSOkBETKlIhMgFeWT0UhKccknCL1nMqLYNgJzTq8Zgl0
-5Vj6HnguXCa3vU2/y0tITBaSFjul6Dt+LrTFwpjJDaayfUQfXOW1/3Yb8sfzT/7xzxupoW51fSq4
-8ufBp0RSpTbOqsHQ0N84MdEr/AA3Ys0/KQKBgFfgivXF5K+zw5zo5adwpNpgsxk1+Wkmw6TgPW5x
-+qSFOSV0dKI4NGJFzaK3XKxPvsIM7/qe8GbPKgv/6HDyfsPrc1PklWP/C8f5S9hkzwZfpWwN+iwT
-v+goNbSysTCtfuqciTA7g2N6BC36sBYnrcuYIcHSf9d0nmLYr6j3eLCpAoGBAMdU4Bt7tg2hHX2E
-ecYV9YyIqBJRW7AEd1lK5ZV5/l3fHzVhXx89mxpl2kuaJUW5nCjfrHdLP+f/qaIyGUN8NslkLPQz
-awqxxmIufKg8Q/LtAe8Lth/F/2gQRFSzGyiji0urORBmDf6zylQX35GTneUXSTTv2/Lu2UH6q+Kt
-gnFxAoGBAJS898qvdAnhhewuOaS0dBmdo/7H2FmipI8KmjLs/Rnkp2GfF9nuQOgdhglVtQ3CZZzC
-40lJkZ+ffYyoRhgdBghOkuanKPlvuqDsC7Ue96R9mjUwozEpuwcS128QwYQaeEE1RuMZ/iTKD7wK
-N3HmKO0j15sWS/OWoMgmUiwBzv2r
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDctMqWiUc2sS0qrvnI5lyVgJdt
+V3rxIsAmyTAvQ/srsamg7fnfkVuLlq5PxH7Pxf6O0quwWveb0vBTI0e1++uSg3WgbBrm1KoGkz53
+icZz5HqWss1cxFDmbvn5bXQGpkXrlp18WRfQpun4ENF7Pd/AQQRoyqYTueWRehBi9IAaTOYevpGb
+oEdKMvnkPirFBj9QqUmteZf2HQs1KCC7sMYae5lputQlORNiw9UyKmCkE+B7HX5ZjkXCgw9J9O11
+i2ZWGHcPg72E730TxMWz6eklemoehXVwKKyNi645UnDg1JBDyCtFr9/q94LK29mA+J0+nibtH57K
+F0LWuiHutt+pAgMBAAECggEASu1RraNzOr0RsWDvyeVy3wpl3igJw91hUImSwykYFzBcfxbrcpvd
+cVk5WjlCN/Vmw0QAJ4Hqd8s37XGXwc+BnR7mCw1IYL8n7c2FMn3ikqupdonDMFAxitl4Idanwi4m
+pKFgW7u/WwWffqjvBSDvWkx4W78YfK/qoOXItF9/Me3xvN6Bm/CGZ0Aw58hHKub6WOhC8v2Pta4o
+ctJHOvvzfJnQr2VdTXxApC8Un3pF6RFiDD3WPrAvKKKiLc8tG6ABwd7E3az8YhEPIXT3KQiCq8HH
+RzIIojM6k+Bkegm/o9GILdcyfIVw3hVtkhdJzTkyKYI9EraE+zgAYJPzveWzdQKBgQD63XFnP4HD
+J61OFWWvKiYpeFK7usbnPRnhnvJDn0wVjwqNE4txMLPhmTwkQ96mt/1jDn4URbuaKDBAjBBmRiyK
+yBHXzC/b0mvbOyWUGOv0uTFnm+qGG4kuPujs0+SgzBOpA9c4nFuy8lUEsg9hhlzGazqD6YGkmChA
+fqZa+HjhVwKBgQDhOVA4eQVk8b2ljIiejArQ9YuQnVP/j1mkHab63N2o4wLljAt0028LMM0BnfAq
+37/5VpQKa79082UU2uVD8gqg2hY9LflW1ESiRBaKMPGZwGbAtPbHYOnEnrURtD5OxMLKVJ/5t8r4
+16ed5NO95VV8eLF4FdYEBjjWUJ4Tx1Cm/wKBgQDObXnro+57UCLjpefOg7hzV3d80uzpSvYJGmnw
+CxzogJQGEpcjxRfAA//hN5f3SF9RK5PDyr3c1EUgWCEGh6gPayKDmJmpITVvaPQ7MWa4McvdngcV
+44K2cz3n41S2nDdxVJ+9DazHS3F6M6tEbPPaslGsSnFLp4k3yP/Ky7tscQKBgG9UEEZJ9BOotvC9
+Hc8ZNEOEDH/odNvvdQT9r0tzn5Ha3NSwu/z8gnhKoBt7gXr/7PoIBNd92T6rDT0Y0pkabIyEINgP
+AKAd/usisu2OMe6pP2FkUlPNoOAS/zgIG4B+HDc9S3J5mjgVCYKv2MaWNQJ4+mh8irSkirXNVcY7
+EK/rAoGALgORJHbmON9nRdcqEigZrKMK5M4vQOlazpVQ1adlSw11pIeXgpVAOxmv8/zWzt2mLwWa
+BbM10eUEHxGPugRRzOj8CQZq4pvfC5/urp3Zt4VUb5yltFWenJwZvBNjWydlBMeAkaRTZVw81E7c
+doCD0cMNFuuS643wqNLlWebHeX4=
 -----END PRIVATE KEY-----
diff --git a/tests/data/sp2-la/public-key.pem b/tests/data/sp2-la/public-key.pem
index 4ecaa8e9..9a64f162 100644
--- a/tests/data/sp2-la/public-key.pem
+++ b/tests/data/sp2-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2u65Jx4JP9SCq4VNHhf
-A9L6Z/wT5JH7VnThbGUhOHxUyMM7QegXaDdln7ozUkK82qEka2c71QDzC72EVkkX
-+XcstZPAwM4tsSl1alxJ6+uLyEv9jDe/qmTager5x+8aCk3kldgjU2zLFasy7huJ
-LV3tY1LLbp2V0caghASUS/BA7Buds8zUwGj9DKrWFzVNz/LTq3wMlMP0vvwONlh1
-EwY4l9OOYLp8Q//QKoIlo0q6K7I8QoITlrRe+XFof9roWMa8FOljnMOjzLdMtbJ7
-wnRFTqPmfG3sQU+xUEKnui9FD3cIQaoEtvpS8W/ZbWRweAyql0s7gYBCHKKsXs5V
-/wIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3LTKlolHNrEtKq75yOZc
+lYCXbVd68SLAJskwL0P7K7GpoO3535Fbi5auT8R+z8X+jtKrsFr3m9LwUyNHtfvr
+koN1oGwa5tSqBpM+d4nGc+R6lrLNXMRQ5m75+W10BqZF65adfFkX0Kbp+BDRez3f
+wEEEaMqmE7nlkXoQYvSAGkzmHr6Rm6BHSjL55D4qxQY/UKlJrXmX9h0LNSggu7DG
+GnuZabrUJTkTYsPVMipgpBPgex1+WY5FwoMPSfTtdYtmVhh3D4O9hO99E8TFs+np
+JXpqHoV1cCisjYuuOVJw4NSQQ8grRa/f6veCytvZgPidPp4m7R+eyhdC1roh7rbf
+qQIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/sp2-ssl/all.p12 b/tests/data/sp2-ssl/all.p12
index a9c58660..b26be361 100644
--- a/tests/data/sp2-ssl/all.p12
+++ b/tests/data/sp2-ssl/all.p12
diff --git a/tests/data/sp2-ssl/certificate.pem b/tests/data/sp2-ssl/certificate.pem
index f6ae7015..0ff9540a 100644
--- a/tests/data/sp2-ssl/certificate.pem
+++ b/tests/data/sp2-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEUDCCAzigAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAyOVoXDTI0MDgxMzEwNTAyOVowMDEMMAoGA1UEAxMDc3AyMRMwEQYDVQQKEwpF
+dGVzdCBSb290IENBICMyMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyNloXDTI0MDgxNDEwNDQyNlowMDEMMAoGA1UEAxMDc3AyMRMwEQYDVQQKEwpF
 bnRyb3V2ZXJ0MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALmHoxsxTxeSxzIPHAtjTyA811bU4Y5GGYQ6YGOgf32SMa5+BBekZRGy
-vp6ljeYDDzVBIwoxjOrLmRuy05egiuC942cmIBk6djHDvvQyDezd1VuDqw42+UpE
-SfqJE5ZvJ3P+x1a2AbM8yYP8H2gp8XyZJLhtA/xZ0tkdlYsbIi7dNJ22QGboMQTm
-4cPxYdvQg9ibmSMaOEVYOl29YdwJjAbdDTqaYYLY+ziAdBqJOQI1nXXSHyQZKvwp
-ot9DlCfvEju4tLr3WPOel4mP07+dKY+a+PjlXLCje1NUsYeNc6VUZQkvO3WoBK3T
-pl/qDT5Ux83/G+U3m64TQuQvLWRykXsCAwEAAaOCAUAwggE8MB0GA1UdDgQWBBRz
-GuJweAkLfEcadld3iI5XvrX/mTAfBgNVHSMEGDAWgBSEZ8mfyrhND4GxEZj6ytXz
-5OM19zAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFIDAqBgNVHSUEIzAhBggrBgEF
+AQoCggEBAJ7/22TDTT4u7+8Y93mI50+EknmK4JQ76J70c6tKg3AGvy94o9yjc6aU
+rSu2O6fruuGavYuFwT7lQSMHTeTNKb3V4cymvqx2eEZE+KdGQjcXqdY7oGcwEKRa
+sTlNJsYP9jxeTXi8vfhACXWqsvdvRoVjTd9zQpP5Ua/rmDG3hJfTIYkN8ol1T1a8
+nCy2XK1piQsJiZniUPdLMOXSwkFhjuhNdje/Z2xAvlc5+r5SBjaFR3HjMG1/Moej
+tQFA0IzwX/RhGaAaja4mk+lzDbCW+2fUXhu/yDSIe8iRCqErtd0syPhdPx48y9iO
+mc/bfNQxiRkgUokikUCqf4ldFJBmxMMCAwEAAaOCAUAwggE8MB0GA1UdDgQWBBTT
+SQ2yOnNSkdjNcVswHMgeIXGB4DAfBgNVHSMEGDAWgBQbt02pxy1yeex675FTANQA
+Hs/P8DAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEF
 BQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMBEGCWCGSAGG+EIBAQQEAwIGwDAm
 BgNVHREEHzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwJgYDVR0SBB8w
 HYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMFAGCWCGSAGG+EIBDQRDFkFF
 bnRyb3V2ZXJ0IFNTTCBMaWJlcnR5IEFsbGlhbmNlIFNQICMyIHdlYiBzZXJ2ZXIg
-dGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAsEYEag9LPHqXuN4S
-9swETieSqC0iPaXSQ2KUAwCXRV/QwKqLThV3+4sGW3sJgTQ4cunQKZwJtcxzYuqb
-JHZ8SIqc+khsj5IpxVCZB/WIuS55hnbJeDwmCAAf8Pf0YxCaR8mOcnn8bVo8lE7G
-JP7D5nh6S2hLbtI67ez1PbkyIsefH0kI8lePb4fwILiYJnxkjK37i6lSGNdOYNyl
-aKwN0qtEnmQDvBbBtN8y5fGfyvrJQuNhaTBlv5kKYSlEZPSZXD4Z+jY64UPtOmeE
-XrfqhB/GQ5OkGHitT1z3Uns6LLQsqM/n5E7+EY9O201apukbNwCRgShkrZ1vgQ7d
-cJ2Iwg==
+dGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAaIHpIxDdrM1nXuYG
+TsCf6o/e5T4VydyzANBVEiFcZf9ntbR6j+IofMZIFTUub+wHvbce3r+qQY0k2evt
+0+DC0VPags6SMzzTjuKJujMajMxnzmFt9viIFgjzu6Vx3peLEBUqfxhZtqJYpMuN
+sDrcgWJXx4iifiqda/UAYWw2onNtoCmO51bf4nng416nkdst/aXM8pJgU8h+nqCV
+zxlKz5cW7lVisD5uu1jVjQLqDKIKrILg3Fy9bX4uacoe+D4u31rPOYuQrUNjmfMc
+/DXe0zDp078zXP9u0hyjUpYfSRVGtFMdF8MNRodgoYs3eXmMM2KYZ4U1cEqRyqdJ
+hk3BCw==
 -----END CERTIFICATE-----
diff --git a/tests/data/sp2-ssl/jks.keystore b/tests/data/sp2-ssl/jks.keystore
index 988bfd81..c2dc72db 100644
--- a/tests/data/sp2-ssl/jks.keystore
+++ b/tests/data/sp2-ssl/jks.keystore
diff --git a/tests/data/sp2-ssl/private-key-raw.pem b/tests/data/sp2-ssl/private-key-raw.pem
index 5ec92d14..718a7c88 100644
--- a/tests/data/sp2-ssl/private-key-raw.pem
+++ b/tests/data/sp2-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5h6MbMU8XkscyDxwLY08gPNdW
-1OGORhmEOmBjoH99kjGufgQXpGURsr6epY3mAw81QSMKMYzqy5kbstOXoIrgveNnJiAZOnYxw770
-Mg3s3dVbg6sONvlKREn6iROWbydz/sdWtgGzPMmD/B9oKfF8mSS4bQP8WdLZHZWLGyIu3TSdtkBm
-6DEE5uHD8WHb0IPYm5kjGjhFWDpdvWHcCYwG3Q06mmGC2Ps4gHQaiTkCNZ110h8kGSr8KaLfQ5Qn
-7xI7uLS691jznpeJj9O/nSmPmvj45Vywo3tTVLGHjXOlVGUJLzt1qASt06Zf6g0+VMfN/xvlN5uu
-E0LkLy1kcpF7AgMBAAECggEAQYY/+tidYGv8YheoBfWa+n3CZ+5jgwYK+QJNDKKgpE6/sSrccyUi
-dO+2Fv3NcdDezCYnI/CAHmStvHSZ+lE++0TVTZbPe1mEaOsDQ+dxt5hZRCrqfOi5fptDrXJAMr8r
-JfJzoJJDY3Qyj6S5yuYVXbYQm/oUkEmBCCFEsY5xsi7fdQwWR4bLvfOO3TYoy0tdB3/1wteArQC7
-ZdPYFesUupkxQBvcHAvimohkvm7wn0RUoJlLd2z9nsGIDucpQMmVcRU3XsMLjebzjlwclGzjJLji
-2DDJF6lVHEFUhIM1w2krS0oafEJrOHUZs42GT6FzLUUTuA/bhPoLZOgR8jMecQKBgQDsaRN2MkOZ
-w0O8Ae1PYtK2OmvJ3aHppJrUGcB7l9PpsXLvvPMxUomWG6fIFFY4hC2SoXixOVANPPt3IMVo/hfc
-GMZsuIFMd5LCnoKgSPOfoPkxvlB7iFcsR/ORmLU4ZmPVOFZsgkmAwXPunItTdxYYTMBlj4jf1g1d
-XobQGCcTbwKBgQDI5z3RRC6FG/77iyVXXJvwULtrhXj54PvzoZaBPrXynMD74B79fVsRP9oeKBdc
-nyhF4X1f1y6MjQrsiopgm2XXdB8GpNfAVeICB4Y2LauwcrwmjlsWMoNV/q1o3aj6pbN1ES4KfrIo
-lAsa91brLr/Fh2RDB8HDEWiHDqfS+dFstQKBgGFfEf3/y+ocC9z26jhlWqZlv5mgaJzkCEVN6gK9
-0TGSveVSbNQmy7aA44U8IxsaDe80BJLyKS+aq3Qwkj6hUVB8/9Ut1UuagF8ajHDaO0XHNnwvh9Sp
-nkYFyKNyQ0ncmkfq8WW17/JRO5/O6G/TP814Z1ItYVHYRx7q3Rn+qLGPAoGACd+7nQ5hzu76UDid
-hDar/1qoa3dq47UYDPhTIlUHsj3cCkUQoNrJYAaoXLURuN6lpxGXDN/RjNzdvZRtiqP4lGdDoxr0
-86IE8p6WDRGfj5OEBc0XUvb2l4Jl2XKTfIYqVMWcYq2pae8kwJWJcxOgH0AxQE4gSssPPRwOSYM3
-tMUCgYBMi8bHoEthEpZGAt5ZX7zj/Wdj9PvAy9p+uSAQ2x2j8KoIQy7zgWpE1A4I9Exa0O2NxC1m
-xsOPpFrrHdvBPBmlWAmP3ZL37CYskcalg+wRmDxDaoTWNr7fi/AV4I1/B2AVPre2lviwpAtERUDF
-R7Tj6NyVB+JRuil3zMStrTypPw==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCe/9tkw00+Lu/vGPd5iOdPhJJ5
+iuCUO+ie9HOrSoNwBr8veKPco3OmlK0rtjun67rhmr2LhcE+5UEjB03kzSm91eHMpr6sdnhGRPin
+RkI3F6nWO6BnMBCkWrE5TSbGD/Y8Xk14vL34QAl1qrL3b0aFY03fc0KT+VGv65gxt4SX0yGJDfKJ
+dU9WvJwstlytaYkLCYmZ4lD3SzDl0sJBYY7oTXY3v2dsQL5XOfq+UgY2hUdx4zBtfzKHo7UBQNCM
+8F/0YRmgGo2uJpPpcw2wlvtn1F4bv8g0iHvIkQqhK7XdLMj4XT8ePMvYjpnP23zUMYkZIFKJIpFA
+qn+JXRSQZsTDAgMBAAECggEAXyT58z0PTuOlfi0xgc+TozjQsdyR8QI8fEoJoXmwV2wiIdUOMSy6
+OveC/MJKxnxAU1pWjFQYxHtJVB291emTTd7cBKvPM8KczGffZ7GaU/9cCS+bF8RiYQdIP+LUDfdl
+QNCpiVNgVlpzjq778ybqS02WPt1o/MVXxW60nyOTO4oRTDqN5IH6N13dnCVIh1yubuk4GG994QxA
+5V58KxAkzGv8vJa3wK18JtKuE5K9jGODHB+7zdyZOoklReT2laK0cnABQWMiYJTHYY+QWk+xMJp/
+ILN/w+7D7TvEuLJjSpXBvH15NKNhpIgMJYBLH2a+3ZkvDYU2eExoSwAAeKP7oQKBgQDRNQlASmyd
+KEblu9fndmx4GLCfkHORzXKCt6gzdRVngLhxnAvJw0MXKS7OBGm9Jb/yHTjPRDQRmdeAIMx3r5f6
+WJWM8T8q4kCnRttyXFB8x/M3WvnirHKyBJQCPCukXsUWiyZDJSxQqa4yYEKR2NOzNoS1E1WlMiuo
+/jYfUSjWUQKBgQDCj/vHTfAP3a88Ua+78Gim4szoA/cLdObnoJUsLDifqzRs5hiFI6IbykYuE2eJ
+hR12Lk8v2Lfrh+CCWtDydZxFsX2SF42zSS9RArbSuzYvWWatzGhxHMB6PNUq/R3PGZHy/3E2zPB0
+PPWCrebyaZof1GPZu6wPsempTapC4LQg0wKBgEDUk6JVreTht1634Ec9Ho308L7xz66OIP87FKel
+j9V8QSwLtGd42BCUVYnIOlBAI4RO4+zu8MfHic2N3G72fj05OFbt56pNZMWxoo2E5/hTKh6sVaWV
+1REvdAJhTRDpwV+kDV5fZaU1f+Lii56Qt8Hgki1e6XqA2qDK7lC0INiRAoGBAJGN8BmRmAf2m/Nv
+VR4v48r+H7dvx/EdOuWMQC00xAPHrEfP+AYau1s4/znXMH00Re81A+7Snf2pwG8lC+5nyEpnV37k
++hBnrutXMXkDr6zKoENjibsdfG22du9bP2LBSWvWaFdMCJOdSzrBaOZv1Gr9lNm+SiHPwvPy825m
+9rsbAoGAEAkjST+5HYli7kxCh+mAx0LPoYWkHUPqvsh4yXyUKsZ6SVmcOBz5nedQyX5vGho8Pnfg
+BQ3I8ZMXzss63P+djfZTjY7f9DHc5am245zpXJoqL//NYH0p6H+fjzZ1DU2ZUBpT7gmLYN17MUx3
+hKyNv6s+iYRsNFaGvuaaZo/Tn2k=
 -----END PRIVATE KEY-----
diff --git a/tests/data/sp3-la/certificate.pem b/tests/data/sp3-la/certificate.pem
index a62868b6..c96544b9 100644
--- a/tests/data/sp3-la/certificate.pem
+++ b/tests/data/sp3-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIEKTCCAxGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjdaFw0yNDA4
-MTMxMDUwMjdaMDAxDDAKBgNVBAMTA3NwMzETMBEGA1UEChMKRW50cm91dmVydDEL
-MAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuFpIr
-t6QtcGnG2rAhFx/7BRkX8qkjrGHIaMlgSlt0pZjrixaQF5i8zBVkfodQWxB2o+dv
-oyq+Br+wSUlNZlgp9pj6fgNaTEHTbKmYZU/iQ1R1TWziVR7GEwEyYjPkxOI7Wajs
-S9KdVAnWtejpWbffnNBPox5cVEhTTCHJ440eX5v9hsSjeLImSKBYlcpwouSYcpXp
-0nDu0/AYdsPTJZwJXo1o5KfRpsv7zLRPX3F3n7dyqr9SfqFYXHLlW6bP4pIe30O3
-xnWyNyp9MmyR1m2H4Y5u0i7EOQc/p+Jr727zoBsFBI3pTSjBvZdXbrPWqwEtB6iK
-SU3l+1aFr9X0isTDAgMBAAGjggEkMIIBIDAdBgNVHQ4EFgQUrjqZ3ypYOP300nND
-XkWwXKfzGuUwHwYDVR0jBBgwFoAUduLqtxJYmzTmB7l1dO4kf/qQpPMwDAYDVR0T
+QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjRaFw0yNDA4
+MTQxMDQ0MjRaMDAxDDAKBgNVBAMTA3NwMzETMBEGA1UEChMKRW50cm91dmVydDEL
+MAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFln43
+w+KYbt88DFHw9PhEHDTkO0kxF4pjuR5n+DWzgN1PodEK9+q9YlNS2Q9h58Eswk9U
+U91ulRsq01jj4I6pgVNviPuvD/JnOx3oRhirL0tiYsQfXs6fp4Ux9QTueaslQdhr
+jpDRz4eMSiLG8RV6oNOItmcDaMRbmFUU7JdtNCKxbw4Qb9SX4CgII8FlbCCGtRMi
+aCCyLKG/jQgjFGax2z7Y/pNZEy85ZDPob/IM4kBguWAaVa957LsYuhnzzk+tBCu1
+LavB85I8Gn2icTg+doZseyiUKZi6Zye8LE9MJgoKyWwSZl6XHq05gE+SA5h2z6lQ
+3eqSrq/H2xdQuJ3NAgMBAAGjggEkMIIBIDAdBgNVHQ4EFgQUUb4k1eomUkuO8qNT
+DciVUiIhKZcwHwYDVR0jBBgwFoAUk1+l7fm7leIaLpCrrZ+76ipBkQswDAYDVR0T
 AQH/BAIwADALBgNVHQ8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
 BwMIMBEGCWCGSAGG+EIBAQQEAwIHgDAmBgNVHREEHzAdhhtodHRwOi8vbGFzc28u
 ZW50cm91dmVydC5vcmcwJgYDVR0SBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZl
 cnQub3JnMEEGCWCGSAGG+EIBDQQ0FjJFbnRyb3V2ZXJ0IExpYmVydHkgQWxsaWFu
-Y2UgU1AgIzMgdGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAY5i/
-Z4PF/MYnyFM7gW4CvG/Msv/hvmcahQhOaT/9oaATyadb4OfY2JongOvbq5EVDRwm
-B7FBxtgwar4Rbt8RD3dnMnesv1YaVaZdAsFwLRAz15xrjRNjZL7cpq8vHgpiVZmF
-RIh964l3QmunUqLCnd4td2gzQKmdRMVfJsm6ekzzrHLWz1S0+paXZd0+9U/bH8UL
-n20zdP+l9Cj9Ag3rGJJkA2R2JH2mhVf9OMNTyeXJTcaSD8CHCcak9lRfqlF09ja1
-87u6S+d37o/zSKPuIMLgMVkWeqp1kBk/AGs6HadKBQaZR0LImG+DVViC+R94in+e
-+Ou1IxKlrA4cbMSKuA==
+Y2UgU1AgIzMgdGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAT7jc
+yokjPMtYN0ojjQnt8WyeQH2SIShaG/Pdgc7mLvjy2mwQ1l44xGcopWRn/sLKPuT7
+QPCKHG91t6WfMmW7Y2+ErA5HSmL+INAkuYVI+hl9c4YOQkVdB2YrH6H2GOCjAjAx
+eUWVkIB1DPqA0f5jQaJXH3ZFPAA6y1540c6K8WnqGIg/eerPIq6oqNAhTa00U8jt
+Eqa1Xcr3kcwgUpGKyRNxsM+Y1Zax9LsKSJZ5kRL2gOd54s7q8fDk2Grnmv+3m1GV
+v1QFLFlNkyVmfg3flXX3ljc1Q437H6haaJRniSE7oUuhVXINPoXms0R4x9twsQVQ
+FWZdYlS3RIc1jmGKTQ==
 -----END CERTIFICATE-----
diff --git a/tests/data/sp3-la/jks.keystore b/tests/data/sp3-la/jks.keystore
index fff2b01c..1fc19c6d 100644
--- a/tests/data/sp3-la/jks.keystore
+++ b/tests/data/sp3-la/jks.keystore
diff --git a/tests/data/sp3-la/private-key-raw.pem b/tests/data/sp3-la/private-key-raw.pem
index 1b49710f..17216270 100644
--- a/tests/data/sp3-la/private-key-raw.pem
+++ b/tests/data/sp3-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCuFpIrt6QtcGnG2rAhFx/7BRkX
-8qkjrGHIaMlgSlt0pZjrixaQF5i8zBVkfodQWxB2o+dvoyq+Br+wSUlNZlgp9pj6fgNaTEHTbKmY
-ZU/iQ1R1TWziVR7GEwEyYjPkxOI7WajsS9KdVAnWtejpWbffnNBPox5cVEhTTCHJ440eX5v9hsSj
-eLImSKBYlcpwouSYcpXp0nDu0/AYdsPTJZwJXo1o5KfRpsv7zLRPX3F3n7dyqr9SfqFYXHLlW6bP
-4pIe30O3xnWyNyp9MmyR1m2H4Y5u0i7EOQc/p+Jr727zoBsFBI3pTSjBvZdXbrPWqwEtB6iKSU3l
-+1aFr9X0isTDAgMBAAECggEABvvGz1QllOEOjTiWmi04TjSNJiXI3TJ8FbMGaQNymcJO2RwSQqN/
-sAsrzIU63mFYzrmSfir4evkAVY0LELzLSpum1V2autOWTGnuf7uIsdXrnG0Hsiih/GYkxSWlWUcA
-oErfeOMtxrvpTSCtADdmJeU/ggJUJHYJFLZYIKYtMguo3qu8H/nu/5nSKJ1kbEEAbIgLKiqQxVis
-wkyH+k34txaiVXLj9dCEmrYJi98LHdIRk7mA4zBOBLHHoNbGaag4fsybH44u6ZVhzfq3wPr4wjOs
-IyEBhvXEF2Yf74KgiUw0AO/Qu70oWr3ix7MSXeXmWOC0d+zom+trP47wLbTNaQKBgQDaoTdz9H4G
-AtDX+XboMeYYjnNp392xk2VtjEi///eNfrBD9pUBtpyQn16ZIj9tJJ6r1Xt+OQEWhx27pr9DAY+H
-WQhilU1UJKXWy0ZrViZ6JSITZ8CPDTPsKu6BQ31cVtv17qEpM8JkPmrkMTWHsBZHAPAg4Kuzv1y5
-aRkHpaEQHQKBgQDL2E6nR0THDzs9FQ/JcuOuYpAYpAe957TOBB42ktHXIReCNVUP4lImyuOEDvqH
-TrOX2tC9k0nQ1JNNugstuHNbGwhzeWZKw/jMmZ/iGjeF0kxZjMBZUNg18MWE1TtwyB+l/7envzFe
-LmNlxrZkDBGi0uQU/YQ7hMdlzf0sT2bSXwKBgGHXPirNYsyr2+ybfqRBGHkq3umlvt/mV8Djw/bw
-xUd0R8vSgTKoF379Y2dilUHx3nSF8GM3fY4oX50H7ZY+D46BwKflqxqZ4AG1LMmCX2vQTGSkzN74
-CKGLQPtmSabWVE/GQCdhO4CDEnEWuJ8FpaKW/9+mzBB/9i4fo4zxiZfdAoGABtFlUBMCKeZIhPJ/
-ZK2DEAIb77cMyz1Evt9EY27ltdxVfPVrsuxO8x02HuShXIU1XI7lDHIwtdtmUeM3HIBe2108GyCk
-WzvSxoUc4+McmE1AYH5ksJgTozo6YQcAxfTrmhHDgsjSTeQfTvgmgZIlxNxo5IrWMWdvg+gv35uI
-ROECgYBO/48Oi0etRCZVSuK8yFory5FzXWIyhER9RBZGdjfpSkY7Yuc2AZfS6K+kRY/xCYB7Hx7h
-KFR3gFXrwvjWEH4ZJFgkFMm0J/uhb96+l8k1N4Fi+y+IpbzZFi5DBBcyFAGzlunJMu7Jo+FC93u5
-7veCgC+xMo2/pXGwTG4in5GGOQ==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDFln43w+KYbt88DFHw9PhEHDTk
+O0kxF4pjuR5n+DWzgN1PodEK9+q9YlNS2Q9h58Eswk9UU91ulRsq01jj4I6pgVNviPuvD/JnOx3o
+RhirL0tiYsQfXs6fp4Ux9QTueaslQdhrjpDRz4eMSiLG8RV6oNOItmcDaMRbmFUU7JdtNCKxbw4Q
+b9SX4CgII8FlbCCGtRMiaCCyLKG/jQgjFGax2z7Y/pNZEy85ZDPob/IM4kBguWAaVa957LsYuhnz
+zk+tBCu1LavB85I8Gn2icTg+doZseyiUKZi6Zye8LE9MJgoKyWwSZl6XHq05gE+SA5h2z6lQ3eqS
+rq/H2xdQuJ3NAgMBAAECggEAYCkQvmUH53W2EQxR6LngBY3Qs+6ifVDemg/i22iyAe1KR9IR4Yus
+Y4Tx1lUrJlPa8MSURQ8XqhTJBvuavDRyWc5F4/c/vgA90b20nXFX2iAHSReWKUpDtvGZYinDv6fZ
+AiXchOP6WRHt/vmpmTaFZIvWxyc2VTNstMMbTTajr5IewhVeqIzWAHaAj0Czv4CezaTf3ItcacY4
+OR9JTlaLnRpdsFUJJZc9eOTlgIGt7zkQ7IvADG696VAKxW4ix+PWNxFAFqUiElobbLVYJvslI4u4
+uSi7dRfpTGMwyuKvhPGvbHYywc7ldyk9wpXptFXhwrvzaP8ALvwgladdT03ehQKBgQD67oYFyxsK
+2nIane8Hvqnd/n0mri2Qk5HrsKlFM7O2hTcNdvfzh0+ykQPdW+adNgBaSYDbRHnh4GgHo2SyrxwQ
+ifOG1CYed+gJYg4chMZz42nCH5u1IZRHNaiwtTWb480g9uQ51jhPwDFIbFliSOCMXshYWlraYdeV
+M020sRtG0wKBgQDJlCXXhwwANEu/Zp23u0FQeMMnBuBMk6vhKCcK9Vm4weIcF2pOu3isRuKuv0T7
+zdQmA/v4sa+C023C1T/DP/zmE9fliDE1+55IKTS4iT/rYdddjE8yWvuedONYMor307rijySJz3U7
+uvtiYPnI0e7eBIr+xAHIFx8SSGYYvFbk3wKBgQD4HRsV5WMC00YZvWnZDZRmtbjHo1fYaaHSGyb0
+DxA2e/gYbzbybCvIk4zvtmwLrJair6Uiqc2eI0aZrtzltTGZxN2vxls+qy8bAAKV/k8/zXAICzrp
+2Z8E3jDDMRol3xQ38QdvjLq3WIEibEfhX8/v29RbUFQfNLl2hHjkHm6rEwKBgQCpHqpBEQR4h2el
+xao9I9XAdhEFBTfaB2sFFHLtNrt3zvKtLtf6Bj9QCojUo5R0zlNXMbCNDkZ6NHi6Jb/BSEYdojhY
+UtM2v0wkrq2UxVHjYcsWqUkorjy8zMSQkpcVJYZ93iqBlJR+8HlIKKRoX/lQO++Bn2D/RqbC6AsA
+ZcNhcQKBgAgFvTlAmCtHdA/YT/pyIn0KVLxm32DPXLqj6j+wXfKbPZNjqre2pTFFhpf/svZs8xvc
+KVKeZEgZtpn97ysYVf98Kg8RvFPQnsZ3uawDhXkQ8NLp9ICTlp5s5qlOXHW4nusECZI4x0qNdO9r
+nJDjp388iAOk8kDt4pGoXhSV59zl
 -----END PRIVATE KEY-----
diff --git a/tests/data/sp3-la/public-key.pem b/tests/data/sp3-la/public-key.pem
index 3c860954..f6d34d88 100644
--- a/tests/data/sp3-la/public-key.pem
+++ b/tests/data/sp3-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArhaSK7ekLXBpxtqwIRcf
-+wUZF/KpI6xhyGjJYEpbdKWY64sWkBeYvMwVZH6HUFsQdqPnb6Mqvga/sElJTWZY
-KfaY+n4DWkxB02ypmGVP4kNUdU1s4lUexhMBMmIz5MTiO1mo7EvSnVQJ1rXo6Vm3
-35zQT6MeXFRIU0whyeONHl+b/YbEo3iyJkigWJXKcKLkmHKV6dJw7tPwGHbD0yWc
-CV6NaOSn0abL+8y0T19xd5+3cqq/Un6hWFxy5Vumz+KSHt9Dt8Z1sjcqfTJskdZt
-h+GObtIuxDkHP6fia+9u86AbBQSN6U0owb2XV26z1qsBLQeoiklN5ftWha/V9IrE
-wwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxZZ+N8PimG7fPAxR8PT4
+RBw05DtJMReKY7keZ/g1s4DdT6HRCvfqvWJTUtkPYefBLMJPVFPdbpUbKtNY4+CO
+qYFTb4j7rw/yZzsd6EYYqy9LYmLEH17On6eFMfUE7nmrJUHYa46Q0c+HjEoixvEV
+eqDTiLZnA2jEW5hVFOyXbTQisW8OEG/Ul+AoCCPBZWwghrUTImggsiyhv40IIxRm
+sds+2P6TWRMvOWQz6G/yDOJAYLlgGlWveey7GLoZ885PrQQrtS2rwfOSPBp9onE4
+PnaGbHsolCmYumcnvCxPTCYKCslsEmZelx6tOYBPkgOYds+pUN3qkq6vx9sXULid
+zQIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/sp3-ssl/all.p12 b/tests/data/sp3-ssl/all.p12
index 4e3bc205..f6d64fdb 100644
--- a/tests/data/sp3-ssl/all.p12
+++ b/tests/data/sp3-ssl/all.p12
diff --git a/tests/data/sp3-ssl/certificate.pem b/tests/data/sp3-ssl/certificate.pem
index 6b2cc565..87ac1920 100644
--- a/tests/data/sp3-ssl/certificate.pem
+++ b/tests/data/sp3-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEUDCCAzigAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICMzMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAyOVoXDTI0MDgxMzEwNTAyOVowMDEMMAoGA1UEAxMDc3AzMRMwEQYDVQQKEwpF
+dGVzdCBSb290IENBICMzMRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyN1oXDTI0MDgxNDEwNDQyN1owMDEMMAoGA1UEAxMDc3AzMRMwEQYDVQQKEwpF
 bnRyb3V2ZXJ0MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMFFU+TosS7BDJlVqKLX8XqoV0lrTI2bMq2LLSNadk3EhBak/Zq9OT1u
-a0LbaxwbO6JzncCxem2F1oOL6fmH2f8O3aSpw85tw5kDeilklmL14UxWhCVzTADM
-RXsZEJ+wzraVdSmZ+PAmnOoSYIjVuSdErlKFW+hHqKgkw3r1PxycWrZcdhIeBBbX
-lceWBfQm4jTWr1gztp0sPMtbgFF8dbUIE+PDNzh2Q2VFuzM/qVscDh36NSm7M4HH
-qEvCwgjX1yoRt0E46tw9TzfrD6O3Ns4fGR91FdrYX+rW2h/1vswzKwU2LUUq+Ddy
-PauDc88olLG6kz7O9z8Jk72kX/pHRGUCAwEAAaOCAUAwggE8MB0GA1UdDgQWBBQS
-Yo0hjxH7wk5kLrid+aAJg2f9oDAfBgNVHSMEGDAWgBQhF1thvvRHEgl04E+MFccn
-kt67RDAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFIDAqBgNVHSUEIzAhBggrBgEF
+AQoCggEBAKGjSFUHu9OppFEH1mT1bBaLmNtxTj1fxh64bNTN4hFjeq7plzLOAnsA
+f68sAWSlOokkBHMPDEmRFkBEayydahnIdTYUGee0Rg0dUG7O1xDwap4v/l+NOdvg
+RMSEQQnTSOKt8p+D4H5Ih140stDWPBcZkNfi3wAawTcMzzbrR+Z2FFMn5kc8tOza
+Eqgsku2EvbG1AUqz6fT6jAFq5TuI7+/Js8D5avzq1UKzc7r3ykHDRSIn3As/3e27
+cKRE0XwoKfnDaagbbfQS3NescEp0L2UYk8htjrH+TYl+z4sVx6maqfO0r4M8t+9V
+ryZYBlPJ6IQt4TnZi4CVmZngMczD3OkCAwEAAaOCAUAwggE8MB0GA1UdDgQWBBQ5
+HIQbqk2lII6ep/5D0n2hyE7hdDAfBgNVHSMEGDAWgBRLnMUF75CqPJazPMtlO9Vj
+wcaY4jAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEF
 BQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMBEGCWCGSAGG+EIBAQQEAwIGwDAm
 BgNVHREEHzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwJgYDVR0SBB8w
 HYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMFAGCWCGSAGG+EIBDQRDFkFF
 bnRyb3V2ZXJ0IFNTTCBMaWJlcnR5IEFsbGlhbmNlIFNQICMzIHdlYiBzZXJ2ZXIg
-dGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAqQy13e63MkthJU7U
-yJDgMO1XnLJrQq9yUKgQ5ZZeHs5zrPaQkcBlCkJGIH502sHdC2/PADBZbmAoc2pe
-d2B+d8R4dbgzoNIo6ZVyh7/E/NIHqhdXlqh++WhPDz9N6soRM4gMYsGYI7ivtiXF
-Bb1GfcYwZQ34tlkrBLJj4zARvVhfxz+PBi4UAnLWQ9MxVooCr8uHWpLNc3+YIElI
-l3sj8DiZDw00KgEabhJk2HD8tTAYbxC0LCq/jcDszIZcPSRbkcwolB58qNa8I26A
-DXkN9zu0+Ti5kBneLw+iycqbC9Kpk3j3prxZNW2sL9gwBvBrbZRIXh5wzaKzXGp7
-R+y1RQ==
+dGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAlTvlDqx9sljAhFXS
+H9HYubv5+WxTmHLhoMO8tMx1tUHAAU/OrGiMcdG6H839xakCkpInoDmqF7iSacxz
+QTk1cz4ZyunqC4pbwcBQWvBfsKIxGz8+aQPe52q2cDMaPAro16hQ9RPcjSSONSZ/
+hzMSBV+9gSCkYDiWY0oHb41cSN3eT4s+5qC7gsFyZc4zUABFcgDwwigXdNhgwDYz
+hel7rZR3XymQ5U1dLc4ueWzrKxWpzjJ/IXFQLqw7r7KB7RgNYVuftpR7hp+zGFtF
+p4DeMk/J3AdIfVR8tvodJFJtaH5C24NiqUiWxqYSksKFTgSMZc4uSvbYFlg0aTic
+AjR9dA==
 -----END CERTIFICATE-----
diff --git a/tests/data/sp3-ssl/jks.keystore b/tests/data/sp3-ssl/jks.keystore
index f301ca5f..aee4b29e 100644
--- a/tests/data/sp3-ssl/jks.keystore
+++ b/tests/data/sp3-ssl/jks.keystore
diff --git a/tests/data/sp3-ssl/private-key-raw.pem b/tests/data/sp3-ssl/private-key-raw.pem
index 1b548ced..967f1ccb 100644
--- a/tests/data/sp3-ssl/private-key-raw.pem
+++ b/tests/data/sp3-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDBRVPk6LEuwQyZVaii1/F6qFdJ
-a0yNmzKtiy0jWnZNxIQWpP2avTk9bmtC22scGzuic53AsXpthdaDi+n5h9n/Dt2kqcPObcOZA3op
-ZJZi9eFMVoQlc0wAzEV7GRCfsM62lXUpmfjwJpzqEmCI1bknRK5ShVvoR6ioJMN69T8cnFq2XHYS
-HgQW15XHlgX0JuI01q9YM7adLDzLW4BRfHW1CBPjwzc4dkNlRbszP6lbHA4d+jUpuzOBx6hLwsII
-19cqEbdBOOrcPU836w+jtzbOHxkfdRXa2F/q1tof9b7MMysFNi1FKvg3cj2rg3PPKJSxupM+zvc/
-CZO9pF/6R0RlAgMBAAECggEBALi2dI7DIYvIryzg5BH2hnCu8PVXWkvANzgLWvF95LFAjulBeKtq
-C4m9vT+hiwXKtTz2eJ+QP6zrC/CfSNfWUa9l2skkAuKInzbfTuK+osgjrNaTnSpZvhrJH+KdOvkU
-NwvjXZ2L7ZI/pRpExAQjFxkDmAOANy2RRwykTjt2poHE9iqh3vRrgRVyDjJQ4OHLFxWIarHaHBmB
-jb0zDAnKQy99B9hS3LWG28YA7Ba3PRKwwnv+P8IRztR41wGrLphQ4z1zV1Vz+7mO5KZWAAnZ9wIy
-YDKXbWhF6hkzSAQ2rN+X233klsCNqxk5NpiaovWLdHnZMEJ7TaHhUXXT3I3BSGECgYEA88hXTSXc
-OF+i+ZdxhRbl7JCyOpPt6pgDMK4B6CwSl6xlKKgoZF6CflMWnzq/dFqJi0rAGkX9GWljqd5+i7RG
-WKtPYXKoZbBbs3l+mNDE2Kp8qd/3MQiRElBVhWRbmu4A6+FoqYOrDnQV1RrBbeDV3luwizjXXIRy
-0Ch+mwr5zO0CgYEAyvTvfL3M42nMSVkFrVebgM6MgaPi/m3G6c/g5i/w3NQ74DZdwMOY37x+Xgh8
-AZxFC9DbhU5WeefWGxFRC3yQPLHDwA7POpxrRYpViJmHt7eSfBxIRjQdrYh3ipRMCsWJDs1JA5w0
-4ufBhpxq601iirI0zqcs2w9pAsP+TlrwXlkCgYEA07jNSW12Q2ecDZUfvGzUp45LnGBZowL+0kpt
-0YxlYWESQis5WWJThw72eLf3C0COcHEtQiRC2s0TB7b6xK5+4gd2W7XO1vJB0i/UaTf3ng0DVC31
-a5p7FCK9A6rTfEz0c+hCk+aMq3Lae0hPcfRxCjsrqt5k/C7z4CErQ9BWf0kCgYEAwxdBIkJ8Mdog
-Ih1tpJvDAcUKMQ/tgi7Z9yT5BavttwhX6gW4hzQ9vku9mPxE33Nst5fzfCe6XoJpQCmcIxOAvqcO
-CI7zyl5Ti0wXPjB+0i2mpKC3JKyyHn5AkrhMhEovnkfcuJiuCbNHRvMSn88KO1JkCoWOS6B7i8oE
-qSMnTTkCgYEAqoGJ1wqwKxPrVbdqJBjdinTL07be0NOGwssjc/izQZnEusQzua0UbnphVJgUWAMC
-Y2pZS3af5PSIroJWGd9nGb6cVfKLZYnhONdqaZo2lzYT14ZddO9RMI2mbIDuRB5mMJiZxgZE2B1d
-7q0oq4vUw7gIgaLYodgsuKPU9rNbfXQ=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCho0hVB7vTqaRRB9Zk9WwWi5jb
+cU49X8YeuGzUzeIRY3qu6ZcyzgJ7AH+vLAFkpTqJJARzDwxJkRZARGssnWoZyHU2FBnntEYNHVBu
+ztcQ8GqeL/5fjTnb4ETEhEEJ00jirfKfg+B+SIdeNLLQ1jwXGZDX4t8AGsE3DM8260fmdhRTJ+ZH
+PLTs2hKoLJLthL2xtQFKs+n0+owBauU7iO/vybPA+Wr86tVCs3O698pBw0UiJ9wLP93tu3CkRNF8
+KCn5w2moG230EtzXrHBKdC9lGJPIbY6x/k2Jfs+LFcepmqnztK+DPLfvVa8mWAZTyeiELeE52YuA
+lZmZ4DHMw9zpAgMBAAECggEAfKtn+s2APX0205jr7+qrd6gsOfVml0frk35D0s8Jcsf7tDVO/UyP
+9TcpRH74hBw8zdIN7IDKxWM2elNLJpozX7eRUCio4mHVNgBKLW0zzEjisyfpVuGiosiTwc8QKvff
+25a27/nTiRN/9VVIJnNW3apGYX0G6xm3tTIYEQ/f4QwwSGIeBmIVNZ9XLg7YGMDjB3MG29f0tN9+
+rZ1/HWABK/mZnYbZzHc8H2eamQ918Vl2h/RS+HvNpFvao9iNeQQXQnikXtwKvGlGkSsd4V3At9hE
+6uRurtRt0PmmrBDUifvQd4OQiJNsbA9dpoFW3SkAZfmc0UGGr2U84kmTmA5mEQKBgQDNvztAXKs2
+tWD/Vy9/nvrCdjF9qc1+WxIS+rIAXShJ0/7ZVxMv4wOx1zA8WnAOwi26+Q5L+azFTeO6NTc2OMkH
+aQywJTfzwiOk37jBsO/OgldJ8iS1fI3yZx8ww4Y8LW/eY2L4BrKXpEeptjrckwAfhlBKIFwC8V3e
+pjYU39qATwKBgQDJHgf2w2i8bi/b7IoPW8hghUho9FlCjeoTTivVhNJNrr/8okExTL7C4JrjQzoM
+UtZYdedUFKj2yvGrDOMZPVOq6KJFHIsQPlo/JdPhv6T7tZhSrHxLteYxfz0faLH1yNywMtlIaUtx
+Y3JKH42WgWbWWMse/uuYZYHFkcP5D4CJRwKBgQDFaXFOphvZmFsDZQI8L6xnHcUKz/xN+s/yyfw1
+AS2A+RoUK8pLLkUDRHgR0KyoXIRIXGPtXhj6D2wr5JefPQkWRSNZd7yh9GsC7W522nCd8s4SM3Yp
+dOM17OAuh8yqvOYTucTiOnrtqUDhg+oibiG2Hce3+CiQ4kqxMUW+7bLXXQKBgDjybPTdfgGk/Z47
+SxhwN7vE4az+S2wB/R68SsMp2davPaOOWgFYpsdNi+3/8ibdKd5gfEEdnH5NFsMFYiSabd9+Abyq
+CWJvFWS+FFHezxuK3vfB6WwStHydd7Q2E/XxizPFIitTzU3tB8afSpssRu84s0MykYlUbLuBu8kB
+L7cvAoGARvSqN3thctjIV+5055yH9z53gGH86hKpifIr6Yuh9KfIHDHKFbap84FnFnpLr9Ox8far
+u9sEUCQbCVC43RdStr3QIW3QwM99MTRmMNRc78yDFolkb//O6oDoz+bHSZMmmyLZylU/4oOhhA1e
+X8/7O3jVAg2mH6rWY5EwJOXlNhI=
 -----END PRIVATE KEY-----
diff --git a/tests/data/sp4-la/certificate.pem b/tests/data/sp4-la/certificate.pem
index 37e13305..12582b02 100644
--- a/tests/data/sp4-la/certificate.pem
+++ b/tests/data/sp4-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIEKTCCAxGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjhaFw0yNDA4
-MTMxMDUwMjhaMDAxDDAKBgNVBAMTA3NwNDETMBEGA1UEChMKRW50cm91dmVydDEL
-MAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRfYRT
-/pvs6CBwV8BrYxbgSOsuZ6afbSRUx7VFYfIFjjK08/igQsK9EvVqQREo5uz/zE9c
-ZUUcN+3DHOA9DsD+wgQwubybgM5ZuXK6GVZZR/6sdSAZISNlHcmCFzdH/ipp6q0Y
-aHmmkhnmqPrPrM7KEuY32n6eUOE1mYC9HCwdnkdxu+KCVS1AzN4jqSpKHncdG2dG
-syMjE19ClpQSEz6A/KMXeiaQkQwCcd9QRowkaR9lUISnc14HYS7NIpER3m2TMv2J
-IDZPxqBc6z9Fr8CTryfj7l2v9Eufnn/NOWIc2duuhi+7IyA24/Qrj79UAZ7MCfD0
-gdEySFuW5L3kYTGpAgMBAAGjggEkMIIBIDAdBgNVHQ4EFgQUkmlSnn34ThPeGcZb
-KoreeFh9yaMwHwYDVR0jBBgwFoAU/McWxEs9OZ983dSRD9UcRh0IoCUwDAYDVR0T
+QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjVaFw0yNDA4
+MTQxMDQ0MjVaMDAxDDAKBgNVBAMTA3NwNDETMBEGA1UEChMKRW50cm91dmVydDEL
+MAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBLr04
+ShTKlF2LulvM6v34I2r+t743NwMsybDt5/rTANUKe/YWIWWxCHICgUYR2TnjtyOV
+MzIfpXHmJKeUoFUCKny1rf0FrfhT+jB27tHKEFNggQ/a+sno9uqi3HlENLBUomop
+rw/PK+BBVVBZgjrXFi5eMlR0+FE2wCoPYjQ33AIbCOCQSfXkkkD2IP7SrCP+UeSa
+4d0iayIiW5HKAg1TNplgoQT2eQBw784nK7raB4KQReBNfd+uWrU0kiQu6O9Utn3F
+Yv7svTYMO+SUNrEnthxIJuAQfmhvshaLi1d99ni21tWVk4888+d2aF+XJdGo+GEQ
+nTic/prs08gNK1qRAgMBAAGjggEkMIIBIDAdBgNVHQ4EFgQUJtDq8Bo/f2n0QQNT
+1w4bQc94flowHwYDVR0jBBgwFoAUU4KFNEsAOMElFZ1c0YfYq3/1PugwDAYDVR0T
 AQH/BAIwADALBgNVHQ8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
 BwMIMBEGCWCGSAGG+EIBAQQEAwIHgDAmBgNVHREEHzAdhhtodHRwOi8vbGFzc28u
 ZW50cm91dmVydC5vcmcwJgYDVR0SBB8wHYYbaHR0cDovL2xhc3NvLmVudHJvdXZl
 cnQub3JnMEEGCWCGSAGG+EIBDQQ0FjJFbnRyb3V2ZXJ0IExpYmVydHkgQWxsaWFu
-Y2UgU1AgIzQgdGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAryZU
-TQX4OxmbMwVCR55TJtdbolUWf7ACd+LzQ8L90LDK0WGSrUlItH3+uE/GgCXuI4aw
-RVC3pOLQziIO5BhuVUwYPBC/flZvQIcuY6w86H24H/ql2ejoJ9cWI+/Gou6j9pLY
-l1NvYNicSdKqYoa2+4QwLFscSsnv9JDTuePQrrDRp3PZoeS47Sg4B083zXxdBIDD
-hp+0YvaQY5u/iT6RFyE8BoZr4LRiehr6u1VVHzg3CdMlq946Nh5BO2nLyAkrMNq6
-UHbTjXobssNb3LoSYJtoRdxYjXEGgQq/V3QMCO3LbPaOBSTTRfreZ69mq5mQRtvL
-g7Fo43AmuRs73wIG/g==
+Y2UgU1AgIzQgdGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAloal
+oafPIQ1amfHUonS3yAlU6xbEP5MlF2TzC8vF9PykrbRLdAzNhr2LJSi9dKmbK08L
+ixJ5jIRKM2b4OUcQjdKbESZOtxjoMprdi22tDQVYveWjcyr0VzJH4CHhvHtfPwVA
+QKZ2XIsJ2piPdmfUHuYikI7SMSfVi4jn9YAcofjIKSto4+rpYjlMm4W7dSZkIdKl
+h30uOdWI+lJLY+XMkR5iywZmnRJt+btXxz5pB5SlikL/Z1c7NxQtxZjuAJkxgb16
+kEU/sN4LcyTRM5acQKcUOkTH0Gwj1g/TvHBbs1tU5VBzQXNdX0im/YjhMmRxvtrO
+lpO2udZN2AKitBdj4A==
 -----END CERTIFICATE-----
diff --git a/tests/data/sp4-la/jks.keystore b/tests/data/sp4-la/jks.keystore
index b32fc869..fed24c86 100644
--- a/tests/data/sp4-la/jks.keystore
+++ b/tests/data/sp4-la/jks.keystore
diff --git a/tests/data/sp4-la/private-key-raw.pem b/tests/data/sp4-la/private-key-raw.pem
index 4ad4a489..8dc3aab4 100644
--- a/tests/data/sp4-la/private-key-raw.pem
+++ b/tests/data/sp4-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDRfYRT/pvs6CBwV8BrYxbgSOsu
-Z6afbSRUx7VFYfIFjjK08/igQsK9EvVqQREo5uz/zE9cZUUcN+3DHOA9DsD+wgQwubybgM5ZuXK6
-GVZZR/6sdSAZISNlHcmCFzdH/ipp6q0YaHmmkhnmqPrPrM7KEuY32n6eUOE1mYC9HCwdnkdxu+KC
-VS1AzN4jqSpKHncdG2dGsyMjE19ClpQSEz6A/KMXeiaQkQwCcd9QRowkaR9lUISnc14HYS7NIpER
-3m2TMv2JIDZPxqBc6z9Fr8CTryfj7l2v9Eufnn/NOWIc2duuhi+7IyA24/Qrj79UAZ7MCfD0gdEy
-SFuW5L3kYTGpAgMBAAECggEBALn2wz5Q2ZfPY+R2cXCisM7+zA8QogAKQeMkuUzTKqY12dt6a+3P
-9dEkAEmHYzU88YwNkTGDEHuBRoYanxB0hWxhTJj4eG5ORF+v2SFMlrOAzpnHC2xjV2lOrO/XrhIx
-lPMbCPeO3ta4AVgaDzPFwnftmQJh6l6di54qGvdFCABtQsNvyv0p/ScpFpAOpOJ857ysefwHAAsS
-5k8lo3sxkCMBIAJAmhc6tMyjFAJ4Zsz6NVMJl4pcAPPzwD+D5CnBwTcP6QYEL3aeJJR5T1D1hwmD
-j+eeV5t12KaylJuynXGAXugPlt7ljiZJG8XiAIuOqlwRZAVUEvSlEyKs6cYLI8UCgYEA7tdIQZxz
-MTg4IfuxnRr0Z5F0DS8Pr5y2u+xGa/KX0lRBOOqS3KmR7mLh/imGtutECXESOhJlfx2Q0O7IWLaM
-63+qEoyF97hB/17+G0mq9RjBpdNDGSXWTEJJeYuLu6hs+OL2LYjce6cgyiXYgWscPoFkqgP1Ip8k
-NfcqrOGWy3MCgYEA4IpsUC/Klzz1HOyEZOuaHpH54dvlEbaV8TpRdxw5xIXTOr4B1+cgA0E6QR3S
-115yW/Z5hIfmK1bMjzntg9Qzf2x3NME3+3TU7QTIV1uGYZXR9b7Y+SvDN661APvTcb8oVLJa5X/d
-nn6B5K5xwPjeTzyob6lvUSpCJS0bHVCDv3MCgYBmJAUPohOVOgCvb88ea9eXrxmdRcIEjRWMulfH
-dGC/Hy8hYxfZbF8vPnR9WE73TRe0nfl4gkOLoB49a9CcN71+PQODmTr1nIQE7R/olZGZ7bNq8jUg
-vRCvXi3D4Ayq/TVVHuK+yGfaLbgVGyhC+IaEqJtfJgAghURcG87RTkxJxwKBgC94NCPTprHIek1O
-F0M6p890ru43zbqr7hEcciKLPg80944Ao2UggJ0PiiBADNXpKqYUemYxUNCyvfY9md/32ZdDuAPY
-IVywu18MVspZGBTDVqrsWPR8cv3vmmaF1pLCheU5+4tvN8wNFKri0juooV8BBN7uZBE1rNwtKAFP
-hzrPAoGAZ+TPL6nfNXJTDnMgx3hL57y1iytU6b0lvyJCFcTyvFomGO1qp/uL3B2z7InQpf4TLn+N
-a61LfJAuwRfrS5vs4Hfv2jpIU3WSbongMGsntaopRkPziytGqIXK5vwuxssAxU/PQaBN+Y5ZpURn
-AAzO5BK3jclUxDt6eOMVXrXEnhM=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDBLr04ShTKlF2LulvM6v34I2r+
+t743NwMsybDt5/rTANUKe/YWIWWxCHICgUYR2TnjtyOVMzIfpXHmJKeUoFUCKny1rf0FrfhT+jB2
+7tHKEFNggQ/a+sno9uqi3HlENLBUomoprw/PK+BBVVBZgjrXFi5eMlR0+FE2wCoPYjQ33AIbCOCQ
+SfXkkkD2IP7SrCP+UeSa4d0iayIiW5HKAg1TNplgoQT2eQBw784nK7raB4KQReBNfd+uWrU0kiQu
+6O9Utn3FYv7svTYMO+SUNrEnthxIJuAQfmhvshaLi1d99ni21tWVk4888+d2aF+XJdGo+GEQnTic
+/prs08gNK1qRAgMBAAECggEAXGLr3zWeh9s4eZBgQrnHR5o4myRodaN7gznZwY0FqU9mkyMBZ0gF
+iAqP657DUdnfE4YMIFhhijznIbc55Zxfyy9igMh6jvLKJe8qqlZAQjBYj3hpisIRObaMM+LYo8PG
+6FLcDp9IIj3Le7M/P+9GEILtHeNX/LCctmBkPQMsEeHyom2BJqzd11BjIQ+UaqA9HHVkyahm+4pE
+M4YRn3nlgGJwH0umPhf3d52Pi217w1OUrfDHZbPRoVl1p6znA2mBCcD5hKEoc8Z2OLWSQ2UeTD0c
+VSavswTkJ0TC89Jt/EzLSzBNNDJP1o8rCJdw/phFIEDIAvd0m/FXvksS4o3BgQKBgQDq0FpSCayq
+SThRCBFri/HbDpiw82XU1N7EPjGLSvmcCphN+eNO4IL/Sg20igDmiBcnIryNkX+VdS5XD4WvPV2P
+Dxv/3NQ5yW20K9JesRZ4YU4H/anCUQcArLKNG5FeninyaEoUTQXYg1imKpAIgzYnYu8018w8iQMy
+238oKofmeQKBgQDSnM0kGI8tSTI4lIjGkcDOGd2vnmy4b+iqsCX/VBb9ZPpcDL+X+xYwmEMolfzI
++fFWVcF5oE9zwYlcIEpU49FrtozCYB1bfGpdFB32I8F53M7T08zP6OOz6xyYvUhzkTeDBgFftHj3
+hb+B/QlqpeMfFl5QNkW1TKsFI/JjGjlu2QKBgBXXa49V9wmf5e0jovst+UE3ClzrRv2VD2ORpWof
+fzhUg/Y82DfuCkFU0hGJBKxs3Dp3sLI6ZnOwgq72cqjqPFmiPih+kf8ODXZE3TyRnFV2N5vmrHO2
+tcAKUFFvzwXOEHjL2pgo0fJhxU0viFZCXjcrrLRtnkHDPNjuMdW6nwmBAoGAGwBDRIdpg7LIn3xb
+dKmnAEVMqIE1Cwg92fQvSuaq892IQ1jXD1L/a0d6BLAF8nYovJrN7RviU8LSK19waCW06YxDy3+r
+A9mVgU1c8ftviIIIehvDPDxtRNm1ltddfIN3jHKupmhqwcEB5lZcaLHPxmKFwN7UXQPxQP10y8PG
+7TECgYAM3/VQKlSm4yvQHw4gNpcdWyMv7JZYxCBnsZhCq1ffuuNsCz0IV6HotClopmk1y0blIR2L
+wRhl2EwvAxcVZu1xSmDLUwtAhfHtW38aRifbx/vJEV82PdgA2y1Jg2V531uOJKjcs1geAHLQZBSc
+W+ICxNxXq7EyKr1wCDNeGZwU5w==
 -----END PRIVATE KEY-----
diff --git a/tests/data/sp4-la/public-key.pem b/tests/data/sp4-la/public-key.pem
index 12e04d47..88add562 100644
--- a/tests/data/sp4-la/public-key.pem
+++ b/tests/data/sp4-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0X2EU/6b7OggcFfAa2MW
-4EjrLmemn20kVMe1RWHyBY4ytPP4oELCvRL1akERKObs/8xPXGVFHDftwxzgPQ7A
-/sIEMLm8m4DOWblyuhlWWUf+rHUgGSEjZR3Jghc3R/4qaeqtGGh5ppIZ5qj6z6zO
-yhLmN9p+nlDhNZmAvRwsHZ5HcbviglUtQMzeI6kqSh53HRtnRrMjIxNfQpaUEhM+
-gPyjF3omkJEMAnHfUEaMJGkfZVCEp3NeB2EuzSKREd5tkzL9iSA2T8agXOs/Ra/A
-k68n4+5dr/RLn55/zTliHNnbroYvuyMgNuP0K4+/VAGezAnw9IHRMkhbluS95GEx
-qQIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwS69OEoUypRdi7pbzOr9
++CNq/re+NzcDLMmw7ef60wDVCnv2FiFlsQhyAoFGEdk547cjlTMyH6Vx5iSnlKBV
+Aip8ta39Ba34U/owdu7RyhBTYIEP2vrJ6Pbqotx5RDSwVKJqKa8PzyvgQVVQWYI6
+1xYuXjJUdPhRNsAqD2I0N9wCGwjgkEn15JJA9iD+0qwj/lHkmuHdImsiIluRygIN
+UzaZYKEE9nkAcO/OJyu62geCkEXgTX3frlq1NJIkLujvVLZ9xWL+7L02DDvklDax
+J7YcSCbgEH5ob7IWi4tXffZ4ttbVlZOPPPPndmhflyXRqPhhEJ04nP6a7NPIDSta
+kQIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/sp4-ssl/all.p12 b/tests/data/sp4-ssl/all.p12
index 66d77c7d..d0a60967 100644
--- a/tests/data/sp4-ssl/all.p12
+++ b/tests/data/sp4-ssl/all.p12
diff --git a/tests/data/sp4-ssl/certificate.pem b/tests/data/sp4-ssl/certificate.pem
index a6aa49db..4e1f51bb 100644
--- a/tests/data/sp4-ssl/certificate.pem
+++ b/tests/data/sp4-ssl/certificate.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEUDCCAzigAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjE/
 MD0GA1UEAww2RW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHdlYiBzZXJ2ZXIg
-dGVzdCBSb290IENBICM0MRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMjEw
-NTAzMFoXDTI0MDgxMzEwNTAzMFowMDEMMAoGA1UEAxMDc3A0MRMwEQYDVQQKEwpF
+dGVzdCBSb290IENBICM0MRMwEQYDVQQKDApFbnRyb3V2ZXJ0MB4XDTA0MDgxMzEw
+NDQyN1oXDTI0MDgxNDEwNDQyN1owMDEMMAoGA1UEAxMDc3A0MRMwEQYDVQQKEwpF
 bnRyb3V2ZXJ0MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMjpeaOIpLvDEFmkWZkLjgXhDYePBN7ey+nRrKMOqNlE9vTCO32hEb/X
-gmQ4vRBdRbN7bjDcbWtqTj+yKb3un6LcWNJLj9aD+noOMrgmCXse2DOUqSkl0XIM
-/UaTnSsgY73M2r3dLm0KwzHLzP+J7zTAcc4JZ7PWSd5fYAY0yq7B2s8VfnPHgl1R
-JLD7SU/2bjgI2H6lM3zItdKRZwOxXAgmNMCpKgzF64juNiabNpG6oAEhUjhruMUg
-++Wj4L5CMfEBub0QY0OLa6qIiNWwpBH+si2f8YqYbWCYVaypfiTzTzVxKyHtaq+i
-oVaHknIUmNV0wVRk0TchFtYFLasAfikCAwEAAaOCAUAwggE8MB0GA1UdDgQWBBQ2
-2CBrbXxPop9g1r+23TJ2p8cNizAfBgNVHSMEGDAWgBSdSElpvq5OLfwdV1djHxE2
-8aQvDDAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFIDAqBgNVHSUEIzAhBggrBgEF
+AQoCggEBAMBw3+QtoZVOZy3+kbJMe21cZAyXzOCoKUjKimA+MK2NhEp9vIVg6R2T
+Ete7g+GZNQpUB7j7Wqd/pIbE+SDJ0oc/g0wrE9oHjuB+ueI5APXC8Oc7uUd5p52V
+QeXFLxvruGZLwqoBXPsPfPAW6eqB9uOa5a5SHspU4Q6AfZP1HD5EqxVB+eO+Kc9e
+dxC//yigyFwl7jUEhSie+dfx24teqOI1axmC6K4c43GKdn9Bt0d9dq9tkaPyAbm7
+qHywqRYkoB3ipLzaenbYZjhl3zAkhH20TS9IqKeBQik5J8j6ezU7rMRRCO+K3Y+I
+9bg2kAao13xIyTAoBUSwaNkZruFNyH0CAwEAAaOCAUAwggE8MB0GA1UdDgQWBBQk
+Owe+XeBkqFkFaYBeo4ThILQ/1TAfBgNVHSMEGDAWgBST1Dwt1MJV5+Ue3Cqjejq6
+7zqFHjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEF
 BQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMBEGCWCGSAGG+EIBAQQEAwIGwDAm
 BgNVHREEHzAdhhtodHRwOi8vbGFzc28uZW50cm91dmVydC5vcmcwJgYDVR0SBB8w
 HYYbaHR0cDovL2xhc3NvLmVudHJvdXZlcnQub3JnMFAGCWCGSAGG+EIBDQRDFkFF
 bnRyb3V2ZXJ0IFNTTCBMaWJlcnR5IEFsbGlhbmNlIFNQICM0IHdlYiBzZXJ2ZXIg
-dGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAjQ7mTMKn9EHTvBfv
-71fGhDykJOnoF/1yS4VxlpXGEzdRlRTF7F2H+JzB9nzr1b4gUueV8Z6m8gZqZoWU
-GVwKBaiZUVTNDFR1pHgTcEgD95iF15DvgnHUd44CFntcH6ObX0JfxuekTTNAkIuy
-xwCfp3ncLd2LtW2q8h2P7AosiVimWXw5zlKhRSeOMt3tK2VV3d54fxMxMO+/N7rX
-jr8XIWU1GiaO0TTjf+9yZcQaGa4EO6s+/uxtr9pThpTX03+PNiX7TsAV5t+0w1bt
-vCtROu9wPdyAwdUCZyIK69dwW7BSR+Ya+ct1PRZqtnpeU3euqhre/Tj/W/vr44uY
-Kfdfdg==
+dGVzdCBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAQEAgpX2skAiMJG+Z/LO
+GMfRIYbEBgBwkKbrBkvNFjz6CWQ9M0QLsJOwyX7GrLrS7w6eoCcA3TZyFR5w7ODx
+0XxbzeCseM3SvwWyX9wOL4YAYAKl7KS478scpqDj7fFJ6Wb2iDCMCNOdd0Cf+bfL
+sEs6zQ4bxMGIBarC43bimzhYPRcbsH/5G2AciAKGLZ5a1w243KetHOoxGUEb5370
+Tno0D6lyfTXKBzBcQ/1EkXyVYU63+otp5G3sWiWi0pjDpjgs/sv0bXWH2DCl6V5o
+u6pgn/1hson7ur28aw7CBVxdHaFAJuo0lXPAbXssCOwtDRnlvszKc34R5IOBXx7t
+SV6t2A==
 -----END CERTIFICATE-----
diff --git a/tests/data/sp4-ssl/jks.keystore b/tests/data/sp4-ssl/jks.keystore
index 7ec8fb79..ada53b64 100644
--- a/tests/data/sp4-ssl/jks.keystore
+++ b/tests/data/sp4-ssl/jks.keystore
diff --git a/tests/data/sp4-ssl/private-key-raw.pem b/tests/data/sp4-ssl/private-key-raw.pem
index 620f8fe2..ea1dc962 100644
--- a/tests/data/sp4-ssl/private-key-raw.pem
+++ b/tests/data/sp4-ssl/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: tomcat
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDI6XmjiKS7wxBZpFmZC44F4Q2H
-jwTe3svp0ayjDqjZRPb0wjt9oRG/14JkOL0QXUWze24w3G1rak4/sim97p+i3FjSS4/Wg/p6DjK4
-Jgl7HtgzlKkpJdFyDP1Gk50rIGO9zNq93S5tCsMxy8z/ie80wHHOCWez1kneX2AGNMquwdrPFX5z
-x4JdUSSw+0lP9m44CNh+pTN8yLXSkWcDsVwIJjTAqSoMxeuI7jYmmzaRuqABIVI4a7jFIPvlo+C+
-QjHxAbm9EGNDi2uqiIjVsKQR/rItn/GKmG1gmFWsqX4k8081cSsh7WqvoqFWh5JyFJjVdMFUZNE3
-IRbWBS2rAH4pAgMBAAECggEAevGkZdYwOFXdo31W9riDaEWXqeRy7o8X6TVNl1pZKNty48QX84Cl
-A+g0+m9eAq2RAYv+mhfJPXoH+CJmOLvVJCwCjm1+z55joF0f3GAqXRU66BWIjo195XTdaFrcSo+/
-eV3qXVUEG+YCHG7CO32Ey5sYCSToOLxg55slf6a+gME5u/toNjlAetHqlz2GvqChdIgCdy08qFVM
-QYsm9q28f8fSl8FvqbM4WvoxFhvHhTRzL/PHROAk77nxCQh8j1xw2GZuZ3Ua2RLVUNHvbqJZuD28
-vDzgiCEh58NzNw48ec2khesPnBz/Jsgcj0TqlEgkIW9l1+137lzGv37XpiWmgQKBgQDw2axwlkqK
-LmQamZ/cxCeAO1WkuZSD1BT3LH8eCtGzwdpxob2Z7SzADwKR/KRNGIBYFZn0eKpExkQuXgKOcqS2
-QTmdKmt1WKKMSMWkvIIrMhLOLIwtLa7IYwjxAdZzLXETntkobivYYRj40B1Tv+dNJ3pLmQ4QbzDp
-UE8tWOzYHQKBgQDVjLCSlBhgFEDoiF4+3ZIou4dkmGIdKaJnVMazywlO0hcl1h+nv16IEphgMQgj
-BSBjKW3JV/CTm2QGJPVku0r1CuPmWliEoO2Uv9T3mjePU+YJhqimDFFmbWoLSJzjl//eaz2JA6Wd
-7Q4a+H1iIQbJzjr2X9s46vC0+fSQZoVYfQKBgCOxHkzQ+NrhZRRMD9S3fOMT5+0xU0D1/OVkQrJB
-CDKLV8PfJCnba/ZKQyc/OVnzd5GWIeqItzLZ7uCwLdDOTHp10APqdWI+cFg5sJBpHyEnmoHTODK5
-wl0P0BNnIlCPO2Kc97F2Iik+umSk8rOmjLByWT06wUrOL4Fj1VfzBaZBAoGATTWL1cNDuOE5wpkj
-chlMMfvzbNSHjMGz3SZSnUjIeb4N7nkngs/3Dr2iaAzyQy8kUZX2ArkP215wYKRWMPBinowsb+m0
-XWeN3p0pE8inU+PipQkRys9jUuQ2VhQP3V3kffdKDVLLO3ktA2Vad/M28BnnSZLIwSB4nQZOfTMD
-/UUCgYEAtgt/5VeJbwcoKA3BYNq5JmOYdOkBR8oDgb1r7gJujqBB9GSIRnzOnaeMPOdnBQDmY4oF
-UHGSABLT/8iOkJE+JhYs1E/YF+1O59uSKBEz5WOhq91LVEG57RmB5WZNW6VJRQzJCw1y1+pUiu6O
-+2b2oigOCd7IlmQoyTP2Pg9JJLE=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAcN/kLaGVTmct/pGyTHttXGQM
+l8zgqClIyopgPjCtjYRKfbyFYOkdkxLXu4PhmTUKVAe4+1qnf6SGxPkgydKHP4NMKxPaB47gfrni
+OQD1wvDnO7lHeaedlUHlxS8b67hmS8KqAVz7D3zwFunqgfbjmuWuUh7KVOEOgH2T9Rw+RKsVQfnj
+vinPXncQv/8ooMhcJe41BIUonvnX8duLXqjiNWsZguiuHONxinZ/QbdHfXavbZGj8gG5u6h8sKkW
+JKAd4qS82np22GY4Zd8wJIR9tE0vSKingUIpOSfI+ns1O6zEUQjvit2PiPW4NpAGqNd8SMkwKAVE
+sGjZGa7hTch9AgMBAAECggEAOYkFx2jFKKiaPKwhz1cCh/3Zg9JW1MwyG6tCl+fAEgN/i+3v0Uja
+KZdxSMKteWOe8gmRjYLI5c9J12lIur7cjMc2cC1o8ATWeNQqqzIz0UaJU/kNOgtrS7f2TcYYgZaG
+OT9pYf6qV/2XcwjGwvA8amxDQ00WG5Qo/Xb5FKVx3kOQxYYY1XSUMQCRurz6Ipdo+/0RaZZyfSLN
+7S0v116Cc/gxz+eo812nEeOYvWW72m7b46TT33jxAdYGijMTQF+dAEBz+6AayyiBAJLAbo31fMsq
+n0SCO1rZDL2JhXQX7qtZS4pC2P/+9zeeMOEGicQ776AB3tn/arz3eNt5GwEjmQKBgQDkG7yUshj0
+XNTwGX1qmawAojp7lMay50aEmDtEKHJ9hTObosAjKiiMKMWUhLW/DiApwuKJdkEq/VfLoCim/7bZ
+dYeke/G43ASUKkDnlzLebquVoTXUQt1Gthwebdd40GhuK4oR8HLt2UonsbHi7DRYuxftjwSv7jUT
+nUIXwfS0NwKBgQDX+Kxt9Bb1kF5FkgWAhaIv9+000aE/JXKMZpSv1lYNYqs+OsWv3bRk4MmNRuTL
++6lB6qBO9kHoprbmgCpJEKs3hE12XLX6tZ7MvJgwd2MophycI3JRHZPoHlatSRXtD7pKWAghDM0M
+BX3JcjZK3l7+YKpsYYMZEka6x2ss8r126wKBgF8wA925BBjUtDcNK/zT66bIC8eOKex1/kNOk0y5
+5Czk7MhBfhQuf4UdbnWve3gimOFUZdwe8MrTtVNPnicyBkdweA33esM9bNu3ViZOPff8DrX988yD
+qnrbe5hnFcdgkHOIz7D0ucDvL7aovCaJkr6ENFP5nmcb7CInOXFYipi5AoGAE4kCz89MZFnyrQhQ
+RxfPW9dpNWXg1/1jJyAAQwd4MS3Dn5VhXE8JijZrBMRs3aad4MCAT6QmwgySbrcZHBLN6e+lshcg
+vtS+0HYergOejIa5/8WVCZFLV6um23XI7fCGQUNFOPgXdAbrIdWa45rJrOjBgZwwZ4wnqa1wHFi4
+mpECgYEAxQKcLe4OSmtcvHNfOq+0xiQoub0xPmclnh7b6zFROyQ3ZfsVL/+KqpkoR7W8ahmIMizI
+PbGf8iunffh9FhstLfZrLHP7lUugs41tQsX6L2CCcqeRYHE2lPkLTJ4zEvpE7tln/0a2TKjTiV58
+Xvby+2P6B4u/0ZqjPwoI7eMVkVI=
 -----END PRIVATE KEY-----
diff --git a/tests/data/user1-la/all.p12 b/tests/data/user1-la/all.p12
index 837e1e23..8b953534 100644
--- a/tests/data/user1-la/all.p12
+++ b/tests/data/user1-la/all.p12
diff --git a/tests/data/user1-la/certificate.pem b/tests/data/user1-la/certificate.pem
index 827c477f..6143a15f 100644
--- a/tests/data/user1-la/certificate.pem
+++ b/tests/data/user1-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIELTCCAxWgAwIBAgIBBDANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjZaFw0yNDA4
-MTMxMDUwMjZaMDIxDjAMBgNVBAMTBXVzZXIxMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
-MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALHa
-NwzoAM+KmQGPnYxJaBIG+FdaI3MANZr3OW8Hr+d+9JOA4EKm3fhQBPq0tSsW++AT
-gEUVkZK6u8EWVoo8JUS90R/UnFuWdbOJwBDYFXZq0qc7JyNZSwB/BvgwsNMJYuVN
-0XyVsWrSQnc9jO9b29JRJb3c7V9YjSET4m7kM7ynnBACKv1+WwgKUZBFu/BGkQl1
-pVafKIu4u7WbcrVZ/NSVFMTTNbQ32stf0JBfhQFejQmq67Xj8Xl6BxsEV5nXnCBh
-PO/kzg6A5tvD/dU+pqn0xBTbdBd9TX2AngMWdzpj8wMNBJBvgftJXWOSwLGhs4Bj
-/4RcpvznDo7IJ0nLrJ0CAwEAAaOCASYwggEiMB0GA1UdDgQWBBTRLwwHcq4HAX/v
-ODjgSZl/JHduWzAfBgNVHSMEGDAWgBS1EmhUEyG2WiZ7dP9O/ZucHnIhojAMBgNV
+QSAjMTETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjNaFw0yNDA4
+MTQxMDQ0MjNaMDIxDjAMBgNVBAMTBXVzZXIxMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
+MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG2
+W2h9XRoFgaMa6vpdQ+a3AP7chWpCI6YHJigASGdNE7PQL/+O9jjGD6TnX8JA9xJl
+Vom5sa8111UUpCP/juQDxwG+unxr/BStfFP791nIYf4uezmmmuZeo/e1qJEpyYI/
+hIMXMNLdpOQpphHDtB/xzW+lbktS5t893BYJiR8bQcjDmNtkqHOrICluBzCj9Ayx
+dPGWY4fY+evEd1pSPfzAEOJQ9tNOYVDJv76QoFmKN5Uvz4BMM5smXK1iGvVi2Ol6
+x/439r1xf13RJ8j7wHxXm/E5e+GuvJfzmbF6asJhw5Q9XQiriaRLhBkAahGB9VQZ
+tFsenbNZluTVJinG6T8CAwEAAaOCASYwggEiMB0GA1UdDgQWBBRC7eIkNxuAwUys
+Q6H9GzDPud0CtDAfBgNVHSMEGDAWgBQ9UQFI3DP3wjTv2P4kGNK/EthaiDAMBgNV
 HRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
 BQUHAwgwEQYJYIZIAYb4QgEBBAQDAgeAMCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNz
 by5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28uZW50cm91
 dmVydC5vcmcwQwYJYIZIAYb4QgENBDYWNEVudHJvdXZlcnQgTGliZXJ0eSBBbGxp
 YW5jZSBVU0VSICMxIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEB
-ADhL8n7/64cvMkT65OnGpeC5jTZQ8Fimz3ZqzK3QDKPYUryUfDfmm6ih3kRRMRx2
-iieghRNlnmw2OU24PEnD50UX56N0KcmlIFiFd741qgZLjaurp3XDvBSXmGZOLMY/
-3r5hrhvJir5XjLr7GhjtQa9lRUw7xPMyFBh6Of/Mlw0TzgHKJwqlPMAgxUOxmTGz
-eUqzGOhIo/H+TmpGMKtw6XztWvHjBX73YaSXFX1eBuuZ8guDfSl2Fup5tcCbWeYf
-KCVSyBGkPpRS21goRnKkHg9uYc/sbbTfHcFs0St9IxVmxamI0HuIJpDNp+kIlB7o
-WH4KE0wUzllJSFbVW+jfiOI=
+AGRp+FEnB0jmo23bgShTxXLdCJt2wRDPtiwi0pjGAiH9esplkPC3g5gGP6eBQnzQ
+trPc8s3qw6+QGd6hDUZll61abHr44uR/DuiBGKU63v43rj7w4ZhluCmnKa6LsJ+z
+pLjyoa/l7HrHHKl2Ex6psodMeI/dDGHXUwK0zw673mvEiiUb29Nb/7mSS2j2VBAY
+zJaEgvlbuQXJAwyWfn5xopkGQwKq5tqGNiBo4PZYZpND9ifxEUFXLrGw1MFPmlR+
+9RN/cuORb4Mz/kUk3jjcY3MqDf5Lo8lq+qgVH0of+b/ROpxLHdTNf18IRNXeBcrC
+yGsDOs6772rS0lPB7hX3Hu4=
 -----END CERTIFICATE-----
diff --git a/tests/data/user1-la/jks.keystore b/tests/data/user1-la/jks.keystore
index 08209660..f1385c4e 100644
--- a/tests/data/user1-la/jks.keystore
+++ b/tests/data/user1-la/jks.keystore
diff --git a/tests/data/user1-la/private-key-raw.pem b/tests/data/user1-la/private-key-raw.pem
index 9c4e55a4..20b59473 100644
--- a/tests/data/user1-la/private-key-raw.pem
+++ b/tests/data/user1-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCx2jcM6ADPipkBj52MSWgSBvhX
-WiNzADWa9zlvB6/nfvSTgOBCpt34UAT6tLUrFvvgE4BFFZGSurvBFlaKPCVEvdEf1JxblnWzicAQ
-2BV2atKnOycjWUsAfwb4MLDTCWLlTdF8lbFq0kJ3PYzvW9vSUSW93O1fWI0hE+Ju5DO8p5wQAir9
-flsIClGQRbvwRpEJdaVWnyiLuLu1m3K1WfzUlRTE0zW0N9rLX9CQX4UBXo0Jquu14/F5egcbBFeZ
-15wgYTzv5M4OgObbw/3VPqap9MQU23QXfU19gJ4DFnc6Y/MDDQSQb4H7SV1jksCxobOAY/+EXKb8
-5w6OyCdJy6ydAgMBAAECggEBAKy/b8kxb9gmnwdNH5IrmtInwv/VpakGAwtKJpcZuFn6jkTXYPxc
-aC3QS4XYEECSSoQTbPutP4BtsACUWepbETf7xyxLrrOnKRwCKHQz7mTezU1xv0ouaRNKTtKzOI1D
-CLQBKgEAxRskrzpypnm3l4RpHWeVN1rs/+epEL71GOubotIkkA0+yGzLl7ui559JQxxVsFwEDMS6
-AQwoS6+IEmHWxvarAsSyjrAjp5/v8nfk5P3i0wJnu1X6glbWjbckDfYtxW5bremCoPYdkgnsVLuS
-+hP76zRiPf6vVcAv0i+TF8/zAZfw6eKUxZfDLQagjmjuHOZ7LQBknU2W646VbQECgYEA3LWBzcE7
-ZQ4gQxOi33yRl9p+asnxCfO7aEBygdyyX9MiR9BDTfFMArLABZe9p08esnqod7Pp9SQ7HlrN+dwJ
-IlYIh0jCcgX31NMfjGTE+RHIVjpCzxbwl9x74cdOR2MgRVIACmaqGWWzMCVngKk4MZ2zsD1vNFYV
-cgZLi4fFT6kCgYEAzkpq3SXPPoME5xw8R95bTDtAqR78Ir2rQwZRm6cwmRKoAutqxaCKBlmapWk1
-A+sZ/6zNbbaFHEo4FlWer0bjZllXFh903atcRpnw8yFmmt7DGrkk/HJrf1l6BRts/88itCVoqfG3
-Pr7WdSGQaiwRyKC3TMgBSNg627589S0wXdUCgYBOiArqwkG3AGK8W0VNzg4kASuQJdCtYNsjCiN0
-T6nsbLy63sDEAAKyxxWKJ+bknENo8Dn3db3eawjaESdPK1rYq9IXCO2fEr6PLJwCIWzwzsIA5HQX
-Katr7ZjqyjbxMbUu1TGMgeEubkBm9jgw0IVdKibgo8tozOSOkOzadfHgGQKBgEyXytezayBNqytY
-C3WvtHw4X8irTXhkrcrj9LbzO5MKH0F+QRWBht3WtRmHV3zN9Mg+U8PRidi4Id0BCzsO+e2NbE01
-fsGzFz7Ld2/+TcdgwFYSug3VOd59zVVKGo1cTglO/m5i5eOxHZU90g3psOyp54Tlmbx/NFNUhbbO
-gW/FAoGBALKhCJUJO/nOHo6ME1KZ2/R5fhsVrk3AuwUKLTWoUWuoZHS7XiTuCm2XCtpMXZCMHrTb
-5QyJ2IrXpHq1+C15LuZ2yvO6r37UNki9Uo2F4jdLmhxZuVOdt+DOkQEx9reLaJxGA9now9rcLWEu
-sG4w1x4pWh24Y/NAWLCZE0jxKrIT
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDBtltofV0aBYGjGur6XUPmtwD+
+3IVqQiOmByYoAEhnTROz0C//jvY4xg+k51/CQPcSZVaJubGvNddVFKQj/47kA8cBvrp8a/wUrXxT
++/dZyGH+Lns5pprmXqP3taiRKcmCP4SDFzDS3aTkKaYRw7Qf8c1vpW5LUubfPdwWCYkfG0HIw5jb
+ZKhzqyApbgcwo/QMsXTxlmOH2PnrxHdaUj38wBDiUPbTTmFQyb++kKBZijeVL8+ATDObJlytYhr1
+Ytjpesf+N/a9cX9d0SfI+8B8V5vxOXvhrryX85mxemrCYcOUPV0Iq4mkS4QZAGoRgfVUGbRbHp2z
+WZbk1SYpxuk/AgMBAAECggEBAJvwx0kokoheImxBQSRnbEAQ1nZU4/oUYEpJuwe8ooy2WcQJNnqO
+hdxSZUmlEUt5rOxcM/wPRuD7gOt3AGQSWN9pwwy+k7WR4I5s0odxcUAPtgM/O+e/HTeSvICu9pJV
+h2iY5X36b01xLEqY1J28ZAbLS0wzasSsajsQu1nqNz6X9IBuJEoNpBTsg50VAgWYzwz8YSL0A68m
+xXlgNEsIcnP6IE6+NXbAnHaEP6ZOfOIjO1ioCkivZY84TJzPEV3lP7got3Tvp8re5ok65Ge0h+7A
+QsSpcYYIqbxFr+sBUEwoE3tI5l17o87ELABEKDUmqpifMQu4ov3HD/2MSoj+o2ECgYEA9Q4y9TcB
+3DizDcVMlYtYtL0E8jgGc29pyTCB+UqngNWz92e1SFY3k8ARirftER7tG9bS4QvpIuyUvqu0o3jY
+sBi0+yc4p5dwGYpjZxOUSbWDfTFzousW7WgQ1SMqgHnYZ5WScDqePtnxbNFrHG05ROYozKdWHUTf
+qumPXm3px5kCgYEAyl0ihEGXsAuRhRBO57DKOuMK1vIEwAg8KPoKeoNS53t5qgG0YQflFvTW4gJj
+OKj8DUZCwNvFx7McffxDkX2JSbKoKfVAScn2e5y+3cftBYu8XYiynKaxgiqFnI884z2FGcrhsLYr
+LSQBAgO3scSz/EZqNKL56h0VMDFdeolYXpcCgYEA0tSkgtQQhadCZVaZzQ9WAimdV8dbxXTVToKt
+UA0qj21MqE5RaSrEJhnY/b+/9jrlRE5On8/fhGyGjIStpPcTdm3LR0k3NPjVOSQW4Ve2/LNtrQge
+tMwNrbMayES5DE/IH1ZP5r6H5wsa6sRBovNVkjFyaKCPNh9LT4AiGNv3hgECgYBKCe1ZCk6fYHwr
+fR4BcxNqnCsZHY9TWy/3phQzYtzwSKLo6pq+bY8J6Sa9pjX7QwiFKtG9kis4t3WTOrrV/mI+jpks
+UMjmtnfyHhVPO5ii0M9oQV1oJy0G/NvJvjZ+xcFvAGW2q8/8QhIEVKve5KMdh/3PqFlbqKxZ55XW
+AW5NnQKBgA49QGva3upc8FJ3M0Sw/CLDMZwaPkYGmS4/hDitVHwM+v5fSVx8SRsNLQsUKI0yKSoe
+ATVfcgua6DF3vdeXk3CHyOTF2aOWScAoHk4fLYnSwmuKrkNVjUa5r79FdXSAKc8kXnp+GRh+djMZ
+nsC34ap5xanZgpgCMjFfKQtjci4R
 -----END PRIVATE KEY-----
diff --git a/tests/data/user1-la/public-key.pem b/tests/data/user1-la/public-key.pem
index 7ba56899..622c320e 100644
--- a/tests/data/user1-la/public-key.pem
+++ b/tests/data/user1-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsdo3DOgAz4qZAY+djElo
-Egb4V1ojcwA1mvc5bwev5370k4DgQqbd+FAE+rS1Kxb74BOARRWRkrq7wRZWijwl
-RL3RH9ScW5Z1s4nAENgVdmrSpzsnI1lLAH8G+DCw0wli5U3RfJWxatJCdz2M71vb
-0lElvdztX1iNIRPibuQzvKecEAIq/X5bCApRkEW78EaRCXWlVp8oi7i7tZtytVn8
-1JUUxNM1tDfay1/QkF+FAV6NCarrtePxeXoHGwRXmdecIGE87+TODoDm28P91T6m
-qfTEFNt0F31NfYCeAxZ3OmPzAw0EkG+B+0ldY5LAsaGzgGP/hFym/OcOjsgnScus
-nQIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwbZbaH1dGgWBoxrq+l1D
+5rcA/tyFakIjpgcmKABIZ00Ts9Av/472OMYPpOdfwkD3EmVWibmxrzXXVRSkI/+O
+5APHAb66fGv8FK18U/v3Wchh/i57Oaaa5l6j97WokSnJgj+Egxcw0t2k5CmmEcO0
+H/HNb6VuS1Lm3z3cFgmJHxtByMOY22Soc6sgKW4HMKP0DLF08ZZjh9j568R3WlI9
+/MAQ4lD2005hUMm/vpCgWYo3lS/PgEwzmyZcrWIa9WLY6XrH/jf2vXF/XdEnyPvA
+fFeb8Tl74a68l/OZsXpqwmHDlD1dCKuJpEuEGQBqEYH1VBm0Wx6ds1mW5NUmKcbp
+PwIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/user2-la/all.p12 b/tests/data/user2-la/all.p12
index 198085fd..be47a66d 100644
--- a/tests/data/user2-la/all.p12
+++ b/tests/data/user2-la/all.p12
diff --git a/tests/data/user2-la/certificate.pem b/tests/data/user2-la/certificate.pem
index ecc8f319..780f9094 100644
--- a/tests/data/user2-la/certificate.pem
+++ b/tests/data/user2-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIELTCCAxWgAwIBAgIBBDANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjdaFw0yNDA4
-MTMxMDUwMjdaMDIxDjAMBgNVBAMTBXVzZXIyMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
-MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOuB
-PczRba1t9fqIoEpTOwbb3idCR4E3hB+91a0U9KNd9d6OJkMCQLunKQUzjoAt+ZN2
-enCnf2A4oqcYGRXZzbAcV0iQuOrfvZSLa9ikLVw7gm5BFg7kQ/lNcMzQNDfOmSSD
-T8uVbpUO3FRFh81bD0kHj/ssjFi4q5VWTCEhH3bmhJG35cM84JL9wOSTffxvyl2j
-WTg388/IugrXhR6ThsAykhyOiFZ8IzqO1YwgeInpFVPV+wKswCmXm+J0/m0/Ti6q
-hG9GZV7T0boL0ubNbLi4szoj7MNVBAxq9d5zZwPYmBdS0GWnL/c7+/ZLORDiyZtV
-2eKJaE66cP3+gV9+xiECAwEAAaOCASYwggEiMB0GA1UdDgQWBBQj1DKidY1FCUjw
-ab5Th3vXlBxaCTAfBgNVHSMEGDAWgBQCV7Y16+xpaKvYKF30EQJPqvhuUjAMBgNV
+QSAjMjETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjRaFw0yNDA4
+MTQxMDQ0MjRaMDIxDjAMBgNVBAMTBXVzZXIyMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
+MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANb1
+kxz9xbJM43L5GAcalrMqlkchovISZPZf+RRZ4DMNKBhnUbuPYPSm4ZmtT5yzH4Qt
+HS0+FoaVZ8v+mlIKoLWFyH0x122RM0Sa/KyeOlwPfwJdvZlsQho7hSzr8hfe6yUH
+Hc9Yj8fc1KEbvNK9l5et1xU2xRLjksGtq1ST3ugrhtrFJ+uEBg75fW/ti8ksdBFp
+eFk98TT5+gYy27RZ7U8IwG0gJSSD2LmJtgF8fPMBAyJ3AKZ6+2msQJ3WuTHSDnti
+CU9lZtG+risEnWfo39V52ZCFgwmMKA7XwXS0LTMSPnTwwC7HosCQSGYL3w/yHrCc
+e4ivr9fM4ez0aMybVtMCAwEAAaOCASYwggEiMB0GA1UdDgQWBBR3eKflxEFTMhrX
+wht5dINZZ/ygUTAfBgNVHSMEGDAWgBTyIFXlq5Fj+PERTuwR2/sLr54UcjAMBgNV
 HRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
 BQUHAwgwEQYJYIZIAYb4QgEBBAQDAgeAMCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNz
 by5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28uZW50cm91
 dmVydC5vcmcwQwYJYIZIAYb4QgENBDYWNEVudHJvdXZlcnQgTGliZXJ0eSBBbGxp
 YW5jZSBVU0VSICMyIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEB
-AC0IW8alWOShBIlghj/29xLr0RBy9/5OPXPvPvQYWhk8A23HSyPBIwQkCvgYUb6b
-SM12mD92tYqCtI2pVOvu0GwbQ0ot6/ZUBGWzN1y+1kqcuOvtqgxQmPpb9e0TxGdA
-ai3HztMDqgkAz27WDAG/nMs2DU5K+3gk8u4MM2sWgvILGhkp5RjhmhLRm29bu9lN
-1sOIJTu87Ea1Bh4pHm/omoKuq7+YWN3jWN4M6PpnOJsdjywXR24SrAVNIv2pcqQ9
-TsJQFhHa+0GHNwH02aAtPclTIia8dTQgt4wSkXoCvg6UA0Duir2Z3C+9iHrEcZrv
-iMOeBTLa+19Eyl+r9TmBw2M=
+AIHJY8x9ADKh3JtuaJ2Egsd/7e4ojdtLCXtIf0SN2e5ypUUCe037vyeOr5BK5TMC
+rzlSnDjHbQH5qkYy4ISFNRlwHjQHuzLpg0nT4a0/rB0F79DiQ4VWCYMr+ACK4s00
+PzjTgTw5hehAMUoCKspZ4W/rtjKKgdKUfySNyLyo4Nnggep34qBl8Ro5ATw1gmmO
+AIsSSmS4rgBikB28EnPcS1HkAddF0g4bYbiwykcNZy/eVsKGRy1wU0WSaSe9eUkX
+5LFboQorv5sBC+lD2YqYok4VRidwUFS4RUNQ3j/YLBJ9wysgl+htv23Urr+HdIEW
+V9aPNDvTf+JkRTj0vOXvfqI=
 -----END CERTIFICATE-----
diff --git a/tests/data/user2-la/jks.keystore b/tests/data/user2-la/jks.keystore
index 37af78a4..3d05b400 100644
--- a/tests/data/user2-la/jks.keystore
+++ b/tests/data/user2-la/jks.keystore
diff --git a/tests/data/user2-la/private-key-raw.pem b/tests/data/user2-la/private-key-raw.pem
index cb3a9cbc..7cdfaf0a 100644
--- a/tests/data/user2-la/private-key-raw.pem
+++ b/tests/data/user2-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDrgT3M0W2tbfX6iKBKUzsG294n
-QkeBN4QfvdWtFPSjXfXejiZDAkC7pykFM46ALfmTdnpwp39gOKKnGBkV2c2wHFdIkLjq372Ui2vY
-pC1cO4JuQRYO5EP5TXDM0DQ3zpkkg0/LlW6VDtxURYfNWw9JB4/7LIxYuKuVVkwhIR925oSRt+XD
-POCS/cDkk338b8pdo1k4N/PPyLoK14Uek4bAMpIcjohWfCM6jtWMIHiJ6RVT1fsCrMApl5vidP5t
-P04uqoRvRmVe09G6C9LmzWy4uLM6I+zDVQQMavXec2cD2JgXUtBlpy/3O/v2SzkQ4smbVdniiWhO
-unD9/oFffsYhAgMBAAECggEABSVVzFvnIZr9fPPvTLB04bl8KS9xkIk+AdOMD7QdhFRRQwOoIl6y
-O2dzpgFyY6qdgXNdSYjfZ6LVKwGDys5viCGWZqeC4t7wrYY+XQV5WEKUnwQdD0Y9lfzzMgZ6nZ2O
-CxYzcCdbuzYP6md6iCotM1NO+hYHGwkt9p1kHHU00sw77lxjy3Q8bi3zaNIshjEwPRr+T2oVtPQk
-UL9PNTMz4dBaszUwl+UMyssUZFtrUGvPRQJZYU/w3xi0iMa4QNXf8ICD/44AOqpf4QNBkFpUPWd+
-x7RON9EstTf+aTMI4jVpniGdJo7m3d6XLwc5vb+5/aK3+qoMBQTF5gOai56CAQKBgQD1mgCWAsX0
-+9oQ8TCw3xCe7O4XUG7yA5a9ZZSplgHisEat9F0FYR7YS2c4ZuVe1MBhSk9jfs8pLgGSbxIYp+63
-RC9P6dF9hGeWYOPtxOxfnb9jwGwz/ArI2pvNvBGK/SGCIVwUCCHiwVv32fINwD+z4iEB0cy7vypu
-JzkUU3eDSQKBgQD1ec3PEIxkuQmpBPrfpDdnz/OS/pjlXb3qnAg6jG2xd5D71UNsmNMoo2D3WMAq
-LuFADBjBw/ypvzy3qpTE9NhRIL8MdswvPhGtJ/g9KFWA/yIJilP7QmSYcVODc6S0eW7ks5kwLZnI
-yDTsOTxtpMEqN6ZA73sfJCiEfGbvVMdUGQKBgHSjUqvrXT/fa8yn/svA5A/Vzazc0hO1iJ0h5Nw1
-FWgm9yod5x9q5E8sYDT1CPFkcIjD1bgWvSN9adm1Tg7PkhsPErkM/iRyAQ/1q8l7wBYYwJALDlgR
-1r1UtLGcI2iylntKhIQu6Ijb82Vd6AqHxrkTJ0HJ9UUkoG33yq/Qg+2hAoGAMmHUjvo7hnS/+dPO
-1dXzlTgGKxZcNT9fOmbZ/YJTBUigFj/4PbLELCQUQ9AQaNgEXUveTO63zfM1OBEnxaDnQQdyjtFX
-KR8ZK6v3dD3yBq7WwpSElh5TXUJtPJ6goHYH/6Ko/01ssdv9mLpKn8pf5xVS5yL/5y1Zr4+E5PxG
-iQkCgYEAk0v0zLElXErUdYmsB7+8YjdSAuWgAN8ZbTDiC59JRUjNJQePEVnhkQUeSDJrwrdTBdT0
-OW5VSGbGWGkqo2eKE0Lu+CrugXu+qaoKFvEaj9/3vssaa0LSFPHkwQcpfyp/Fy0jBDYjJxbwrPhd
-7fZjLPqwu8ywOMfk14gCCeB1cWw=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDW9ZMc/cWyTONy+RgHGpazKpZH
+IaLyEmT2X/kUWeAzDSgYZ1G7j2D0puGZrU+csx+ELR0tPhaGlWfL/ppSCqC1hch9MddtkTNEmvys
+njpcD38CXb2ZbEIaO4Us6/IX3uslBx3PWI/H3NShG7zSvZeXrdcVNsUS45LBratUk97oK4baxSfr
+hAYO+X1v7YvJLHQRaXhZPfE0+foGMtu0We1PCMBtICUkg9i5ibYBfHzzAQMidwCmevtprECd1rkx
+0g57YglPZWbRvq4rBJ1n6N/VedmQhYMJjCgO18F0tC0zEj508MAux6LAkEhmC98P8h6wnHuIr6/X
+zOHs9GjMm1bTAgMBAAECggEACIFE5dPAm7JhGW5znexWZBZeRcg160ABEKJxd3Wq4jo2COklmbct
+jeCAcpUh3kBUEeW7DswzFfYZWj/jmTVkcGovqYxsSqCBF8jOEIJeKsBONSjCVKys3N7YARQAyyL9
+yMREUKzfW3gITauMSAZKVi0Boow9NecdKl6Vtc339tWXeDwJQaOeglEre3ulEHpb/TS846EFHi1/
+uSgexO4/GvLHVTc0M88PuWaDBIHVu06d+WEoeCgHIUs4JuiMkCMN+kmjZFuYnLNypsEwua/Y2PH3
++TUXVgSAdV79aBA2nnoXnRBZu2D3f3yWMyQZRNSKikiH4QZijmzLvqyD5MHjsQKBgQDy/kUSVTiG
+Nw4QOmEhnfHt0NzyBybW8UjmWMGNbvLiFlGKA+/wljUr9ILFKQw+n7M19N2CNhGvCsRJ0ce8eTKX
+5bU4hQQPTBuja2dU9Mhoxcvf5gMZiLPWKgH8PS9C4c+SOnKIJ4j+7jMqpQ3jhz2+EDOpPmDEW+RQ
+zD8aC+eRqwKBgQDidyf4l+MH/qcHQhMGV+kHO6O3WhibxnHNaupzlcPYD8Fai7CbuYYbZbtfhFZa
+cty7HIG3LSEAauqV7tcPm+5Vxf2bLpb0LEhgIK3SYkliWVktLzFNpsW2T+jyCKlHQBxCR1TGBmLJ
+SxlSTb9ymy90MSMBVA5kvW27u0oh51N3eQKBgE7hwlR4O9g+KR+VhBCgsHfuVLtxHOer/mlgqLyc
+JtbEPgYazxp/+JTjVExizenKeCfs7Leni8gSK7R3GGsTwRvUYycM70tz/ojnhezrZd+1TkDJ73mr
+ig3dJzXWOvBwU6z5slKG2w8/Dncqi76wGZgItGydplY4Kn8cPuPat3rvAoGAWqDa0yZdic6EI2hy
+2qAFtopMe0zH+lcRJea6iqUNqgKsG0M52ygEniQ5NwFr2WiMIylGU/rwcQ1YccYSNMHvQE4qrpaX
+fIHYOPf69+2zdnNRN77iGTQ7fTk/fNSwgb4LUQ7gwxq9H9c4+/H3QrMN647admagF/qi1nUeNrEv
+eukCgYEAv5y4D8rLYbZ+wBrDHOv5bpSLrDtu8U6LayulgECFs7UCtdaCDMI2mD8UPqmYsLzs0wAP
+61ixvv9xKPuicroyaaVl+d7uXMZa7qTbF8dXaA2xV2RF9sTn5P1FB8WXbRoG/uaqUI33vPTOgeqD
+FOS6P9g0WlSXrQtGCRgHQiJM9XU=
 -----END PRIVATE KEY-----
diff --git a/tests/data/user2-la/public-key.pem b/tests/data/user2-la/public-key.pem
index 0328dfae..c02017ff 100644
--- a/tests/data/user2-la/public-key.pem
+++ b/tests/data/user2-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA64E9zNFtrW31+oigSlM7
-BtveJ0JHgTeEH73VrRT0o1313o4mQwJAu6cpBTOOgC35k3Z6cKd/YDiipxgZFdnN
-sBxXSJC46t+9lItr2KQtXDuCbkEWDuRD+U1wzNA0N86ZJINPy5VulQ7cVEWHzVsP
-SQeP+yyMWLirlVZMISEfduaEkbflwzzgkv3A5JN9/G/KXaNZODfzz8i6CteFHpOG
-wDKSHI6IVnwjOo7VjCB4iekVU9X7AqzAKZeb4nT+bT9OLqqEb0ZlXtPRugvS5s1s
-uLizOiPsw1UEDGr13nNnA9iYF1LQZacv9zv79ks5EOLJm1XZ4oloTrpw/f6BX37G
-IQIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vWTHP3FskzjcvkYBxqW
+syqWRyGi8hJk9l/5FFngMw0oGGdRu49g9Kbhma1PnLMfhC0dLT4WhpVny/6aUgqg
+tYXIfTHXbZEzRJr8rJ46XA9/Al29mWxCGjuFLOvyF97rJQcdz1iPx9zUoRu80r2X
+l63XFTbFEuOSwa2rVJPe6CuG2sUn64QGDvl9b+2LySx0EWl4WT3xNPn6BjLbtFnt
+TwjAbSAlJIPYuYm2AXx88wEDIncApnr7aaxAnda5MdIOe2IJT2Vm0b6uKwSdZ+jf
+1XnZkIWDCYwoDtfBdLQtMxI+dPDALseiwJBIZgvfD/IesJx7iK+v18zh7PRozJtW
+0wIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/user3-la/all.p12 b/tests/data/user3-la/all.p12
index c3e3da85..e1deb94c 100644
--- a/tests/data/user3-la/all.p12
+++ b/tests/data/user3-la/all.p12
diff --git a/tests/data/user3-la/certificate.pem b/tests/data/user3-la/certificate.pem
index 2adb5161..6435ddb9 100644
--- a/tests/data/user3-la/certificate.pem
+++ b/tests/data/user3-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIELTCCAxWgAwIBAgIBBDANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjdaFw0yNDA4
-MTMxMDUwMjdaMDIxDjAMBgNVBAMTBXVzZXIzMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
-MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0q
-HfsB3NlP2PWK96FS9je8lkJLJctSDHiBrL4pGqlIiF3DD2LADcP2MmAEP+kGX5Kf
-ygkFoCx3+JcF0mOl44oviapIGEHRIvrCJ+8ueQGaFB6QsJT4+1mmkaDc5NY24ZuA
-+H0IPVFNHPmO401Agla4zrjMxYfJDFxfZmD8iQEwxgddKofToO04zEmuXT0aioe8
-IbPBGQyysTvCml7lziXJdchJi2B01Msp0FSgOnMNnTtGEE3MCzko9OC90ePAMT3L
-JHcU5IGM527koL05dPmnk+c3rKNsmvVzwisxrrF9Fhih/m/56V5u3qntKeaxNmE/
-MoN/1Tx9UZPZp44ERL8CAwEAAaOCASYwggEiMB0GA1UdDgQWBBQHoULowb6EbFV9
-cHbDn4I6XWsT+zAfBgNVHSMEGDAWgBR24uq3ElibNOYHuXV07iR/+pCk8zAMBgNV
+QSAjMzETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjRaFw0yNDA4
+MTQxMDQ0MjRaMDIxDjAMBgNVBAMTBXVzZXIzMRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
+MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkY
+BuV/1vDgr+liV0sUFn9qOjtqDB04cwz72qjlNYXsxDOeo2EgHWVts90Dwa4YfBry
+90/DsZlgRq7FnKGuIvXTijnpQAnTj1kAZgvZTkC9wtoo3996wl4cN6W7keatSVWt
+jhg3E6jDAHkyqK3iKV6gly7zNfwhY3Pjt1drylZhhWJUgBqhA9kLjQ9f6xTtkFTk
+gSp2RMp9bIAhaE8tRVT0nAKrvuLgtn1wXPxUQPHxRhpkej+LRLZBMjlXSDwloqXM
+usXuZV1BAJPADud94VowsS4dkYoNjP7X4K2b0nRLioAxamJVbcAdHc8J6gDyBy3P
+yNVYhDNGYDypDFRQLqUCAwEAAaOCASYwggEiMB0GA1UdDgQWBBQHko8YxDHT9/84
+Ufa/zuAikq5R7zAfBgNVHSMEGDAWgBSTX6Xt+buV4houkKutn7vqKkGRCzAMBgNV
 HRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
 BQUHAwgwEQYJYIZIAYb4QgEBBAQDAgeAMCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNz
 by5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28uZW50cm91
 dmVydC5vcmcwQwYJYIZIAYb4QgENBDYWNEVudHJvdXZlcnQgTGliZXJ0eSBBbGxp
 YW5jZSBVU0VSICMzIHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEB
-ADol2uFbEHht9CGbylVLgZk7mHj/77mFtWwtzjoUQRPYZmfFUfUtxZQooHMs0fCe
-xq39S5jZgMl+m0Vbwcyk6gQyMd3sSLpMOIFLW7LAYWi6IK4MC9CdA0dVYd8t5SX+
-a2otlpJYKElJMNFoQ855oJaWkaMiMRPx9DA99NUkGzBafYHWQZZAcJNvKpS0040L
-ZNY6qNjvUj70I7Bgu7l+GVEXa6I9WSEOku3Io4EiCKl4uaPX/OsQl9+AdBz7F1FP
-59Jc9i6gKdnERzOEZ+FIctc97D6Xtz84RO7CbmXZmaRBPOIUDTgwaWZr4vKSz+0t
-LRURdNl9oYwmf8f/o9zgpWM=
+ABG+/tj6lJ8p3gnKfEyGY8gLYCXcGU1pxEmffGq74jMfzuvkrkCaw3+TA0s1OhWF
+VDYpPrmjzqvUFg5N/TRAwLgKTE9/sHNKv988hZm2UZiMDS9p1HDutgz/L4EI8joI
+L8VEYF7Gg5TlT0wjmFc7WiO3ZtEt1lizzgWAG8Sb0qM/dy9AK5BTwWMYfG4TQMd/
+3Edo8dVmSpwgw0fiBPosY2L8vRz5ipXtZBwm1Ofg5jjM00cshZBmbXofcz1+Ve5g
+e0ZftoAccB94vL/5MAv64ICmH7cv5HlR8Itmr4y/9kghYwxSBdLj4ix5BW0rFP0l
+R5nay72in9xLG9XBhljhboE=
 -----END CERTIFICATE-----
diff --git a/tests/data/user3-la/jks.keystore b/tests/data/user3-la/jks.keystore
index d42416d8..7353150c 100644
--- a/tests/data/user3-la/jks.keystore
+++ b/tests/data/user3-la/jks.keystore
diff --git a/tests/data/user3-la/private-key-raw.pem b/tests/data/user3-la/private-key-raw.pem
index 702c4eaa..51f620ab 100644
--- a/tests/data/user3-la/private-key-raw.pem
+++ b/tests/data/user3-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9Kh37AdzZT9j1ivehUvY3vJZC
-SyXLUgx4gay+KRqpSIhdww9iwA3D9jJgBD/pBl+Sn8oJBaAsd/iXBdJjpeOKL4mqSBhB0SL6wifv
-LnkBmhQekLCU+PtZppGg3OTWNuGbgPh9CD1RTRz5juNNQIJWuM64zMWHyQxcX2Zg/IkBMMYHXSqH
-06DtOMxJrl09GoqHvCGzwRkMsrE7wppe5c4lyXXISYtgdNTLKdBUoDpzDZ07RhBNzAs5KPTgvdHj
-wDE9yyR3FOSBjOdu5KC9OXT5p5PnN6yjbJr1c8IrMa6xfRYYof5v+elebt6p7SnmsTZhPzKDf9U8
-fVGT2aeOBES/AgMBAAECggEBAIyMnJYBvkwgzb0zMebFs3eaQbKkD0LQhb+L6gOomsyovdmcsvPW
-auPtK2S4A5xqRdy1qPGnImmoAiaEBtxPR49G3uyMgKl2cJ0MYYuPZg1QpB5Jt0oY7PihkJaLSeP4
-Bwz5eKe91YFw4FR0XGLryWwSCFa6nxHSycJgh7sMJ+efQ2x3qqpTJa6NcK2N3PZdVX5DotrwVD3+
-PFuNIu1dkRAlN0B/5I/k7fK1S5MgvKCpnjo+VxqUc3h/AlyPob7dJhDWrXF7BqArQ/EDWQdxQeZw
-S4fBKomKqEvHnPgmaIPuiBQCPEmgrdluo+f9Sr5OUuUwnkiOV0fKiZMMy3Lp7GECgYEA78RX8MYn
-abkpjzKiOjCw5fO+0sGIZ98rOm/x5uUrQDbjvHxvd5VfonqxIqtAtPYGDEBSL4z3W9CdwVcxmYvV
-pgLCz2ZlimdgmXs0GWay8OkyeIZVDifkCtCVogdHoPXUK4CU4VQ92S8Z6iCmeF5cEIK8HSQ8WXfl
-gNp3avg3YlkCgYEAyfi6jiBGIQIuw/zXkk1/KsdQ54gZ+P280vKV286ZrvNgCIaPQpL1U9ZA0AVw
-DT8AnIle2MnwVqOHQ6tEqpUYn+m4Cn6XkTlm8a840bmVF7ZmBMLeFfI6GokSnFcqeS4uCB3A9xEs
-Pyc49UztIuywc2VtkBJjRSTILO3ho9R4jNcCgYASkv5RC7i/6vU6P6zrnxwFJGXTA+UiTtqVc1il
-D3nTRq1Ly8QC2pKHDsQsMGIZ4rlDN7RmNKBw/29JLA0OnROXAb2/vWn+V9XW7gFyOk+AdEBRr+5k
-41g6MkB1ReUZphGisRpXfmQwMALs7UyYJI8zRD14cHcwYyZnXgVERyhbOQKBgE5/3gJfiOJLduG1
-5BN5C3QVA9z5iR69gCZ9IsHMCu90qF6n7gZyF+f93jL76hE764Dr43FfC4qhBHHIn2eti2Sb8mwh
-x8cqCFjnQa5B8zDEM+Kl2qus+ehWXmVle5yd1kZRSi68/fWNyRWOUJzCYdJ4GZ1liC/Xm/Xaf1it
-vC0BAoGBAMg3mZhxsOy3jZ+94OCNEHTby1ggTnJFmHWq/te2ljkAAQ/p5izNkQ3WyCyjYdURiMah
-bZv7FryIdrWrZJLnnk9F/gjAhOkoM5NVhkDwgc8jafsUt2Y8LVmkkOTh9PgC6gevCQvMVUsXGUmh
-FAqE+j7HKoJqM6xg8m8aTbZ7+vSW
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCpGAblf9bw4K/pYldLFBZ/ajo7
+agwdOHMM+9qo5TWF7MQznqNhIB1lbbPdA8GuGHwa8vdPw7GZYEauxZyhriL104o56UAJ049ZAGYL
+2U5AvcLaKN/fesJeHDelu5HmrUlVrY4YNxOowwB5Mqit4ileoJcu8zX8IWNz47dXa8pWYYViVIAa
+oQPZC40PX+sU7ZBU5IEqdkTKfWyAIWhPLUVU9JwCq77i4LZ9cFz8VEDx8UYaZHo/i0S2QTI5V0g8
+JaKlzLrF7mVdQQCTwA7nfeFaMLEuHZGKDYz+1+Ctm9J0S4qAMWpiVW3AHR3PCeoA8gctz8jVWIQz
+RmA8qQxUUC6lAgMBAAECggEBAKPIB/YG6zQJDZoqjI7F+DyVsa2WvAEZiiaLU3HAASWk/S1afLk4
+mACET3DFkLWGNb8MkwsJa1456HykH2BjAK3Gpd4N1N8vsWrtfeoAI1GF+9O/P4iAqP7qqeO3WExs
+j9mS70z5G+ucZTr/HG6/3n4vYgAxxppd5Kx9Zjogx6z92ViFnJCQ/WyZkL1XKmiD4HJx7t8n56Mx
+INqWMH8YQPLgruDQXFJq9HWJd6Ym0r6kURuYhLj5J7kkHml1ahOklnQ1S1jQcSF6O0hLwcBUSPmC
+kkK1FKy2q0H7yrdLMJsyYL7RQPQDONyMkEuzFi3gWt3wtLGf20XcXzASrpM3/YkCgYEA0iy2xQIx
+5cclyBH3v/rk2IEPTPsIlXR5ZPJvCJE7OuCjNV5auc0CeBWgIhHwkbfzUE3qNxF6oGiHA8rUs7E9
+BSMstXpXhkcDmMHhjP0kO1PvTptr2JfpYHoDsym6L68wpmn6ub9Xn/uhpctUzhPPL6HhFgI3Xf83
+mIO2oGguQS8CgYEAzfZP3g9Wb6pBmeQGNdzcqrxDWEyp7uHEvsLMNmAc937F0L/S6i7Ri3Ca+6xc
+kRxtOHqcgirvnA8nTiHF2901kg/LIlTn+zA6+5U35HBMbnfW8ynJAsfpV5h5DDcYcXhlO8oQhgtS
+WIg/07SNZMXJ/o0zUdcizqJd6t0AZZ+YEGsCgYEA0PZh9XgcMi+RUd0DbR2/P775fnksbKP0OjiL
+yoHS2NQVkO8x1v+Mj+Y4YwdhHxA8WsBMuNmpCSlD67JTTiFO4Pe68OglczzRx6QkY7AfwNjP2mDO
+lfdbsm89lHlNQzG0dhBylxE1xrtBWXzS4V1yphIVn3Mup0cjeICkJ9HNA0MCgYBePvjbDz+pR0pP
+hiVFXnRneFCExkf4dL0X4YGa3C5FHnCcjjqQSK5AVV3GDmApUs2zy390nPsZ+WEuAoxMiJPr62gz
+pJCmw7Ipz2VNFgoTfqkQii1eJWZkW/QAH/ICcmo4isU24VVkB6zVTkhpNYyx+6DhMUXPMkMxpsF4
+vyfRUwJ/PGdBTVjMxH4smMuIeSsKPJ/SmzoOHiTAwnPV906q5b+QNl2PBNTXqRkTxv/+WLqohUwD
+wnde00uDL3XysXyFWYcLTvBslSqg8eZypCmxrChsL2ayYLb1MjEcmWS1b+8SZu3/0lWf97aGVtwp
+T0DVl5Fm+eKOYyVqsFNRqLUdkA==
 -----END PRIVATE KEY-----
diff --git a/tests/data/user3-la/public-key.pem b/tests/data/user3-la/public-key.pem
index 0809b1a0..74305e99 100644
--- a/tests/data/user3-la/public-key.pem
+++ b/tests/data/user3-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvSod+wHc2U/Y9Yr3oVL2
-N7yWQksly1IMeIGsvikaqUiIXcMPYsANw/YyYAQ/6QZfkp/KCQWgLHf4lwXSY6Xj
-ii+JqkgYQdEi+sIn7y55AZoUHpCwlPj7WaaRoNzk1jbhm4D4fQg9UU0c+Y7jTUCC
-VrjOuMzFh8kMXF9mYPyJATDGB10qh9Og7TjMSa5dPRqKh7whs8EZDLKxO8KaXuXO
-Jcl1yEmLYHTUyynQVKA6cw2dO0YQTcwLOSj04L3R48AxPcskdxTkgYznbuSgvTl0
-+aeT5zeso2ya9XPCKzGusX0WGKH+b/npXm7eqe0p5rE2YT8yg3/VPH1Rk9mnjgRE
-vwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqRgG5X/W8OCv6WJXSxQW
+f2o6O2oMHThzDPvaqOU1hezEM56jYSAdZW2z3QPBrhh8GvL3T8OxmWBGrsWcoa4i
+9dOKOelACdOPWQBmC9lOQL3C2ijf33rCXhw3pbuR5q1JVa2OGDcTqMMAeTKoreIp
+XqCXLvM1/CFjc+O3V2vKVmGFYlSAGqED2QuND1/rFO2QVOSBKnZEyn1sgCFoTy1F
+VPScAqu+4uC2fXBc/FRA8fFGGmR6P4tEtkEyOVdIPCWipcy6xe5lXUEAk8AO533h
+WjCxLh2Rig2M/tfgrZvSdEuKgDFqYlVtwB0dzwnqAPIHLc/I1ViEM0ZgPKkMVFAu
+pQIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/data/user4-la/all.p12 b/tests/data/user4-la/all.p12
index 0ade41fb..094a1800 100644
--- a/tests/data/user4-la/all.p12
+++ b/tests/data/user4-la/all.p12
diff --git a/tests/data/user4-la/certificate.pem b/tests/data/user4-la/certificate.pem
index bdb4ccd1..9555fc86 100644
--- a/tests/data/user4-la/certificate.pem
+++ b/tests/data/user4-la/certificate.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 MIIELTCCAxWgAwIBAgIBBDANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJGUjE0
 MDIGA1UEAwwrRW50cm91dmVydCBMaWJlcnR5IEFsbGlhbmNlIHRlc3QgUm9vdCBD
-QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTIxMDUwMjhaFw0yNDA4
-MTMxMDUwMjhaMDIxDjAMBgNVBAMTBXVzZXI0MRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
-MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8s
-MI97DCDCpSbXgIcqMlIbyWZqrm7PVA8quYY1la16C3N8IgzhfeJHbAVLMIeohKfd
-F1lj8mrfuXGOknlR3NTXAGEIm4h+1JH9uDrjw0O95qp6QlPO7cN8mdGDg9kiJIF4
-+Msgq3AREkfvxRstQ+pamQZ45kLlFoiGSZVo5g9rh+gBtT3CdR52PJWbUFIfSC2Y
-L1YuAYe4n4kZ0q1dXMjO1KBvG5bt0CWMxXfKxX66qEiPty8Da8K1MEylOkNP31FY
-CKp8o4WeJGP0rivzC4kh7BHiTA/bbKw3R+J/rpBQ3lG92nehCBAaog/wZvvAr7ub
-dCzUMKl9PHqcEXM6kh8CAwEAAaOCASYwggEiMB0GA1UdDgQWBBSLxPjhn3yMB2mv
-2yxdtx0FclABpzAfBgNVHSMEGDAWgBT8xxbESz05n3zd1JEP1RxGHQigJTAMBgNV
+QSAjNDETMBEGA1UECgwKRW50cm91dmVydDAeFw0wNDA4MTMxMDQ0MjVaFw0yNDA4
+MTQxMDQ0MjVaMDIxDjAMBgNVBAMTBXVzZXI0MRMwEQYDVQQKEwpFbnRyb3V2ZXJ0
+MQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkc
+oNDGQui+oBG/7mKLdetygtJDuPp3PSu8Yd/g9HrCHRVZAHw93p5q14/PvzjDmhmT
+GydsyWRbyNwp8mXkHmJhp5nMOb0M5UPVOKMQpg0SkHm+h94BiyKXobHYEkJt4pZ7
+ibI9aDzdpFAoxr2dO8OudkH+D5d5lsWZKb7fM3dba/S8ObrA4m4LE3ACC/x2WvpB
+gnXRLsjIcDqzegPdA08lq0aNl4q/0s4djCaJA3obTYI8+s4A31TqgNRgOGfKc7Hc
+3Z+yr38lKE/IVQUmxhE+BcSw8AcebCui8EEnSL+USS2/VaxoRIA0if5965e7RGwN
+FRu1eLsyDBPq1pX7l88CAwEAAaOCASYwggEiMB0GA1UdDgQWBBSPtyatLqm88G/4
+KGK9D3cO3HhecTAfBgNVHSMEGDAWgBRTgoU0SwA4wSUVnVzRh9irf/U+6DAMBgNV
 HRMBAf8EAjAAMAsGA1UdDwQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
 BQUHAwgwEQYJYIZIAYb4QgEBBAQDAgeAMCYGA1UdEQQfMB2GG2h0dHA6Ly9sYXNz
 by5lbnRyb3V2ZXJ0Lm9yZzAmBgNVHRIEHzAdhhtodHRwOi8vbGFzc28uZW50cm91
 dmVydC5vcmcwQwYJYIZIAYb4QgENBDYWNEVudHJvdXZlcnQgTGliZXJ0eSBBbGxp
 YW5jZSBVU0VSICM0IHRlc3QgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggEB
-AKqBLjj9gObxHxSkWgf9zUCfCty8UTEziHfmjM7+uDzzou/gF7WI1X//QzkQdw+G
-ixoMxIcoj1bWJxW6f/1pe95YypdVN8JJAWpFyt2OXLP0Pxs97qTxWJSh8YEL4kFZ
-qSTbYLNNRlAVq843UJst1RsDfsGM5TN4K+d/gEPZBKnb5y96/FI3zwC1V1qZIQeS
-+m9hAHVLv1Xxi43ZwHyal+32QIpZiLc2TbjfW37HN9wAzJRyu5nDw0MyEQV6sAwQ
-65DzfVjwwnXa+BqnQ4k46N4HDhY7noH2hCsyZ2OJw3NxszeDZOvRHeea0oKeFPo4
-lXcnPP5bfx4ztlxk9SS4/no=
+AK8jrlCR9feFrOoY6YuhQXm9gyglQu3pWE7c388HO3myb7WAc9xvnSN9R/zyEymt
+QF2jdX3jnPGB2MK7/UAbxE7OiLVo0fPJtY+xAoNHydophl9BBNcdMIrWkLYoQobp
+Npw1KlkTJ+zeRsWoe09k6LQ5SawTAXM/LZ/IGehh2TlzkX92CYX6JY0E/eGSOKCc
+tlk6RtvoU2pD0sQBdiW/HDKRsta3fAcUT0o8Cbq2R1ZFiLwXJjSoRpZ4+Yhr65RK
+uKRbC2RR7iqyLvg/gPyV766sKi2a4zICzMiwVuMHKGp8NgsV3D2+n+SsCDsqN3Rz
+N9e+vfp0SAePrdZ/uhoctUE=
 -----END CERTIFICATE-----
diff --git a/tests/data/user4-la/jks.keystore b/tests/data/user4-la/jks.keystore
index bdc1418f..38efa2e1 100644
--- a/tests/data/user4-la/jks.keystore
+++ b/tests/data/user4-la/jks.keystore
diff --git a/tests/data/user4-la/private-key-raw.pem b/tests/data/user4-la/private-key-raw.pem
index cfeaca95..8d9131ae 100644
--- a/tests/data/user4-la/private-key-raw.pem
+++ b/tests/data/user4-la/private-key-raw.pem
@@ -2,26 +2,26 @@
 1: lasso
 2: changeit
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDPLDCPewwgwqUm14CHKjJSG8lm
-aq5uz1QPKrmGNZWtegtzfCIM4X3iR2wFSzCHqISn3RdZY/Jq37lxjpJ5UdzU1wBhCJuIftSR/bg6
-48NDveaqekJTzu3DfJnRg4PZIiSBePjLIKtwERJH78UbLUPqWpkGeOZC5RaIhkmVaOYPa4foAbU9
-wnUedjyVm1BSH0gtmC9WLgGHuJ+JGdKtXVzIztSgbxuW7dAljMV3ysV+uqhIj7cvA2vCtTBMpTpD
-T99RWAiqfKOFniRj9K4r8wuJIewR4kwP22ysN0fif66QUN5Rvdp3oQgQGqIP8Gb7wK+7m3Qs1DCp
-fTx6nBFzOpIfAgMBAAECggEBAINYktkEvCWxAh/kFRqcyBaCg2epTzn1vGd5QPIz2teHPudS1guw
-kqz5dyTMDNKVJrV+WKVV1oWnndy+9WJxYj6WqSjb2i/pqT99ymWbrVqvdSS0KoUT9m4v+x138gmh
-ud9UIPg3mDmOuTZeb2rRgfN8yPPvhpz2vRiFevV88g7nillHT9UV4aS6kSZ2vUaxow0n72nGtmZF
-+dhhIpMhnSicuvJEPhUAdsbR5EZaWNOoD6dHLpd2bq23TW15TMghzT2eoqgvih1+OwY50lN0zwLC
-Z561O24yUqkY7lGiwzDhsQ8I/iYuoKjyPEgIrUYHdajyLcceFOP65Z/6jgsFxWECgYEA/tMMjy2g
-tCIrvADOi/XlSo5MtAfqaGf7X/Afpw8AmT4kW7gBbO80hctyXQ1ZxPjJKz10Tb1gPhqO7UjM14u4
-PWD2WYZ7YFeeFtXJUA2/mIFUa49mn6YLG6lGPDl/WdYI4AQm0h/8hCARYrqpnwJhVvHv9D2r10T1
-rNkNqw2nrJcCgYEA0CDc/V8lP7skAeyZL8dtOrAMIM+f+pbCjwa3JHUkdeVr/NOVcd93qYLAP+wr
-PLGoeDRoLpAhGeP//kzKPODVBvM6lUhw/RuJ+bzqb93oUO/Qfng5vCPvMP0nC928JT0qWIYjOxEd
-vS2ko5AMhk2axJH5I64SLlM+DCUC+IHeD7kCgYEA459IL7k1PNLtOBGMbq8mszNrRsFvXPXNMISA
-8axP/5LnzVoPQ+xkgUMbFA2x62XD5LEPa8XG65KzqzeFauCuoX00cQHUwVliqMks+ypcw/B6pV3B
-8MfUUlAhofhGTswGv3xV5QqXeLpgbU2J6LSqmIyiqAxSrIc34L8+G1amOV8CgYAG+vMudEB1kLs2
-bU798TxSmZDukMgWyXOhBGKkEGG2qokio54BgbMrtjzoZ+1TTcoOrgNIfID/s0vkpYKq5AeBAitW
-0mUnuAK6o4FhWxntjP17IGEfVD0zcWob1cX3ocOH0Ifh9UMAE0XQToZ9AqFMMnEepzno39XW5m7h
-Esn10QKBgF4B2F1LmNEV2rG6Skpg3Pb22P+mq6W4KT109hOcKTzE+PCO6250ZxWl9XNI+lzDR1a7
-I4/m9Txl3nUZH2IM7ULKDWfiPlhTh/OTiSvGpqSCVBDAmKSxa41x+gtdNLIiN14wnpefs+bg9y8A
-ySQWoJZf+dHsrmBq/yThxFYJnjSU
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDJHKDQxkLovqARv+5ii3XrcoLS
+Q7j6dz0rvGHf4PR6wh0VWQB8Pd6eatePz784w5oZkxsnbMlkW8jcKfJl5B5iYaeZzDm9DOVD1Tij
+EKYNEpB5vofeAYsil6Gx2BJCbeKWe4myPWg83aRQKMa9nTvDrnZB/g+XeZbFmSm+3zN3W2v0vDm6
+wOJuCxNwAgv8dlr6QYJ10S7IyHA6s3oD3QNPJatGjZeKv9LOHYwmiQN6G02CPPrOAN9U6oDUYDhn
+ynOx3N2fsq9/JShPyFUFJsYRPgXEsPAHHmwrovBBJ0i/lEktv1WsaESANIn+feuXu0RsDRUbtXi7
+MgwT6taV+5fPAgMBAAECggEBAMAXzitcFDDHU5FgqEwMNVftCrPX5+mk1xLdXwc+kYZnvuvTFTmW
+xvq9xqQgpN+NRbXD4x3nNP3dBZ/1mQhluffymum2PjgrBxmhofVvQ4wc/U6sBI6zHrit6M48OkSl
+PNbLrRxItzXb5sSCDkKy2pDwJRinmTDv/GlFALDF9Ry8zo0Ekhj87Re3TLksg6ppN/tIUY/F6md+
+Khq+Jdf3f7+4wQ8E7DVSTDT0JezefrJumrB2u4XXYqLZIFla7ZWuOdzkE6Z4PHvU7zjvTCw4Vy99
+BgP/Du9eSIwO7tqisBJD0U0XVPMJca0k2TbbiH6vyZMkLBULtS05Su/WSLu3SmECgYEA4zon1XmI
+r95L4QV6bDcfKss/enWBUWSdBePn+po5AhXkhQqbNxOAc2TE5890xWEUsrpmZVpIuoe99lBbLod9
+iMZht3gNDiy/T0tqJziAyTtNbHZhV5WmUbzoS/oV5ofWRhxbjh57rOW1JaWWx5OSj6rjwgyDzXmZ
+8EpNAEUnoGcCgYEA4pPpf+LFOPaS56gSsPF/D2IRvXCCArccvlwoz7+ACK+tv86qNxHr/wGyw8Ko
+dYx8Y2lScOvmgFmabGPL88gfo713GzeSgvPKrSDOBDO8kqE7fUm+F6LGw0Hq4PXur0lFSgTAFupY
+5d4c2yJ3qUMlS1ZoaeHoIySMSfqa1UTQDFkCgYBfa2+I3NWCjQYuQ3+qa+dhsCJDCY85n9e0voUP
+Hq5r6seg+tg9Y6ogSyPI+Lxfmqn3eAFB9IzwD8q84fe4bVtREYW9ZuOMnUvlP5UfTUH/vzB/KKMu
+BYDneD3Qkf+aZFad8JCd+L0U2Q2d9pB/1L/KJwgn19uNcNAtMPZu85t1ZwKBgEShPuoAu3J8pZTL
+wRWdoLn9H5h9GrRN2MQEUExVGigHZp6hr8dMg2pTjl1jeflZG1hVT6ZqngAko/TO6bkm1gaX3hr9
+Y0CNLcfxFtYJAcZ8VfOmQZEROhlsvwNzGuA3VmiMNc77HwBJnf32W76GWyaNvsTLq6/xYxkJcprE
+5CvJAoGAdRQdAZ2QVjpne6ZO54ck5JK5nN/6UoYN7oWXFOVRn10lRY4Apo+vq/Sd8fggb7rxU8KO
+3UBbzljGLAJqAxpWVubsRqnspx9jnX+XTFULH8wEZvkBECXra2/XKP55FdX781t7JaS9x2S/igA4
+5QLPvkF4AH7U11/Ar0OQqNLppms=
 -----END PRIVATE KEY-----
diff --git a/tests/data/user4-la/public-key.pem b/tests/data/user4-la/public-key.pem
index eabe2384..ca6b3bb9 100644
--- a/tests/data/user4-la/public-key.pem
+++ b/tests/data/user4-la/public-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzywwj3sMIMKlJteAhyoy
-UhvJZmqubs9UDyq5hjWVrXoLc3wiDOF94kdsBUswh6iEp90XWWPyat+5cY6SeVHc
-1NcAYQibiH7Ukf24OuPDQ73mqnpCU87tw3yZ0YOD2SIkgXj4yyCrcBESR+/FGy1D
-6lqZBnjmQuUWiIZJlWjmD2uH6AG1PcJ1HnY8lZtQUh9ILZgvVi4Bh7ifiRnSrV1c
-yM7UoG8blu3QJYzFd8rFfrqoSI+3LwNrwrUwTKU6Q0/fUVgIqnyjhZ4kY/SuK/ML
-iSHsEeJMD9tsrDdH4n+ukFDeUb3ad6EIEBqiD/Bm+8Cvu5t0LNQwqX08epwRczqS
-HwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyRyg0MZC6L6gEb/uYot1
+63KC0kO4+nc9K7xh3+D0esIdFVkAfD3enmrXj8+/OMOaGZMbJ2zJZFvI3CnyZeQe
+YmGnmcw5vQzlQ9U4oxCmDRKQeb6H3gGLIpehsdgSQm3ilnuJsj1oPN2kUCjGvZ07
+w652Qf4Pl3mWxZkpvt8zd1tr9Lw5usDibgsTcAIL/HZa+kGCddEuyMhwOrN6A90D
+TyWrRo2Xir/Szh2MJokDehtNgjz6zgDfVOqA1GA4Z8pzsdzdn7KvfyUoT8hVBSbG
+ET4FxLDwBx5sK6LwQSdIv5RJLb9VrGhEgDSJ/n3rl7tEbA0VG7V4uzIME+rWlfuX
+zwIDAQAB
 -----END PUBLIC KEY-----
author	Emmanuel Raviart <eraviart@entrouvert.com>	2004-08-13 11:02:46 +0000
committer	Emmanuel Raviart <eraviart@entrouvert.com>	2004-08-13 11:02:46 +0000
commit	2687aac1714a0fe2260d725dc4c628c2696134f4 (patch)
tree	29946f54f3404e55fbb84fbf6e27c60a0be59bba /tests/data
parent	db348429d96ff168906addab3477c482fda98036 (diff)
download	lasso-2687aac1714a0fe2260d725dc4c628c2696134f4.tar.gz lasso-2687aac1714a0fe2260d725dc4c628c2696134f4.tar.xz lasso-2687aac1714a0fe2260d725dc4c628c2696134f4.zip