3 files changed, 132 insertions, 112 deletions
diff --git a/src/leap/common/testing/cacert.pem b/src/leap/common/testing/cacert.pem
index 6989c48..30c69c6 100644
--- a/src/leap/common/testing/cacert.pem
+++ b/src/leap/common/testing/cacert.pem
@@ -1,23 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIID1TCCAr2gAwIBAgIJAOv0BS09D8byMA0GCSqGSIb3DQEBBQUAMIGAMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKY3liZXJzcGFjZTEnMCUGA1UECgweTEVBUCBFbmNy
-eXB0aW9uIEFjY2VzcyBQcm9qZWN0MRYwFAYDVQQDDA10ZXN0cy1sZWFwLnNlMRsw
-GQYJKoZIhvcNAQkBFgxpbmZvQGxlYXAuc2UwHhcNMTIwODMxMTYyNjMwWhcNMTUw
-ODMxMTYyNjMwWjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCmN5YmVyc3BhY2Ux
-JzAlBgNVBAoMHkxFQVAgRW5jcnlwdGlvbiBBY2Nlc3MgUHJvamVjdDEWMBQGA1UE
-AwwNdGVzdHMtbGVhcC5zZTEbMBkGCSqGSIb3DQEJARYMaW5mb0BsZWFwLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1pU7OU+abrUXFZwp6X0LlF0f
-xQvC1Nmr5sFH7N9RTu3bdwY2t57ECP2TPkH6+x7oOvCTgAMxIE1scWEEkfgKViqW
-FH/Om1UW1PMaiDYGtFuqEuxM95FvaYxp2K6rzA37WNsedA28sCYzhRD+/5HqbCNT
-3rRS2cPaVO8kXI/5bgd8bUk3009pWTg4SvTtOW/9MWJbBH5f5JWmMn7Ayt6hIdT/
-E6npofEK/UCqAlEscARYFXSB/F8nK1whjo9mGFjMUd7d/25UbFHqOk4K7ishD4DH
-F7LaS84rS+Sjwn3YtDdDQblGghJfz8X1AfPSGivGnvLVdkmMF9Y2hJlSQ7+C5wID
-AQABo1AwTjAdBgNVHQ4EFgQUnpJEv4FnlqKbfm7mprudKdrnOAowHwYDVR0jBBgw
-FoAUnpJEv4FnlqKbfm7mprudKdrnOAowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAGW66qwdK/ATRVZkTpI2sgi+2dWD5tY4VyZuJIrRwfXsGPeVvmdsa
-zDmwW5dMkth1Of5yO6o7ijvUvfnw/UCLNLNICKZhH5G0DHstfBeFc0jnP2MqOZCp
-puRGPBlO2nxUCvoGcPRUKGQK9XSYmxcmaSFyzKVDMLnmH+Lakj5vaY9a8ZAcZTz7
-T5qePxKAxg+RIlH8Ftc485QP3fhqPYPrRsL3g6peiqCvIRshoP1MSoh19boI+1uX
-wHQ/NyDkL5ErKC5JCSpaeF8VG1ek570kKWQLuQAbnlXZw+Sqfu35CIdizHaYGEcx
-xA8oXH4L2JaT2x9GKDSpCmB2xXy/NVamUg==
+MIIFGDCCBACgAwIBAgIJAIu/QWMeEGrsMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYD
+VQQGEwJVUzELMAkGA1UECBMCQ0ExEzARBgNVBAcTCkN5YmVyc3BhY2UxJzAlBgNV
+BAoTHkxFQVAgRW5jcnlwdGlvbiBBY2Nlc3MgUHJvamVjdDETMBEGA1UECxMKY3li
+ZXJzcGFjZTEWMBQGA1UEAxMNdGVzdHMtbGVhcC5zZTETMBEGA1UEKRMKdGVzdHMt
+bGVhcDEcMBoGCSqGSIb3DQEJARYNdGVzdHNAbGVhcC5zZTAeFw0xMzA5MDMxNTA0
+MTFaFw0yMzA5MDExNTA0MTFaMIG4MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0Ex
+EzARBgNVBAcTCkN5YmVyc3BhY2UxJzAlBgNVBAoTHkxFQVAgRW5jcnlwdGlvbiBB
+Y2Nlc3MgUHJvamVjdDETMBEGA1UECxMKY3liZXJzcGFjZTEWMBQGA1UEAxMNdGVz
+dHMtbGVhcC5zZTETMBEGA1UEKRMKdGVzdHMtbGVhcDEcMBoGCSqGSIb3DQEJARYN
+dGVzdHNAbGVhcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9R
+L/azQ7jIzmB6+VEKFSdDw27DMq/aN87grNHqNAQiiU7b3hJLff9CAgMZhP92hB7X
+Wwg/TN7IEMLUacP0EChRekI6VtpsNBlfb5g/8yq4kORWhniY99dnjbJaw2sGA3Oh
+azySIvrKPxE/V393dmOQq+RFO4S+ytcq+rUILVFQX4lnFUHTyGGtpgMnB3smxJ8K
+WPu9bZej0GXjeWgVb28HxoqMEJC+4lScRZT/p7VhWN0QmOW3SP4l65guvDStdTGY
+z3uOFbGRuSRN9nHwTxe5COhyOa1TrEp89noHOGt3DRba4ZN4QUF3vX+c5JKaF6Ie
+s7LajB3hSWe/8ifT9oMCAwEAAaOCASEwggEdMB0GA1UdDgQWBBQ2GXCWqVz+o4IP
+eZUxUitKQb2ByzCB7QYDVR0jBIHlMIHigBQ2GXCWqVz+o4IPeZUxUitKQb2By6GB
+vqSBuzCBuDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRMwEQYDVQQHEwpDeWJl
+cnNwYWNlMScwJQYDVQQKEx5MRUFQIEVuY3J5cHRpb24gQWNjZXNzIFByb2plY3Qx
+EzARBgNVBAsTCmN5YmVyc3BhY2UxFjAUBgNVBAMTDXRlc3RzLWxlYXAuc2UxEzAR
+BgNVBCkTCnRlc3RzLWxlYXAxHDAaBgkqhkiG9w0BCQEWDXRlc3RzQGxlYXAuc2WC
+CQCLv0FjHhBq7DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBVBey7
+ohxU/ir7g3In+uk3iyfZT+yhmjz1j6IWqbno+sc3CfCOiEgTRTphFTN2aP6pvigD
+yKUBYZ0NRA5mAl3xopeT819DPkLgkacm4wugYKqV+60yrekmbEWsu/T5/jLWHN6s
+QelIKdLklA9oivM1lCIqR+XV4A2MX3zwXdEmZp8QYiBAqLf49wgCLhSOrgXXUlb0
+EUMsyclHs9PN33YRd9qQiE0hwBwpcxxus/sonnMP2xDiDiCu6dnYC7BmzfYfgiS5
+7tfEGpKyuY+7J+etOzOKfkNA20ooVRvvpQ4rpcHulKwZE3yI0geW7YS2uL+p5ORO
+twHvLcMPlAXUkXhS
 -----END CERTIFICATE-----
diff --git a/src/leap/common/testing/leaptestscert.pem b/src/leap/common/testing/leaptestscert.pem
index 65596b1..68342a1 100644
--- a/src/leap/common/testing/leaptestscert.pem
+++ b/src/leap/common/testing/leaptestscert.pem
@@ -1,84 +1,96 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number:
-            eb:f4:05:2d:3d:0f:c6:f3
+        Serial Number: 2 (0x2)
     Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=cyberspace, O=LEAP Encryption Access Project, CN=tests-leap.se/emailAddress=info@leap.se
+        Issuer: C=US, ST=CA, L=Cyberspace, O=LEAP Encryption Access Project, OU=cyberspace, CN=tests-leap.se/name=tests-leap/emailAddress=tests@leap.se
         Validity
-            Not Before: Aug 31 16:30:17 2012 GMT
-            Not After : Aug 31 16:30:17 2013 GMT
-        Subject: C=US, ST=cyberspace, L=net, O=LEAP Encryption Access Project, CN=localhost/emailAddress=info@leap.se
+            Not Before: Sep  3 15:05:04 2013 GMT
+            Not After : Sep  1 15:05:04 2023 GMT
+        Subject: C=US, ST=CA, L=Cyberspace, O=LEAP Encryption Access Project, OU=cyberspace, CN=leaptestskey/name=tests-leap/emailAddress=tests@leap.se
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:bc:f1:c4:05:ce:4b:d5:9b:9a:fa:c1:a5:0c:89:
-                    15:7e:05:69:b6:a4:62:38:3a:d6:14:4a:36:aa:3c:
-                    31:70:54:2e:bf:7d:05:19:ad:7b:0c:a9:a6:7d:46:
-                    be:83:62:cb:ea:b9:48:6c:7d:78:a0:10:0b:ad:8a:
-                    74:7a:b8:ff:32:85:64:36:90:dc:38:dd:90:6e:07:
-                    82:70:ae:5f:4e:1f:f4:46:98:f3:98:b4:fa:08:65:
-                    bf:d6:ec:a9:ba:7e:a8:f0:40:a2:d0:1a:cb:e6:fc:
-                    95:c5:54:63:92:5b:b8:0a:36:cc:26:d3:2b:ad:16:
-                    ff:49:53:f4:65:7c:64:27:9a:f5:12:75:11:a5:0c:
-                    5a:ea:1e:e4:31:f3:a6:2b:db:0e:4a:5d:aa:47:3a:
-                    f0:5e:2a:d5:6f:74:b6:f8:bc:9a:73:d0:fa:8a:be:
-                    a8:69:47:9b:07:45:d9:b5:cd:1c:9b:c5:41:9a:65:
-                    cc:99:a0:bd:bf:b5:e8:9f:66:5f:69:c9:6d:c8:68:
-                    50:68:74:ae:8e:12:7e:9c:24:4f:dc:05:61:b7:8a:
-                    6d:2a:95:43:d9:3f:fe:d8:c9:a7:ae:63:cd:30:d5:
-                    95:84:18:2d:12:b5:2d:a6:fe:37:dd:74:b8:f8:a5:
-                    59:18:8f:ca:f7:ae:63:0d:9d:66:51:7d:9c:40:48:
-                    9b:a1
+                    00:c4:4c:e5:c8:a5:47:4f:02:93:ee:6b:b4:2e:4e:
+                    d8:5f:35:17:43:e2:12:73:fc:53:5c:92:b1:ac:08:
+                    c1:98:56:7c:f4:f4:44:15:a8:e9:e1:a6:2d:ca:a5:
+                    e0:1d:89:e4:a4:27:69:de:7d:06:ca:25:1b:95:3d:
+                    2d:13:36:ce:a2:58:9b:1b:dc:cd:46:b6:d5:f5:c3:
+                    31:86:9c:22:07:c4:81:f4:89:a2:e0:5c:05:fe:e8:
+                    bb:7f:80:20:ba:2d:c6:fd:4c:af:3c:b9:ab:c1:56:
+                    20:c3:1c:6a:3d:dc:6f:f4:4d:5c:cf:5f:7b:0c:3e:
+                    62:14:ef:a2:6b:6c:02:c3:4d:ea:eb:3c:03:51:ad:
+                    17:27:27:db:03:7f:8e:6e:eb:ef:0b:39:80:e9:02:
+                    48:53:d6:02:cb:10:e7:88:0a:8c:7a:fa:50:02:13:
+                    2d:da:c6:9f:65:f6:09:01:3b:f7:48:59:58:f2:ad:
+                    8f:7c:d2:b3:dd:2e:fd:ff:fe:62:99:83:75:4c:86:
+                    01:41:82:01:48:51:37:0d:06:c0:b2:d9:a4:2d:6a:
+                    ee:de:2f:49:a5:07:6d:e6:11:23:b1:bd:0c:ff:5f:
+                    98:fb:63:1c:7b:a0:24:b1:33:53:de:33:c5:73:4d:
+                    ce:0f:a9:18:0d:f5:9a:29:46:ee:9a:c2:22:3d:01:
+                    db:63
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             Netscape Comment: 
-                OpenSSL Generated Certificate
+                Easy-RSA Generated Certificate
             X509v3 Subject Key Identifier: 
-                B2:50:B4:C6:38:8F:BA:C4:3B:69:4C:6B:45:7C:CF:08:48:36:02:E0
+                65:B4:E8:FD:61:E2:B1:C6:87:2F:E2:CA:FB:9C:73:43:D0:BC:6D:24
             X509v3 Authority Key Identifier: 
-                keyid:9E:92:44:BF:81:67:96:A2:9B:7E:6E:E6:A6:BB:9D:29:DA:E7:38:0A
+                keyid:36:19:70:96:A9:5C:FE:A3:82:0F:79:95:31:52:2B:4A:41:BD:81:CB
+                DirName:/C=US/ST=CA/L=Cyberspace/O=LEAP Encryption Access Project/OU=cyberspace/CN=tests-leap.se/name=tests-leap/emailAddress=tests@leap.se
+                serial:8B:BF:41:63:1E:10:6A:EC
 
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+            X509v3 Key Usage: 
+                Digital Signature
     Signature Algorithm: sha1WithRSAEncryption
-         aa:ab:d4:27:e3:cb:42:05:55:fd:24:b3:e5:55:7d:fb:ce:6c:
-         ff:c7:96:f0:7d:30:a1:53:4a:04:eb:a4:24:5e:96:ee:65:ef:
-         e5:aa:08:47:9d:aa:95:2a:bb:6a:28:9f:51:62:63:d9:7d:1a:
-         81:a0:72:f7:9f:33:6b:3b:f4:dc:85:cd:2a:ee:83:a9:93:3d:
-         75:53:91:fa:0b:1b:10:83:11:2c:03:4e:ac:bf:c3:e6:25:74:
-         9f:14:13:4a:43:66:c2:d7:1c:6c:94:3e:a6:f3:a5:bd:01:2c:
-         9f:20:29:2e:62:82:12:d8:8b:70:1b:88:2b:18:68:5a:45:80:
-         46:2a:6a:d5:df:1f:d3:e8:57:39:0a:be:1a:d8:b0:3e:e5:b6:
-         c3:69:b7:5e:c0:7b:b3:a8:a6:78:ee:0a:3d:a0:74:40:fb:42:
-         9f:f4:98:7f:47:cc:15:28:eb:b1:95:77:82:a8:65:9b:46:c3:
-         4f:f9:f4:72:be:bd:24:28:5c:0d:b3:89:e4:13:71:c8:a7:54:
-         1b:26:15:f3:c1:b2:a9:13:77:54:c2:b9:b0:c7:24:39:00:4c:
-         1a:a7:9b:e7:ad:4a:3a:32:c2:81:0d:13:2d:27:ea:98:00:a9:
-         0e:9e:38:3b:8f:80:34:17:17:3d:49:7e:f4:a5:19:05:28:08:
-         7d:de:d3:1f
+         6c:3e:59:41:53:20:86:8c:c1:2a:e9:6a:17:1c:ed:96:e9:76:
+         8d:3f:68:8c:cd:17:a6:ac:ab:c5:07:dc:93:40:ed:77:1a:72:
+         a2:45:06:49:0e:1c:18:55:9b:9f:d7:6f:b5:4a:40:69:06:f0:
+         b3:d6:e2:30:de:db:73:a5:12:9a:43:a8:a7:fb:6e:f4:22:a9:
+         10:e6:08:2d:d1:86:95:22:e7:53:5a:38:c5:d9:2d:f5:6e:62:
+         71:1b:49:13:dd:e8:ac:c1:06:be:4a:f5:77:81:45:37:18:1c:
+         fb:77:61:a8:0b:f9:f5:7e:f4:30:86:f0:32:34:93:70:f9:e7:
+         ba:b2:af:45:c0:05:46:64:41:fd:93:ab:f0:39:2d:17:bb:15:
+         19:ff:9c:8b:0f:65:db:b1:aa:7c:cd:9d:5d:c4:da:12:57:33:
+         f9:c9:60:ca:09:23:d0:60:d3:f0:5b:fa:d7:ba:e7:1b:c6:df:
+         d6:cf:a1:06:1a:1e:e5:2e:00:ea:b5:aa:ab:b2:56:61:c1:bb:
+         0e:7e:c2:ff:c7:a9:43:a8:71:de:7e:1c:cb:3b:a6:21:2b:7f:
+         34:f5:ff:0b:0d:79:04:0a:8c:88:12:7b:c0:02:a0:f3:8f:0e:
+         9f:0e:3d:71:24:7b:ed:59:a7:5e:94:6d:9c:5f:73:95:cd:59:
+         4a:88:34:f7
 -----BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAOv0BS09D8bzMA0GCSqGSIb3DQEBBQUAMIGAMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKY3liZXJzcGFjZTEnMCUGA1UECgweTEVBUCBFbmNy
-eXB0aW9uIEFjY2VzcyBQcm9qZWN0MRYwFAYDVQQDDA10ZXN0cy1sZWFwLnNlMRsw
-GQYJKoZIhvcNAQkBFgxpbmZvQGxlYXAuc2UwHhcNMTIwODMxMTYzMDE3WhcNMTMw
-ODMxMTYzMDE3WjCBijELMAkGA1UEBhMCVVMxEzARBgNVBAgMCmN5YmVyc3BhY2Ux
-DDAKBgNVBAcMA25ldDEnMCUGA1UECgweTEVBUCBFbmNyeXB0aW9uIEFjY2VzcyBQ
-cm9qZWN0MRIwEAYDVQQDDAlsb2NhbGhvc3QxGzAZBgkqhkiG9w0BCQEWDGluZm9A
-bGVhcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALzxxAXOS9Wb
-mvrBpQyJFX4FabakYjg61hRKNqo8MXBULr99BRmtewyppn1GvoNiy+q5SGx9eKAQ
-C62KdHq4/zKFZDaQ3DjdkG4HgnCuX04f9EaY85i0+ghlv9bsqbp+qPBAotAay+b8
-lcVUY5JbuAo2zCbTK60W/0lT9GV8ZCea9RJ1EaUMWuoe5DHzpivbDkpdqkc68F4q
-1W90tvi8mnPQ+oq+qGlHmwdF2bXNHJvFQZplzJmgvb+16J9mX2nJbchoUGh0ro4S
-fpwkT9wFYbeKbSqVQ9k//tjJp65jzTDVlYQYLRK1Lab+N910uPilWRiPyveuYw2d
-ZlF9nEBIm6ECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
-blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFLJQtMY4j7rEO2lM
-a0V8zwhINgLgMB8GA1UdIwQYMBaAFJ6SRL+BZ5aim35u5qa7nSna5zgKMA0GCSqG
-SIb3DQEBBQUAA4IBAQCqq9Qn48tCBVX9JLPlVX37zmz/x5bwfTChU0oE66QkXpbu
-Ze/lqghHnaqVKrtqKJ9RYmPZfRqBoHL3nzNrO/Tchc0q7oOpkz11U5H6CxsQgxEs
-A06sv8PmJXSfFBNKQ2bC1xxslD6m86W9ASyfICkuYoIS2ItwG4grGGhaRYBGKmrV
-3x/T6Fc5Cr4a2LA+5bbDabdewHuzqKZ47go9oHRA+0Kf9Jh/R8wVKOuxlXeCqGWb
-RsNP+fRyvr0kKFwNs4nkE3HIp1QbJhXzwbKpE3dUwrmwxyQ5AEwap5vnrUo6MsKB
-DRMtJ+qYAKkOnjg7j4A0Fxc9SX70pRkFKAh93tMf
+MIIFXTCCBEWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgTAkNBMRMwEQYDVQQHEwpDeWJlcnNwYWNlMScwJQYDVQQKEx5MRUFQ
+IEVuY3J5cHRpb24gQWNjZXNzIFByb2plY3QxEzARBgNVBAsTCmN5YmVyc3BhY2Ux
+FjAUBgNVBAMTDXRlc3RzLWxlYXAuc2UxEzARBgNVBCkTCnRlc3RzLWxlYXAxHDAa
+BgkqhkiG9w0BCQEWDXRlc3RzQGxlYXAuc2UwHhcNMTMwOTAzMTUwNTA0WhcNMjMw
+OTAxMTUwNTA0WjCBtzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRMwEQYDVQQH
+EwpDeWJlcnNwYWNlMScwJQYDVQQKEx5MRUFQIEVuY3J5cHRpb24gQWNjZXNzIFBy
+b2plY3QxEzARBgNVBAsTCmN5YmVyc3BhY2UxFTATBgNVBAMTDGxlYXB0ZXN0c2tl
+eTETMBEGA1UEKRMKdGVzdHMtbGVhcDEcMBoGCSqGSIb3DQEJARYNdGVzdHNAbGVh
+cC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRM5cilR08Ck+5r
+tC5O2F81F0PiEnP8U1ySsawIwZhWfPT0RBWo6eGmLcql4B2J5KQnad59BsolG5U9
+LRM2zqJYmxvczUa21fXDMYacIgfEgfSJouBcBf7ou3+AILotxv1Mrzy5q8FWIMMc
+aj3cb/RNXM9feww+YhTvomtsAsNN6us8A1GtFycn2wN/jm7r7ws5gOkCSFPWAssQ
+54gKjHr6UAITLdrGn2X2CQE790hZWPKtj3zSs90u/f/+YpmDdUyGAUGCAUhRNw0G
+wLLZpC1q7t4vSaUHbeYRI7G9DP9fmPtjHHugJLEzU94zxXNNzg+pGA31milG7prC
+Ij0B22MCAwEAAaOCAW8wggFrMAkGA1UdEwQCMAAwLQYJYIZIAYb4QgENBCAWHkVh
+c3ktUlNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUZbTo/WHiscaH
+L+LK+5xzQ9C8bSQwge0GA1UdIwSB5TCB4oAUNhlwlqlc/qOCD3mVMVIrSkG9gcuh
+gb6kgbswgbgxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTETMBEGA1UEBxMKQ3li
+ZXJzcGFjZTEnMCUGA1UEChMeTEVBUCBFbmNyeXB0aW9uIEFjY2VzcyBQcm9qZWN0
+MRMwEQYDVQQLEwpjeWJlcnNwYWNlMRYwFAYDVQQDEw10ZXN0cy1sZWFwLnNlMRMw
+EQYDVQQpEwp0ZXN0cy1sZWFwMRwwGgYJKoZIhvcNAQkBFg10ZXN0c0BsZWFwLnNl
+ggkAi79BYx4QauwwEwYDVR0lBAwwCgYIKwYBBQUHAwIwCwYDVR0PBAQDAgeAMA0G
+CSqGSIb3DQEBBQUAA4IBAQBsPllBUyCGjMEq6WoXHO2W6XaNP2iMzRemrKvFB9yT
+QO13GnKiRQZJDhwYVZuf12+1SkBpBvCz1uIw3ttzpRKaQ6in+270IqkQ5ggt0YaV
+IudTWjjF2S31bmJxG0kT3eiswQa+SvV3gUU3GBz7d2GoC/n1fvQwhvAyNJNw+ee6
+sq9FwAVGZEH9k6vwOS0XuxUZ/5yLD2Xbsap8zZ1dxNoSVzP5yWDKCSPQYNPwW/rX
+uucbxt/Wz6EGGh7lLgDqtaqrslZhwbsOfsL/x6lDqHHefhzLO6YhK3809f8LDXkE
+CoyIEnvAAqDzjw6fDj1xJHvtWadelG2cX3OVzVlKiDT3
 -----END CERTIFICATE-----
diff --git a/src/leap/common/testing/leaptestskey.pem b/src/leap/common/testing/leaptestskey.pem
index fe6291a..93d67c2 100644
--- a/src/leap/common/testing/leaptestskey.pem
+++ b/src/leap/common/testing/leaptestskey.pem
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAvPHEBc5L1Zua+sGlDIkVfgVptqRiODrWFEo2qjwxcFQuv30F
-Ga17DKmmfUa+g2LL6rlIbH14oBALrYp0erj/MoVkNpDcON2QbgeCcK5fTh/0Rpjz
-mLT6CGW/1uypun6o8ECi0BrL5vyVxVRjklu4CjbMJtMrrRb/SVP0ZXxkJ5r1EnUR
-pQxa6h7kMfOmK9sOSl2qRzrwXirVb3S2+Lyac9D6ir6oaUebB0XZtc0cm8VBmmXM
-maC9v7Xon2ZfacltyGhQaHSujhJ+nCRP3AVht4ptKpVD2T/+2MmnrmPNMNWVhBgt
-ErUtpv433XS4+KVZGI/K965jDZ1mUX2cQEiboQIDAQABAoIBAQCh/+yhSbrtoCgm
-PegEsnix/3QfPBxWt+Obq/HozglZlWQrnMbFuF+bgM4V9ZUdU5UhYNF+66mEG53X
-orGyE3IDYCmHO3cGbroKDPhDIs7mTjGEYlniIbGLh6oPXgU8uKKis9ik84TGPOUx
-NuTUtT07zLYHx+FX3DLwLUKLzTaWWSRgA7nxNwCY8aPqDxCkXEyZHvSlm9KYZnhe
-nVevycoHR+chxL6X/ebbBt2FKR7tl4328mlDXvMXr0vahPH94CuXEvfTj+f6ZxZF
-OctdikyRfd8O3ebrUw0XjafPYyTsDMH0/rQovEBVlecEHqh6Z9dBFlogRq5DSun9
-jem4bBXRAoGBAPGPi4g21pTQPqTFxpqea8TsPqIfo3csfMDPdzT246MxzALHqCfG
-yZi4g2JYJrReSWHulZDORO5skSKNEb5VTA/3xFhKLt8CULZOakKBDLkzRXlnDFXg
-Jsu9vtjDWjQcJsdsRx1tc5V6s+hmel70aaUu/maUlEYZnyIXaTe+1SB1AoGBAMg9
-EMEO5YN52pOI5qPH8j7uyVKtZWKRiR6jb5KA5TxWqZalSdPV6YwDqV/e+HjWrZNw
-kSEFONY0seKpIHwXchx91aym7rDHUgOoBQfCWufRMYvRXLhfOTBu4X+U52++i8wt
-FvKgh6eSmc7VayAaDfHp7yfrIfS03IiN0T35mGj9AoGAPCoXg7a83VW8tId5/trE
-VsjMlM6yhSU0cUV7GFsBuYzWlj6qODX/0iTqvFzeTwBI4LZu1CE78/Jgd62RJMnT
-5wo8Ag1//RVziuSe/K9tvtbxT9qFrQHmR8qbtRt65Q257uOeFstDBZEJLDIR+oJ/
-qZ+5x0zsXUVWaERSdYr3RF0CgYEApKDgN3oB5Ti4Jnh1984aMver+heptYKmU9RX
-lQH4dsVhpQO8UTgcTgtso+/0JZWLHB9+ksFyW1rzrcETfjLglOA4XzzYHeuiWHM5
-v4lhqBpsO+Ij80oHAPUI3RYVud/VnEauCUlGftWfM1hwPPJu6KhHAnDleAWDE5pV
-oDinwBkCgYEAnn/OceaqA2fNYp1IRegbFzpewjUlHLq3bXiCIVhO7W/HqsdfUxjE
-VVdjEno/pAG7ZCO5j8u+rLkG2ZIVY3qsUENUiXz52Q08qEltgM8nfirK7vIQkfd9
-YISRE3QHYJd+ArY4v+7rNeF1O5eIEyzPAbvG5raeZFcZ6POxy66uWKo=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDETOXIpUdPApPu
+a7QuTthfNRdD4hJz/FNckrGsCMGYVnz09EQVqOnhpi3KpeAdieSkJ2nefQbKJRuV
+PS0TNs6iWJsb3M1GttX1wzGGnCIHxIH0iaLgXAX+6Lt/gCC6Lcb9TK88uavBViDD
+HGo93G/0TVzPX3sMPmIU76JrbALDTerrPANRrRcnJ9sDf45u6+8LOYDpAkhT1gLL
+EOeICox6+lACEy3axp9l9gkBO/dIWVjyrY980rPdLv3//mKZg3VMhgFBggFIUTcN
+BsCy2aQtau7eL0mlB23mESOxvQz/X5j7Yxx7oCSxM1PeM8VzTc4PqRgN9ZopRu6a
+wiI9AdtjAgMBAAECggEBAJXr+Q8+E/EnEd5lCc7YTu6f+K3Syq8kxnIMY3/1jA4R
++AuJRzqXsFCzf4OnHjzRJPuuUnAnYvkeUCux9mwXTse1DnnAMFNSrqStuHSLaH4w
+OeSO/gOGpNmj3BervtMSxUiNucSSNbhKVGlPmWC3rBWUxE5pKOwX9QbyYkTS0GVi
+ErwCfI62SO1Bi3heuQio3jn0SLsvrwMAuOtJMdYLQgEFEEe/LPBfmUzQKDj8900j
+AOxZ87zKUVBBcKnTeGKrvk0RXf9VsHYA1Gc1ksPkF+GIiWIfBU9n3SIYKfuso9hA
++k2wW8n2h48BVOHPiT4A5s1gzs1gj+JQ+jG6QNsh1ekCgYEA/zcmbBdjbdTqKQPF
+WX5YNJzwfTikz4y9e7qE7htPkJChKshmkHOHAVOQbzV3g+2u5bMeqJFEdW3SpiD2
+kc+ycm/bVP94wyyW1mxxbqhw3KSPiIv9iRErpqJp81vKGQFJhvejPs6uL782ONlB
+RPInCwywiZb+26QLTuEXIagViJ0CgYEAxOdh5weJXYaKTtfRPFVe3VLIETg99Gn9
+y0m3iifl3poz0qLT4t3g3x9AqcCxf+ZSrGl/lqnafdJ450mp591WkC3CkV9EfF6h
+XsU+pNKmoEbpok0uE+mOuClABwFyqVXniPtAMs+qmHXyBIjv413VoqPXfWV6+Fdk
+QwJ7YKBds/8CgYA42whsPCmiZjRkPrrQXR05W10YCG5u7mOoFL1Ybi0jf5Tn+w0e
+UR5aZUtf+wFNGr5D3cuOsg4WOwkaiW1kvmh6pgCuxtsYX+6ahj4e8Ndz0BVJziYF
+SxX2YWhJFsHHIEpJDxIHA/Q6HtbtgzjPK0MXaxRJEqJkO/9o6yxECzYA4QKBgQC9
+u2+dHKgClNfE7TTS/Dgy78eUwCsCzvcc4eWXnKZlfxUcjIW7f61lkknOyLzAz4Eu
+XWHyHa1JvHt/8n1jzOXSfCWVysTFSrIYDdw1Gj4xBuOt3szdpxo83pKxrXV9Mieu
+2Nudmnl5+3y/Xew5nHt1Aodsb1K05hDYeRXFoAFqpQKBgQCjkX45rYMtmtdZo+7l
+HuFkeyvr6TwxVIqbxCGOyO4gVARdu8+kFj5sPaYCLfn6J8yuywhT04ayv9VZ9MCN
+jry90+tbku3tpji6/figXfQmEGiDNbvZ/YkwoVeBJ2onRBlx2v3aQjsYs/pU8Sk7
+ya0eyftVNS19sSxnVG3ZxCAudg==
+-----END PRIVATE KEY-----