regen

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25127 ec53bebd-3082-4978-b11e-865c3cabbd6b
2009-04-16 08:29:32 +00:00
parent f73d077b5b
commit c7e0279abd
66 changed files with 719 additions and 922 deletions
--- a/lib/hx509/data/ca.crt
+++ b/lib/hx509/data/ca.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICbDCCAdWgAwIBAgIJAJ5Pn5krKrp9MA0GCSqGSIb3DQEBBQUAMCoxGzAZBgNV
-BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDkwNDEzMjE0
-ODAwWhcNMTkwNDExMjE0ODAwWjAqMRswGQYDVQQDDBJoeDUwOSBUZXN0IFJvb3Qg
-Q0ExCzAJBgNVBAYTAlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8H0kq
-8tkisE700EnL4Ic3urE2wGETl+kt3bJXVlzLVsHhQaniITqtTCZfZeckk+2nzaPE
-0MehisrOY68QfX+pgdwsiySKA9Ds2cwnfTyOFnECIyPHhZOHuKkOmUgrbjyFavCj
-nfOEx9F+OIy6aRxNIYdtTyiChrNMRzJZ9mjqOQIDAQABo4GZMIGWMB0GA1UdDgQW
-BBRRPOSnMBSMVXSVHFhq8sYFaqfj8TBaBgNVHSMEUzBRgBRRPOSnMBSMVXSVHFhq
-8sYFaqfj8aEupCwwKjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYD
-VQQGEwJTRYIJAJ5Pn5krKrp9MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgHmMA0G
-CSqGSIb3DQEBBQUAA4GBAKJjleDlo0d/gxdi1S8cWJ78Wg2GCHbeq4qo4NU6DrYV
-mDpnqUw+qGsJVEjBBuCOPLuuxqai82In+XSHN5MdC3UqtuBc5E2ogD5NdKoq9BTY
-Glq7rd/VkNXgkbjOGEDGlsrrBbsQVZcVGAd4L1uXCeTZTKZ96FSB07nUIvSRvHGd
+MIICbDCCAdWgAwIBAgIJAPAhubr0YCvsMA0GCSqGSIb3DQEBBQUAMCoxGzAZBgNV
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDkwNDEzMjE1
+MzM0WhcNMTkwNDExMjE1MzM0WjAqMRswGQYDVQQDDBJoeDUwOSBUZXN0IFJvb3Qg
+Q0ExCzAJBgNVBAYTAlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqunM3
+i4rGpKy+wUYBassqasDL4Hr2RKoEQbeBrp/mMFYmkqAzeCWQAgKvMyT49IoWZ6IK
+fwMJG1M3jv3l2sBnpYeFjly2LI+RvWKwKk7xmdBnLoOmq9c/GK2xIjZTBPOghG1E
+pw9tJxgpsKMHDjL3Z/1M9kEN8C3jvZZWFA2IBQIDAQABo4GZMIGWMB0GA1UdDgQW
+BBSo95vy1P54PJM7pJoKnadTg5ut0TBaBgNVHSMEUzBRgBSo95vy1P54PJM7pJoK
+nadTg5ut0aEupCwwKjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYD
+VQQGEwJTRYIJAPAhubr0YCvsMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgHmMA0G
+CSqGSIb3DQEBBQUAA4GBACbZIVYWxA8ujvN2JZvXFNryFC2FUFXgEnY6K0WSkYHX
+9pl/4XwGofLqtUiEfnRPqtSHVEmYwmqIYx3YK5WLIqPiA2Z+1kBlgtmtAJWOfsTf
+pDFkz6888xJihcR7IacKJJf7MCWsIZuxk/IIfcJaObx9p4dsuaUPHQDWyRdNtRM8
 -----END CERTIFICATE-----
--- a/lib/hx509/data/ca.key
+++ b/lib/hx509/data/ca.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC8H0kq8tkisE700EnL4Ic3urE2wGETl+kt3bJXVlzLVsHhQani
-ITqtTCZfZeckk+2nzaPE0MehisrOY68QfX+pgdwsiySKA9Ds2cwnfTyOFnECIyPH
-hZOHuKkOmUgrbjyFavCjnfOEx9F+OIy6aRxNIYdtTyiChrNMRzJZ9mjqOQIDAQAB
-AoGARt3CQluZUGf6Vl7gbdz3ExdRCr8N0sO3I4AQXrY53p+gCasiw/ygjgfRrL5G
-hJD1RfFBcDL2APS30Wfb2upr3Fibq8StsQqg8Na4PF+Y9QpHkgc6MJotmNW37Usv
-VivQLwZ+QuqHCLCZNz00MMnKDr8o6DZ8f9g929OslxinE8ECQQD1mjc3wfUvjZ9t
-6F1LWvRJ+Oyuj4/uXJcx4RDITArPO8NlhesaIL8/A7RWQBOnHViQwZ7p35R9tS1j
-IILws8tbAkEAxBYczw5nx/cH01Lq9sMGb8KdrjBseIoyBts0s1JjCR6s4Zu7k3tN
-qvYwhBwPd+Mo5c4w8+tKZe0n1YxWDjAY+wJADjQC6XiQA1X/WE3Nx2PVKMn6dgXb
-Xv9/xuSrIcoz/dQI8sAR3oryRGSkczB1cn6h9o0b8Y56eeKWY1sn91+ObQJBALt6
-eOjvWQKziePe75AnP0wzwxb8bXmCh/pOM8EQEGhzz8+VWm7UAZpn8FMfkRqLMlsm
-HV/ZozR43xEqME04Z2kCQQCtB/QPWKCXT0URQLydE7QY632kwmpvs+eQCIjdzm7R
-oTeyxMNiHPY2rsRI/o69bxdoCs9O0MQ7Xqfc/+LlwmAJ
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKq6czeLisakrL7B
+RgFqyypqwMvgevZEqgRBt4Gun+YwViaSoDN4JZACAq8zJPj0ihZnogp/AwkbUzeO
+/eXawGelh4WOXLYsj5G9YrAqTvGZ0Gcug6ar1z8YrbEiNlME86CEbUSnD20nGCmw
+owcOMvdn/Uz2QQ3wLeO9llYUDYgFAgMBAAECgYBRiI1xn2B9ETO2PZLzJk80SJse
+Qmw2pAAV3FSIyB5wzfC2pxt+uQgnR+6EQQaNJiu0G3XVUWbfuH77b3xtgxSTIuF1
+Yd7juKibyRI+Jocp3TCvcfHRXYIcs2TKvELJnW68vmM1ESrF51DKegs3nx1gIl5a
+UxcNPRG7QLUcoqB9mQJBAN/iwiKCwWIOOXBFmrVVI5qEnHtmRvMyl8LiO6vbjB4x
+FM8vGcsfDMlE76lm49oV99fp5GFaJxKtHYAVGBmE3Q8CQQDDN7aFBoVoPBxMq/PE
+iNwcsD8WgDx5MP6lf9Spj9A9kteBe9hGx7MThHXcuIAaVwNT0nVH21VaIiK6z5Li
+IjGrAkBTsV3nLsAB2tVn/e0Wikwz8AzbKGGveiM3TAEIfpsDkk94H+BhiSrrdmSt
+C/RzSzEKOroQFnZyydo0Ti5jI8LLAkACd2W68IYm9vt0jIeb6A6/3gouApjA/zl4
+ZdEOA18iKATJAgONgWBl0rqae0pDCu5j1Ljem4rMhLnjmlPEv6HZAkBghH9+vlGK
+hSadajzurl+Q92odXKjAFGBD4WycR5WFs02rlydeaShNsO1t7WlHbijUxuHoQ8H+
+Ga7zcLIcHgkf
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/crl1.crl
+++ b/lib/hx509/data/crl1.crl
@@ -1,8 +1,8 @@
 -----BEGIN X509 CRL-----
 MIIBBDBvMA0GCSqGSIb3DQEBBQUAMCoxGzAZBgNVBAMMEmh4NTA5IFRlc3QgUm9v
-dCBDQTELMAkGA1UEBhMCU0UXDTA5MDQxMzIxNDgwMloXDTE5MDIyMDIxNDgwMlow
-FDASAgEDFw0wOTA0MTMyMTQ4MDJaMA0GCSqGSIb3DQEBBQUAA4GBAIuLgzVXjnTp
-kkBsjVIF8y2qXfrjZEd9QpMR3yJvxFbJG2IOi4yn59B1EJN2RU56R04SE/B2shLI
-Rfxq1CkJDobnQTDnJB+IzpRv8lINT3G+8fDLnFMAak2ellGJcIeR/u+2OfJDJsXz
-keiKEBvmmeNMMkwREDZaLjs++j6BBksQ
+dCBDQTELMAkGA1UEBhMCU0UXDTA5MDQxMzIxNTMzNloXDTE5MDIyMDIxNTMzNlow
+FDASAgEDFw0wOTA0MTMyMTUzMzVaMA0GCSqGSIb3DQEBBQUAA4GBAFYgHrKXdNe8
+vftqy8z/xHDBHH7eQZ2BQaovaswwjI3H+AmhFwEyLb7ReqWehAhVzg+ZcgmMjclo
+bAA/gtE6R4EuYJhvDcBtqT6d+tKFblafASkR13i7kJfw0eAfL6Luf3fj47fgIpuT
+R++Kkw6aII7hp45wsGGC0Cxdtz2DHASL
 -----END X509 CRL-----
--- a/lib/hx509/data/crl1.der
+++ b/lib/hx509/data/crl1.der
--- a/lib/hx509/data/https.crt
+++ b/lib/hx509/data/https.crt
@@ -1,26 +1,26 @@
 Certificate:
    Data:
        Version: 3 (0x2)
-        Serial Number: 9 (0x9)
+        Serial Number: 6 (0x6)
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
+            Not Before: Apr 13 21:53:35 2009 GMT
+            Not After : Apr 11 21:53:35 2019 GMT
        Subject: C=SE, CN=www.test.h5l.se
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:e1:88:84:dd:9c:66:07:3a:f9:aa:05:42:4a:f2:
-                    b3:e3:93:81:71:10:3d:cf:bb:1c:98:a5:73:66:0e:
-                    96:7c:59:12:d0:60:a9:c6:65:88:a8:cc:8d:14:3e:
-                    10:d4:49:8e:64:34:d2:52:ea:0f:03:68:ba:d4:d7:
-                    e7:8a:41:6f:0a:57:67:b8:e7:bb:1e:fa:47:f4:a0:
-                    fe:84:1a:74:1d:8f:f9:51:cb:8b:96:23:8e:7d:85:
-                    af:4d:de:4f:b0:0e:71:c9:11:79:93:bf:54:9a:d5:
-                    77:48:38:33:4f:05:99:bd:48:61:af:ac:73:a7:fb:
-                    23:e0:54:6c:ca:4c:6c:d2:e7
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:bf:be:ec:be:80:40:a4:7d:ec:1b:2d:a5:63:af:
+                    86:ab:ad:44:02:b5:4e:0a:62:3d:25:ee:c6:9c:a5:
+                    bf:b6:86:cc:3f:7c:0a:dc:2c:a5:9d:e4:90:86:d5:
+                    30:5f:81:33:ea:b6:14:0c:b3:f1:b9:c2:7d:e0:d3:
+                    b5:f5:24:3f:ff:ae:05:49:1f:82:c4:d0:87:57:0b:
+                    2c:32:a5:bd:94:b9:70:4e:40:79:31:6b:d1:34:5e:
+                    2c:6e:53:11:84:3c:9b:ab:93:77:91:06:e6:ff:49:
+                    c4:da:ac:84:80:0f:cf:43:e3:ff:a2:5b:68:a0:9b:
+                    39:89:5f:cb:0a:0d:e8:8a:01
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,26 +28,26 @@ Certificate:
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation, Key Encipherment
            X509v3 Subject Key Identifier: 
-                64:1E:F3:78:57:CC:98:D9:B8:A4:59:87:97:BD:7A:14:B3:E9:54:1D
+                1A:EF:75:FF:A0:65:49:25:8F:C9:C2:B5:76:2E:72:22:2D:C1:37:54
    Signature Algorithm: sha1WithRSAEncryption
-        9c:69:61:7a:19:f4:da:a9:aa:c4:c3:5b:f2:80:e2:e4:62:97:
-        35:92:d2:6b:1f:2a:b1:13:dd:90:80:46:7f:50:22:02:76:30:
-        5c:92:73:97:bd:6c:8d:0f:31:96:b8:28:6b:c3:38:e7:44:90:
-        27:2b:66:e7:99:3c:42:51:61:4b:6c:04:d0:10:b0:6d:c7:03:
-        0b:7a:52:f2:49:ca:ea:0f:c0:16:58:d3:b9:a6:e8:7e:9d:5a:
-        d0:bf:85:b1:e3:26:c7:39:a0:c7:00:f8:30:aa:68:e4:9f:56:
-        22:0a:1f:c1:1e:73:5a:f0:88:9f:32:85:6f:37:d1:86:13:c7:
-        94:62
+        28:55:5e:d8:48:42:6a:d5:90:40:fe:de:69:ab:65:f0:bd:67:
+        a3:24:bb:9b:81:99:40:78:e3:49:13:31:7b:26:d2:08:73:0a:
+        af:b6:84:18:22:5b:2a:29:b3:32:e8:99:e3:99:67:9b:85:bc:
+        83:92:e9:32:19:5b:78:03:6c:70:9c:18:f9:fb:f6:19:f4:b2:
+        7b:3f:20:1c:c2:bf:9b:ae:e3:6c:1b:f7:f3:bf:30:17:dd:e7:
+        d8:ef:cb:10:bf:4a:69:2e:c9:68:38:a5:42:c1:28:64:4c:d3:
+        0a:23:32:fb:31:68:31:bb:db:fc:b7:01:73:77:e5:09:8a:f2:
+        fd:70
 -----BEGIN CERTIFICATE-----
-MIICADCCAWmgAwIBAgIBCTANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIxNDgwMVowJzELMAkGA1UEBhMCU0UxGDAWBgNVBAMMD3d3dy50ZXN0Lmg1
-bC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4YiE3ZxmBzr5qgVCSvKz
-45OBcRA9z7scmKVzZg6WfFkS0GCpxmWIqMyNFD4Q1EmOZDTSUuoPA2i61NfnikFv
-CldnuOe7HvpH9KD+hBp0HY/5UcuLliOOfYWvTd5PsA5xyRF5k79UmtV3SDgzTwWZ
-vUhhr6xzp/sj4FRsykxs0ucCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0OBBYEFGQe83hXzJjZuKRZh5e9ehSz6VQdMA0GCSqGSIb3DQEBBQUA
-A4GBAJxpYXoZ9NqpqsTDW/KA4uRilzWS0msfKrET3ZCARn9QIgJ2MFySc5e9bI0P
-MZa4KGvDOOdEkCcrZueZPEJRYUtsBNAQsG3HAwt6UvJJyuoPwBZY07mm6H6dWtC/
-hbHjJsc5oMcA+DCqaOSfViIKH8Eec1rwiJ8yhW830YYTx5Ri
+MIICADCCAWmgAwIBAgIBBjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNTMzNVoXDTE5
+MDQxMTIxNTMzNVowJzELMAkGA1UEBhMCU0UxGDAWBgNVBAMMD3d3dy50ZXN0Lmg1
+bC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv77svoBApH3sGy2lY6+G
+q61EArVOCmI9Je7GnKW/tobMP3wK3CylneSQhtUwX4Ez6rYUDLPxucJ94NO19SQ/
+/64FSR+CxNCHVwssMqW9lLlwTkB5MWvRNF4sblMRhDybq5N3kQbm/0nE2qyEgA/P
+Q+P/oltooJs5iV/LCg3oigECAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0OBBYEFBrvdf+gZUklj8nCtXYuciItwTdUMA0GCSqGSIb3DQEBBQUA
+A4GBAChVXthIQmrVkED+3mmrZfC9Z6Mku5uBmUB440kTMXsm0ghzCq+2hBgiWyop
+szLomeOZZ5uFvIOS6TIZW3gDbHCcGPn79hn0sns/IBzCv5uu42wb9/O/MBfd59jv
+yxC/SmkuyWg4pULBKGRM0wojMvsxaDG72/y3AXN35QmK8v1w
 -----END CERTIFICATE-----
--- a/lib/hx509/data/https.key
+++ b/lib/hx509/data/https.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDhiITdnGYHOvmqBUJK8rPjk4FxED3PuxyYpXNmDpZ8WRLQYKnG
-ZYiozI0UPhDUSY5kNNJS6g8DaLrU1+eKQW8KV2e457se+kf0oP6EGnQdj/lRy4uW
-I459ha9N3k+wDnHJEXmTv1Sa1XdIODNPBZm9SGGvrHOn+yPgVGzKTGzS5wIDAQAB
-AoGBAIOAu6AQInmSzKJzQI086OEIUBBh3Piz7F+hESFv3hURRuQTiMqyxzVNV/F2
-ow90+D67getwqGJffZi/bzVxI9G2ahYinXRrv7K9jHGts3Q1EclnBdfq6p/1+tds
-fHa8oLSuGIl1U5nSYd9kbNOAyxGyEElFFHQTkdXDOBWxTiCxAkEA+d7LwAFmO+af
-zE8wNJNlSqVG9Q7DaWkNAOHHDwMN9ub2N8s3x3AWGe/873/DbchvySI1A0D7cz69
-bqQGQisUSQJBAOcQ4oMSs46bVJ8YlCnNEJBfsHIR/W4V55nvCKPLfwOMcxJnDFyP
-/84pSNEQXwMFwvfeaubYv5HwGdAgX3zgTa8CQCQf/O8mhKRWZHYCYOLJCJTxLkAR
-wVjFElc1TTUzaNpwa9qHK+pOnzNiyfvKSfPeTaMTqfxtca0ovfR4DFuWpNkCQQDf
-thZIJuQXTsY4Hpjce8DstuhjGI3Qdn68J5Sq2MvJSMLkb0alm3lkRc5NM1d52qsw
-RnQjuniHN/oV6jHo+lXbAkAy1Q7INSj0kav9vQxZgQpLEEnW4olDY5uo6WnMN/Pz
-fzC7LPbwXsDf1ucIJheJZPQRxu1YHHPfSTiLOsKgb/f8
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAL++7L6AQKR97Bst
+pWOvhqutRAK1TgpiPSXuxpylv7aGzD98CtwspZ3kkIbVMF+BM+q2FAyz8bnCfeDT
+tfUkP/+uBUkfgsTQh1cLLDKlvZS5cE5AeTFr0TReLG5TEYQ8m6uTd5EG5v9JxNqs
+hIAPz0Pj/6JbaKCbOYlfywoN6IoBAgMBAAECgYEAu84HF7eKmRJ09VHKEk9Tekck
+u/pUy7rY5ZRvl/KISgDRgMS/5lMci//Yxxd8X66u6Q8ZqC9/bVBf9pumNssgmlz6
+Ebs/NMUlNlyc/Q54yEvAsp0m0/4LUUDsTkitwYdZAkjdhQQW49BN4YK/JqQWNLYE
+9ZQLO0e5zTuiiIVfMnkCQQDisNojce50ftM593WvR7oAqk5UkUxJHJpXrJv0s9kR
+GR52qRGLECMvbAoVKUKFl3i+KW8iTIJlIqCKQnjeTdAnAkEA2Ilw+z+aOYD7tcEN
+B/woFwaRCQmfUsYGVbrXej4zg0VyM2+tC8nPl152eOZyEShvmkjKHXf53AAoP4QJ
+NL4FlwJAZLqS44cfnxIvx6Um3PDxPJRwY/GARUh5aJXhYrV7sbZIrA9qJTHRgKPw
+QwDndzccRttgb4wxsMDXNzhcPuOypwJBAIcdjBBa6aNEJsyM/9Kht2pWwJ2BEZeW
+1VEdW2N9+KrK5K3P24zlitGLMiXStg6ayrjc/rFQsepjdrnba9srT1UCQQCHVrjf
+zxmjaEWaJo2v8ZhC47PFoU4I/2a23HLkra1tacoriMa2kCyIBT3LJGxIoia58Bax
+EoQ6P94SI+EB1YXF
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/kdc.crt
+++ b/lib/hx509/data/kdc.crt
@@ -1,59 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 8 (0x8)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN=hx509 Test Root CA, C=SE
-        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
-        Subject: C=SE, CN=kdc
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b3:49:f6:22:e4:bb:d5:b5:e4:a1:64:c1:22:dc:
-                    aa:e1:37:57:8d:9b:6f:fd:9f:d1:5d:c1:30:29:7f:
-                    6f:f1:e4:d9:52:86:06:5f:2e:ef:c7:3a:84:9a:95:
-                    dc:6f:7f:a7:17:13:2f:65:53:05:3c:32:46:44:b8:
-                    ee:7d:60:a9:72:39:21:aa:46:ad:39:44:01:7e:1f:
-                    e9:0f:92:dc:e0:a6:d7:34:64:19:be:3d:3b:d7:bf:
-                    0a:0f:7f:fa:06:04:74:94:6d:72:be:d7:27:12:42:
-                    66:4c:f2:a8:7c:0e:0e:37:23:b4:96:53:bf:30:46:
-                    9d:e7:ab:72:12:86:8f:22:ab
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            X509v3 Key Usage: 
-                Digital Signature, Non Repudiation, Key Encipherment
-            X509v3 Extended Key Usage: 
-                pkkdcekuoid
-            X509v3 Subject Key Identifier: 
-                2A:F2:90:D9:F9:44:52:7D:75:00:2A:40:BC:53:F0:70:D4:F3:E1:14
-            X509v3 Subject Alternative Name: 
-                othername:<unsupported>
-    Signature Algorithm: sha1WithRSAEncryption
-        27:0a:0f:5e:c8:9d:1f:25:17:8a:b8:36:fb:67:bb:06:f6:6c:
-        20:3b:71:4d:c7:c5:44:0a:2e:41:d4:bb:28:b8:c9:b8:4e:57:
-        6b:87:b9:bd:65:10:5e:73:d7:6a:11:73:c8:7e:f1:1e:85:03:
-        45:29:ca:90:17:37:93:4e:c6:4a:76:b3:16:98:cd:38:42:21:
-        ee:4c:81:8a:36:25:34:08:78:e5:fc:60:9e:c0:e3:02:0c:1e:
-        60:46:fe:45:5d:4d:27:22:7f:73:d4:3f:05:ef:7e:d6:ed:3d:
-        50:d0:23:8e:30:55:f0:30:d1:e9:d7:cd:10:a4:b1:87:2d:5e:
-        e1:0e
-----BEGIN CERTIFICATE-----
-MIICVDCCAb2gAwIBAgIBCDANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIxNDgwMVowGzELMAkGA1UEBhMCU0UxDDAKBgNVBAMMA2tkYzCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEAs0n2IuS71bXkoWTBItyq4TdXjZtv/Z/RXcEw
-KX9v8eTZUoYGXy7vxzqEmpXcb3+nFxMvZVMFPDJGRLjufWCpcjkhqkatOUQBfh/p
-D5Lc4KbXNGQZvj07178KD3/6BgR0lG1yvtcnEkJmTPKofA4ONyO0llO/MEad56ty
-EoaPIqsCAwEAAaOBmDCBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DASBgNVHSUE
-CzAJBgcrBgEFAgMFMB0GA1UdDgQWBBQq8pDZ+URSfXUAKkC8U/Bw1PPhFDBIBgNV
-HREEQTA/oD0GBisGAQUCAqAzMDGgDRsLVEVTVC5INUwuU0WhIDAeoAMCAQGhFzAV
-GwZrcmJ0Z3QbC1RFU1QuSDVMLlNFMA0GCSqGSIb3DQEBBQUAA4GBACcKD17InR8l
-F4q4Nvtnuwb2bCA7cU3HxUQKLkHUuyi4ybhOV2uHub1lEF5z12oRc8h+8R6FA0Up
-ypAXN5NOxkp2sxaYzThCIe5MgYo2JTQIeOX8YJ7A4wIMHmBG/kVdTScif3PUPwXv
-ftbtPVDQI44wVfAw0enXzRCksYctXuEO
-----END CERTIFICATE-----
--- a/lib/hx509/data/kdc.key
+++ b/lib/hx509/data/kdc.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCzSfYi5LvVteShZMEi3KrhN1eNm2/9n9FdwTApf2/x5NlShgZf
-Lu/HOoSaldxvf6cXEy9lUwU8MkZEuO59YKlyOSGqRq05RAF+H+kPktzgptc0ZBm+
-PTvXvwoPf/oGBHSUbXK+1ycSQmZM8qh8Dg43I7SWU78wRp3nq3ISho8iqwIDAQAB
-AoGABjZ26AijFanC7XDPXITnCvze9NJBFDnYiHYsVBPNbkVu3nQ0flHjDzVQ6QZu
-aBK1WJBaoRk6Yjafxrvdz8xssrCun+L9Y4PoZxkpCFz0185k3Vv5MMxwQMMZDV91
-ylXtKZyf7d1XmJPhj9S6otz70VG6hPY25EkLqAeZwOl/yekCQQDpwJMBEDWEtenL
-xjVknzgwbHiST5NWzxc+ZO72U6O+VDE66vFcTxVUC5pDRYtEeRMnY4Gd67qQrX6S
-lCa7AxlfAkEAxFpgP7h2d/L58Zlhc+HQOl8Juy6+nM8jjICNCOYYzwg0Gh7poXTp
-Q1VurcFzXdpR6oY1p/ouXMeYabcyyKZeNQJAPTvFRrIIUwuUg10Y/5L2FTlVHH7c
-ChGV9TJbpwuiCWnku5pwP843uByR/K1rHjTZX6ghfE0UQnIwhhVpT/Qv4QJADeVP
-dnL5f1ektKJkMS1D7T2YlLSkLLjEDUdzs7OFAfHUrhyN8C0z7N347TcJkRTIQ06o
-MXEVIt/FO4YJhAWyGQJAdk9hFZ4AiqM6oJfIfCRz5GknS4gMY4Y6Pck2D5QAQhnt
-U0ASSXngYPq9UJW1lyqJVPDqP3dR3kYTU6EdP8CKjw==
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKpI7d4P760+Ox8v
+v8zFz5RX1YYYkn1ZaPnJ0k9zV1bbxxDbI+1DOtvesfqKVvkXAYKbj8EruUeW0+r5
+ds/roiakBsb+i9ZIpSpHRIlD6CwykJxGn0b93SKumyPk13QcjvaomYeAOGpz1Tbn
+jMratL8+17/E+Go1U575nH+isGZJAgMBAAECgYEAohj+Zi8hZvcgbJWVrSZ4bawX
+FKl7eVuNdIrMatlPQN3B56fT0V34P6kEH41lMYTW6S+QbsBihWVsofeLRG34UeV/
+i3+jZJHVwwQGqtduxqNScbieYkLiHNWfQvNYePtdG3SSGeJrG+FlH1nDlQp/4B44
+J3k2mrMDaepVaSrcnOkCQQDh78OO72n77rpIxLLzluZhRr/5x7WiCqFPSqQoueVP
+JlW9tppah5yVT3A/Fy3+hT/lkuoYlnj98HG396jdcEMXAkEAwPF2YtqOofDPZqnc
+itv+rdrGYhkBrqlycecgmN5vyfYfICjhdVfpy6R1dGP9M42cyWZLtWbXmIQ0vgHC
+oz/9nwJBALbkOn5rCXUZo4wiReXvQiB+gAq3Ai3gwwGHn2kkSh6PHpsKxNoBqtwm
+yOsZXW8J+FZjXcJ3lAuj5roP7Y8LQBMCQQCFCDfrUuyTZdlq3OWubJ8+OiEc1Ecf
+qb+6H3WPUZdcdjHh164UXWhbO+qsNKEJYbPf/YNn8R/oDgfblpUgQGfbAkEAxi2H
+J+hdGEOW0KZ11vsGfHokH6EO9KcidS38DoxCJlhry0aHiaGarutbFttcfEa5IJgF
+8etEdZ9RYU091sIiWQ==
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/no-proxy-test.crt
+++ b/lib/hx509/data/no-proxy-test.crt
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICDDCCAXWgAwIBAgIJAMJEvwnR1+2cMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
-BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE0ODAyWhcNMTkw
-NDExMjE0ODAyWjA0MQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MREw
-DwYDVQQDDAhuby1wcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6fW3
-th+tIlkuLd0ovmQqumtF4PZqwWp724REsdfVW4CMmnYm4WeI9isI+1KVgUFpLxKP
-KjrnYPmgiGRGpYTiRxzjkZHJfgZwtCQa4SV0V81iuhKBVwfIxT/l6GSioZ6Gue2q
-WcHnhM/vJQtNUdBeUdEexJkx/w7Zsvk7fI7kZQECAwEAAaM5MDcwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0OBBYEFL8+ODIOT7HCsmqZgNXbHGgH0waAMA0G
-CSqGSIb3DQEBBQUAA4GBAI9UWIUZIRCJGajoPxU45IbrwabILNZX4Ue1oYAowV9z
-2aniOySf3o6nPZsQCYJrCtyTy+1uS7HUiC2IdaHUJk2GWXx0PckwyDGhUyy3kKS3
-spmXjLHq0/sb5PIyj9egHlxCfPlWy9psCQIyK2EkOcR6UjXi3H3SAHjPYlIEUeHb
+MIICDDCCAXWgAwIBAgIJAMJEvwnR1+2fMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
+BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE1MzM1WhcNMTkw
+NDExMjE1MzM1WjA0MQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MREw
+DwYDVQQDDAhuby1wcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvN/6
+llKNlZiL21BteyObti+k27kiz0+XpDIownHVWuTEX9QF28dTUmDCypcH7lMGxjEm
+6JLjx6/t7Q/Ya+UzmB2JmeY7o2LI9Yaoz93m3WfAFeU5iyYSnBU/xZneOGsLfCfR
+awpgm9UWuKsNtSTf8Htrlx9LXZAmYvMVcyDzS60CAwEAAaM5MDcwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBeAwHQYDVR0OBBYEFBTcyOhKL/Xr7N9jTLicnMRdpJRaMA0G
+CSqGSIb3DQEBBQUAA4GBAKlIZLQepMqRq2oaGLEqjtD2VXqAFaGIuPeQIaGyrgQc
+IHXAoXemkhQTB67Hgis7/kgL3r1gSKt1/Uq/MyCD4lqK3Epb2SfHDWLGDFW8mACS
+xbWbAlI+4Qy4L4oLFr+biXvOh1D6HQFQi39cbtrRuqF5OiD7FlzqImmhGc8I4LQJ
 -----END CERTIFICATE-----
--- a/lib/hx509/data/no-proxy-test.key
+++ b/lib/hx509/data/no-proxy-test.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDp9be2H60iWS4t3Si+ZCq6a0Xg9mrBanvbhESx19VbgIyadibh
-Z4j2Kwj7UpWBQWkvEo8qOudg+aCIZEalhOJHHOORkcl+BnC0JBrhJXRXzWK6EoFX
-B8jFP+XoZKKhnoa57apZweeEz+8lC01R0F5R0R7EmTH/Dtmy+Tt8juRlAQIDAQAB
-AoGAf2xy6GCMPX7w5c3kWP3ZP7sZThMnxbwnRUHe4DW7YKC884uSVYW8VMbPl4I9
-Jy7nCNpE2y1Fw81xn5dt2sxrKGF6gPaJBKMQD/aeOtS/tTNmLbCdRo/Qo/I/w6MV
-rf3qZvn6CmRX5CqZSV5u9BU8WYseCbruCr9dFD1wLroah7kCQQD3zO9oYGNySNHK
-sfTRiKI55WRpgFEKe2hd78Fdo6nBfC/yeSB+VadGmLePamMxT7fbB2Yz+PIKRJct
-U2IXlp9vAkEA8bOKeNzo+eElVOAvMXZU3CWrcmOPK0fp7BrcJRDys9Pd9qb43szU
-nGP7rfH5tT6MXerPSo8IMCzxuK62FWkKjwJActXLAMDidRzf9CIiBVRfcZsnvGiV
-pdjo1dd88csdqSfHBIQzlbhV67ZsIo835qs91cgJCf7NFAsTUBL7O1k3CwJBAOe5
-qliV8wcexBvLk3Nob5Ngyi6xJOHp4GtslQM0bHvb9EI1cwSofG4zrWfnRfBuN0UT
-igmBd+g4LsdROWDthCECQQChetAFhke+8s1Htb9WelaTHeqa02yXJhUcg9YeNSe4
-kXd7VTHOOOlxtSU3+uIq9wkeGl0sSIbQaLK3AqExSzK6
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALzf+pZSjZWYi9tQ
+bXsjm7YvpNu5Is9Pl6QyKMJx1VrkxF/UBdvHU1JgwsqXB+5TBsYxJuiS48ev7e0P
+2GvlM5gdiZnmO6NiyPWGqM/d5t1nwBXlOYsmEpwVP8WZ3jhrC3wn0WsKYJvVFrir
+DbUk3/B7a5cfS12QJmLzFXMg80utAgMBAAECgYEAs702PB19jXIpDeGA/mFJilvW
+uB576OtmdKQjM7+eeSwhUMx1csxCF6/rT13g90TdungF/efjiiF6+1FL9ImeyS4p
+5E2aoy1mC62SQWAVPFfxfHxbuHtjthyFI10I8MNB9tynXSBGwtjOClWfyLHmUVPb
+dRAp2n7v9262edT0RSECQQDfUNBA6Gy+uLYahaPIrGb3QPz2JxOJK+KFAMLJUyWR
+gnJVkKiNQmTIoN5V1D/MbTQGXa6zX+gZ+ztfWDUQxj41AkEA2IS9Ygc2CIFi4Gd+
+6Cj0Rw5G6WHTIbFYRrRmD/KmNG6CS/2CNtQ6B85Zsiz5fZNRkKv/e8fibkxDCgJj
+eNNmmQJAO99r5msqdLwLPvMjpXLrrFEFQW3apAVbFzPMBbRAN1IVG3HMbwslAFF5
+KuPcMw/4SdimNTt6fDTKh1ab66JrHQJAN+ISy0FXNdzHO2oa/CrN2aUaslPYXYLb
+aOxYx1b2hOPc52YX/LTMAYXF6tHm1v11+OQbvcP6ckNmrietqtrNSQJAFhRkI7VA
+6i9/esJoKfP6EqDi+LLiJLjBp4s7Asq32/7F0FO6f3ced0J0uSHcXBZWN4PNmewC
+iMC+Ku23zN81aQ==
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/ocsp-req1.der
+++ b/lib/hx509/data/ocsp-req1.der
--- a/lib/hx509/data/ocsp-req2.der
+++ b/lib/hx509/data/ocsp-req2.der
--- a/lib/hx509/data/ocsp-resp1-ca.der
+++ b/lib/hx509/data/ocsp-resp1-ca.der
--- a/lib/hx509/data/ocsp-resp1-keyhash.der
+++ b/lib/hx509/data/ocsp-resp1-keyhash.der
--- a/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der
+++ b/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der
--- a/lib/hx509/data/ocsp-resp1-ocsp.der
+++ b/lib/hx509/data/ocsp-resp1-ocsp.der
--- a/lib/hx509/data/ocsp-resp2.der
+++ b/lib/hx509/data/ocsp-resp2.der
--- a/lib/hx509/data/ocsp-responder.crt
+++ b/lib/hx509/data/ocsp-responder.crt
@@ -5,22 +5,22 @@ Certificate:
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 21:48:00 2009 GMT
-            Not After : Apr 11 21:48:00 2019 GMT
+            Not Before: Apr 13 21:53:34 2009 GMT
+            Not After : Apr 11 21:53:34 2019 GMT
        Subject: C=SE, CN=OCSP responder
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:cd:59:73:92:2f:01:61:d0:7d:25:c5:41:33:45:
-                    2f:99:0d:3c:04:82:c0:74:b5:7b:aa:d1:7c:78:e7:
-                    19:03:7e:22:d0:67:a9:e2:7e:33:6c:e3:fa:a0:22:
-                    6d:1b:e2:f4:e7:d8:9e:bf:c1:77:d2:a6:f3:7e:3b:
-                    33:06:bb:c8:89:ba:33:5a:7d:53:98:ae:98:48:2b:
-                    11:bf:b0:3b:47:21:1d:b9:0e:49:1b:fc:90:3f:e0:
-                    94:42:40:dd:14:7a:57:96:27:02:26:1d:8f:2e:ce:
-                    5b:1b:62:26:cd:70:b7:d7:8f:6e:24:8b:a9:a8:6f:
-                    07:26:c4:d5:40:a2:8d:dd:13
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:c0:19:81:a4:65:cb:94:02:71:90:2b:e8:2a:aa:
+                    bf:c3:54:68:e6:f3:2f:24:c5:de:bb:21:01:44:05:
+                    33:5b:d5:fa:91:90:13:18:09:f6:18:f4:58:f5:db:
+                    d7:ee:a3:d9:80:54:09:d7:cd:0b:d0:dc:7b:8a:fe:
+                    56:0f:df:f3:e3:d2:a8:12:c6:8b:aa:1d:37:78:cf:
+                    88:83:da:74:57:ad:44:3a:a7:f1:cc:bb:26:99:12:
+                    1b:9b:75:d3:78:46:02:7c:9c:a9:8b:11:7a:21:3f:
+                    85:5d:d3:38:d0:d1:54:fd:d6:be:0d:53:95:a6:10:
+                    9a:cc:f6:79:5a:25:52:2d:05
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -30,27 +30,27 @@ Certificate:
            X509v3 Extended Key Usage: 
                OCSP No Check, OCSP Signing
            X509v3 Subject Key Identifier: 
-                4B:13:19:BC:43:E6:09:6F:BD:EF:B4:C0:92:D9:9C:52:86:A1:B7:B7
+                58:5F:03:EF:00:8F:12:C8:77:30:07:7C:79:FA:3B:54:2C:4C:10:1D
    Signature Algorithm: sha1WithRSAEncryption
-        84:f4:14:8a:8f:56:2c:30:4c:9d:47:19:91:a0:60:a1:5f:81:
-        12:c5:f9:5b:c2:41:5e:bc:34:43:6c:2d:ed:9f:2a:19:4e:62:
-        5f:3f:f7:c3:f6:88:8b:2f:a3:8e:cc:92:90:85:2c:5b:25:cb:
-        09:c7:d2:83:2e:d3:3d:1b:3a:92:78:ad:24:02:66:2b:cf:cd:
-        73:71:e1:2f:a0:c9:b1:2c:a0:66:03:e3:1d:80:f3:07:95:b2:
-        4d:c8:0a:59:44:75:07:ce:96:ff:f6:22:04:9f:66:96:a3:a1:
-        8d:7a:a1:a6:ea:cd:28:19:57:9a:d8:b4:da:66:79:7f:c5:a4:
-        17:0d
+        6b:f7:05:03:db:3a:23:01:76:21:87:5d:03:0e:cd:dc:a7:e2:
+        bc:9b:0f:08:0c:d3:d4:eb:a4:c2:1a:37:13:f1:5b:77:5f:6a:
+        48:bb:b8:1f:b3:ff:91:a5:bb:24:58:83:78:9b:f5:b7:53:3b:
+        10:67:60:30:53:69:78:54:88:94:80:83:f8:c6:72:74:e3:66:
+        e7:98:94:69:14:7f:22:f4:f6:18:a3:7c:0c:88:4b:c1:02:c7:
+        2a:b9:aa:50:0e:57:45:7e:4f:6e:d7:bd:78:ef:0f:70:ba:84:
+        c1:c0:23:9c:52:c1:60:b3:13:a4:58:a2:43:84:51:22:aa:2f:
+        59:6f
 -----BEGIN CERTIFICATE-----
 MIICHzCCAYigAwIBAgIBATANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMFoXDTE5
-MDQxMTIxNDgwMFowJjELMAkGA1UEBhMCU0UxFzAVBgNVBAMMDk9DU1AgcmVzcG9u
-ZGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNWXOSLwFh0H0lxUEzRS+Z
-DTwEgsB0tXuq0Xx45xkDfiLQZ6nifjNs4/qgIm0b4vTn2J6/wXfSpvN+OzMGu8iJ
-ujNafVOYrphIKxG/sDtHIR25Dkkb/JA/4JRCQN0UeleWJwImHY8uzlsbYibNcLfX
-j24ki6mobwcmxNVAoo3dEwIDAQABo1kwVzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAeBgNVHSUEFzAVBgkrBgEFBQcwAQUGCCsGAQUFBwMJMB0GA1UdDgQWBBRLExm8
-Q+YJb73vtMCS2ZxShqG3tzANBgkqhkiG9w0BAQUFAAOBgQCE9BSKj1YsMEydRxmR
-oGChX4ESxflbwkFevDRDbC3tnyoZTmJfP/fD9oiLL6OOzJKQhSxbJcsJx9KDLtM9
-GzqSeK0kAmYrz81zceEvoMmxLKBmA+MdgPMHlbJNyApZRHUHzpb/9iIEn2aWo6GN
-eqGm6s0oGVea2LTaZnl/xaQXDQ==
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNTMzNFoXDTE5
+MDQxMTIxNTMzNFowJjELMAkGA1UEBhMCU0UxFzAVBgNVBAMMDk9DU1AgcmVzcG9u
+ZGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAGYGkZcuUAnGQK+gqqr/D
+VGjm8y8kxd67IQFEBTNb1fqRkBMYCfYY9Fj129fuo9mAVAnXzQvQ3HuK/lYP3/Pj
+0qgSxouqHTd4z4iD2nRXrUQ6p/HMuyaZEhubddN4RgJ8nKmLEXohP4Vd0zjQ0VT9
+1r4NU5WmEJrM9nlaJVItBQIDAQABo1kwVzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+4DAeBgNVHSUEFzAVBgkrBgEFBQcwAQUGCCsGAQUFBwMJMB0GA1UdDgQWBBRYXwPv
+AI8SyHcwB3x5+jtULEwQHTANBgkqhkiG9w0BAQUFAAOBgQBr9wUD2zojAXYhh10D
+Ds3cp+K8mw8IDNPU66TCGjcT8Vt3X2pIu7gfs/+RpbskWIN4m/W3UzsQZ2AwU2l4
+VIiUgIP4xnJ042bnmJRpFH8i9PYYo3wMiEvBAscquapQDldFfk9u17147w9wuoTB
+wCOcUsFgsxOkWKJDhFEiqi9Zbw==
 -----END CERTIFICATE-----
--- a/lib/hx509/data/ocsp-responder.key
+++ b/lib/hx509/data/ocsp-responder.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDNWXOSLwFh0H0lxUEzRS+ZDTwEgsB0tXuq0Xx45xkDfiLQZ6ni
-fjNs4/qgIm0b4vTn2J6/wXfSpvN+OzMGu8iJujNafVOYrphIKxG/sDtHIR25Dkkb
-/JA/4JRCQN0UeleWJwImHY8uzlsbYibNcLfXj24ki6mobwcmxNVAoo3dEwIDAQAB
-AoGBAIp1fwyZLyhh6JA4IY9NXhunpckw1E2dNMZnu7LVt7L4MMcuroiuKUSJr6qb
-q8/6xsEw+VE4RO+/bDy3897dbQfjVuNBYxQ4rpVlG2SfpuNIuRXEYBj4bMTH44pf
-44NUG1Bd81kJ5SRFS3d/BPX+jmz/uTy1mx4Gmy0viqf994XpAkEA5pXByoFFg6DP
-xLM3LgLpuPVy9fkg0qBIFRXRcXQDzwyqScwtGmhJB9PcN1Ju+mLOJgeLy3Nuqeod
-a6XfiDi4bwJBAOP7pDPRqTGiygvubEQebbwQtyYDrPOHOtBRX4JI7ymy3Ke5FLPu
-8GvKF00B4wh1uaGhD2SFtjqeITfox3MNz50CQEblSJ4wvOTJrtf1mkOlVaMupFgI
-bxUTftYszSaq2vjwFfN2uW9jHQExHIZN7B1D/8oli8/T//RyLPWKHH5PojUCQE4G
-7BYIJd4lFv2qZkeSGoCJQAW0sFbQ66Isl4GhsKkW3EpTH/DNUF+z1PG4OZnFoPje
-hMQkt0+smzXlZ43LJkkCQQCbiSeRyXQ9AsjIPJZjRspvBaiHllR79Ye2GSI60s0a
-mbWk5ZGIZTQQwm9ZjggX8KzSsaZt8Rk88yrGLx+eZeNm
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMAZgaRly5QCcZAr
+6Cqqv8NUaObzLyTF3rshAUQFM1vV+pGQExgJ9hj0WPXb1+6j2YBUCdfNC9Dce4r+
+Vg/f8+PSqBLGi6odN3jPiIPadFetRDqn8cy7JpkSG5t103hGAnycqYsReiE/hV3T
+ONDRVP3Wvg1TlaYQmsz2eVolUi0FAgMBAAECgYEAtiF4wR2ifpoygbafUJTDa7bE
+HvPCZuMT4efRA2TK5O9juk8XS1tmcRJ6pd/iQugmd302N9y4rzXcDFRH1JVI7bp8
+uxBF/9O2jlpkCYhB59AEWF+QRaDlbzKHFZ/ozzgA2KlepFKit7xYxyHQMEMGGXu7
+OO2SGxTVKIoSnSmCTgECQQDtPcNT/DoQDKb9w+WSkw9f7UpY6ZSffa2GZ03YSIwD
+HzkRHJalEIZkj4UGvFHffCfIkD34RBJXyrrEL/6RY/pRAkEAz0n8mTfL+D6N2iFJ
+GDSrvACEHjc7TOOv9EsYKJMAbe7lXpApUacqEffotS+5PNZxyJ0yCRqhTkkDEiup
+PzmdQJAeK+RvRizhNSa4r8T+0N6b8crqh1xMM1jR9sne540M6ZfhnfvnprQczmb
+Z3jHgZQMPPg7vh8K4cRMzF7J9rZQcQJAWZVtED537RIDtgh6kXZ53acPcguGmkUw
+TtCBYU+eeOQsxoBhCwPGf7t3G47DbFJ1HDErZZnXqoCNTjYGoC+T3QJBAJVSo00N
+qEi54lAdQWOch7HSevZ9YFtocJOCCb1AJL/yWuuGbZuIU4jTayQqsyducq8dzi6z
+W/1sLlGRelsWACg=
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/pkinit-ec.crt
+++ b/lib/hx509/data/pkinit-ec.crt
@@ -1,51 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 7 (0x7)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN=hx509 Test Root CA, C=SE
-        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
-        Subject: C=SE, CN=pkinit-ec
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-            EC Public Key:
-                pub: 
-                    04:13:a2:43:8a:9a:e3:92:ba:57:e6:a8:fd:22:51:
-                    9f:27:d4:90:b1:ad:b3:c2:c7:89:a4:03:42:79:bc:
-                    1c:f5:1f:f9:59:b4:69:37:f1:77:2d:53:6b:41:cd:
-                    e1:76:e8:2d:04:f3:41:71:5e:d8:f8:82:00:d2:45:
-                    54:fd:3f:ba:6c
-                ASN1 OID: prime256v1
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            X509v3 Key Usage: 
-                Digital Signature, Non Repudiation, Key Encipherment
-            X509v3 Subject Key Identifier: 
-                9D:76:D4:22:B7:4D:76:B3:A7:65:22:DA:48:E1:3D:36:B1:39:52:41
-            X509v3 Subject Alternative Name: 
-                othername:<unsupported>
-    Signature Algorithm: sha1WithRSAEncryption
-        92:18:2f:7d:86:a5:28:62:d2:5b:f0:57:c6:f1:1f:c0:2a:ef:
-        e3:76:6e:7b:1a:16:11:5c:7f:10:0e:76:fa:4e:02:13:f5:02:
-        09:c9:11:81:f2:ba:ec:4c:c0:ad:24:7d:b9:74:67:72:11:27:
-        ee:43:7a:19:45:e7:4d:97:93:d2:92:06:8f:42:a7:f8:2d:dd:
-        fe:c0:31:56:79:51:ea:a5:2b:e9:ac:4d:a3:43:12:bd:9d:6c:
-        8f:98:82:08:94:d1:50:b7:ed:a3:d6:a8:7d:bb:9a:68:1b:b8:
-        ae:ae:a7:66:0c:f1:8a:e0:b0:d6:78:c7:d5:09:ce:82:8f:f1:
-        ed:8d
-----BEGIN CERTIFICATE-----
-MIIB7TCCAVagAwIBAgIBBzANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIxNDgwMVowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCXBraW5pdC1lYzBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABBOiQ4qa45K6V+ao/SJRnyfUkLGts8LH
-iaQDQnm8HPUf+Vm0aTfxdy1Ta0HN4XboLQTzQXFe2PiCANJFVP0/umyjczBxMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdDgQWBBSddtQit012s6dlItpI4T02
-sTlSQTA4BgNVHREEMTAvoC0GBisGAQUCAqAjMCGgDRsLVEVTVC5INUwuU0WhEDAO
-oAMCAQGhBzAFGwNiYXIwDQYJKoZIhvcNAQEFBQADgYEAkhgvfYalKGLSW/BXxvEf
-wCrv43ZuexoWEVx/EA52+k4CE/UCCckRgfK67EzArSR9uXRnchEn7kN6GUXnTZeT
-0pIGj0Kn+C3d/sAxVnlR6qUr6axNo0MSvZ1sj5iCCJTRULfto9aofbuaaBu4rq6n
-ZgzxiuCw1njH1QnOgo/x7Y0=
-----END CERTIFICATE-----
--- a/lib/hx509/data/pkinit-ec.key
+++ b/lib/hx509/data/pkinit-ec.key
@@ -1,5 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIMJMVBJ2dFrIShCgDWsA8aewbFKgmVCGuxUjX1awRPoLoAoGCCqGSM49
-AwEHoUQDQgAEE6JDiprjkrpX5qj9IlGfJ9SQsa2zwseJpANCebwc9R/5WbRpN/F3
-LVNrQc3hdugtBPNBcV7Y+IIA0kVU/T+6bA==
-----END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgA8YF6zxpXOA/gd3U
+9bRQDy/1X8CiUpXmL6RmsXjDmkyhRANCAATEM1HfyEQJ6Xqrln2BjEIeYMINK2Fw
+ez+m2Q+C/tQ/njSj69w4wlPaGw4O11h5MRmPtscm0nfWnu8oZJ2HTwmj
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/pkinit-proxy-chain.crt
+++ b/lib/hx509/data/pkinit-proxy-chain.crt
@@ -12,59 +12,3 @@ AAOBgQCVZsiDTI6klQ1KFUaD3IguHjIAd+FN0WYzRJLfTZzrSrgFi7OIswGSi68X
 lhKIIt+7KP33K2Yw80pj/r58OHf+IJH70xFfsKefxyeNDl3Spg3DZQoSaUG+UWv1
 lvBHJ+5c5XQcA1QLZU//GPbk/SF0rLgx/3wo7ZJnVJCgSLGLKA==
 -----END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 6 (0x6)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN=hx509 Test Root CA, C=SE
-        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
-        Subject: C=SE, CN=pkinit
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:98:f3:f9:84:dc:ba:51:5b:cf:a7:04:91:37:02:
-                    f9:d0:0b:40:66:a5:7f:2a:2f:89:32:ac:94:ec:00:
-                    42:76:56:b9:38:e1:81:4d:07:16:d2:f1:2d:91:67:
-                    81:d4:07:4d:0a:ee:80:9d:ce:b3:b4:04:86:14:5e:
-                    b6:50:e2:e5:e0:96:a3:32:e1:56:90:9d:59:d3:5f:
-                    b8:1e:91:c8:94:e2:8f:0b:21:e3:da:43:16:00:30:
-                    aa:d9:e0:c4:8f:3b:6b:a7:d9:fc:57:6d:a5:54:ab:
-                    5f:f8:4a:54:87:34:06:5c:44:25:98:99:e2:bb:62:
-                    10:e0:ad:25:27:cb:58:a5:4f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            X509v3 Key Usage: 
-                Digital Signature, Non Repudiation, Key Encipherment
-            X509v3 Subject Key Identifier: 
-                B4:B4:31:F7:E1:14:21:18:D4:59:D2:4D:37:4E:06:CC:6A:F6:53:00
-            X509v3 Subject Alternative Name: 
-                othername:<unsupported>
-    Signature Algorithm: sha1WithRSAEncryption
-        6d:63:a4:dc:95:ea:ca:05:e0:e9:e1:79:b3:41:8f:1c:80:dc:
-        61:41:1a:43:79:d0:f5:37:bd:7c:1f:7e:ea:ee:bb:33:3d:46:
-        48:2e:ee:22:7a:b1:a0:5f:b1:e0:81:7a:8f:12:f1:80:5a:0c:
-        db:47:ce:14:8c:c7:2f:7e:47:d7:63:fe:3f:62:a5:74:99:b7:
-        e7:58:24:c3:49:b8:b0:e0:f0:f0:5f:df:13:de:7e:5b:57:ee:
-        65:6d:51:17:51:02:c1:20:f3:e4:82:e7:fc:4a:95:01:d9:15:
-        89:4f:96:71:db:1e:66:73:4b:ad:be:3c:89:d3:b0:cd:50:aa:
-        40:e8
-----BEGIN CERTIFICATE-----
-MIICMTCCAZqgAwIBAgIBBjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIxNDgwMVowHjELMAkGA1UEBhMCU0UxDzANBgNVBAMMBnBraW5pdDCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmPP5hNy6UVvPpwSRNwL50AtAZqV/Ki+J
-MqyU7ABCdla5OOGBTQcW0vEtkWeB1AdNCu6Anc6ztASGFF62UOLl4JajMuFWkJ1Z
-01+4HpHIlOKPCyHj2kMWADCq2eDEjztrp9n8V22lVKtf+EpUhzQGXEQlmJniu2IQ
-4K0lJ8tYpU8CAwEAAaNzMHEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0O
-BBYEFLS0MffhFCEY1FnSTTdOBsxq9lMAMDgGA1UdEQQxMC+gLQYGKwYBBQICoCMw
-IaANGwtURVNULkg1TC5TRaEQMA6gAwIBAaEHMAUbA2JhcjANBgkqhkiG9w0BAQUF
-AAOBgQBtY6TclerKBeDp4XmzQY8cgNxhQRpDedD1N718H37q7rszPUZILu4ierGg
-X7HggXqPEvGAWgzbR84UjMcvfkfXY/4/YqV0mbfnWCTDSbiw4PDwX98T3n5bV+5l
-bVEXUQLBIPPkguf8SpUB2RWJT5Zx2x5mc0utvjyJ07DNUKpA6A==
-----END CERTIFICATE-----
--- a/lib/hx509/data/pkinit-proxy.key
+++ b/lib/hx509/data/pkinit-proxy.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQC8XNkTKG3DCghUBwMHVXtEMJ50HpxWe7WmzabEkfOyqi35jU9W
-/pkRHjoYXI5tdmdtg97WaEYMmEp5M07LTp4CO2Td4zBK9dO5b4KWjtxeQdSwZT9K
-SqxE+Vayv1C9n/aGx3l9a9Yq3+BlvPeW/emj1ssYqOeb90P0lnR6DWhzrQIDAQAB
-AoGAHt/BHOjFhPCCCPPVRUB3oeeuMS5LRcmlLqAKs7GQljpaqsrEtGeqwymHMDML
-jVmY/lRdFBunT60ul8sXIS/TqhWS+IJFh+rg8CGPn2ODe1BNybovNtufG9Rea7nt
-nx7gUrY6D9Rv9nj5boQgQnjv1hJZhf5iNZPB021+D15DuIECQQD1AAbnN+5g51dj
-u29nEMcLOY7w0bZU+umEIwqztysDoIvXxwlIkxWVLaFnDBVBI3VYHmS+hJumJUpR
-9h4n8GxRAkEAxNHYDQhfPboGwj09e4Ti3DW/+91rSG/ts5ZRPfKtn7u0JKH19fyd
-cZgKOH4/gSPQ7VvPUwDEmHA8kA1gUkImnQJAP0pMfjqiqAHbP3ZSJwvcf3fVBz0F
-nxpabLoor5hn0j4NIibWrRrh/nGVOmuSqgsg6yye1eCn3NnRQy8TRzoCoQJAYx36
-W7XXoNJKDQ+iIs4tIRDAeiprmLMlVcdhan0ICuUQN1KI9zQcZdRXcVPCz1omISKX
-Kgm897euCC10UHiX0QJAd85xJ55g3JtAV/bIKjFfCv3/X+cifG3Yv0qQas8Xju8p
-lGFhiqi3RF1TNRvxEyFyFxYeHoWZ5HtlnDSGL8H1gw==
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALVGGiOvMHti2nta
+a0FFAYeOs6swcbS6ykAFgSiWBsyZOMAyQftitOEV0IUpoI+52NTYQ7J3AuyEiroM
+Ryk2PUcU3my9k3/qcLQGrOVZm6vfUqYKUeC+CdI/JDkGxBf0T74h5CvBZhoC5fzN
+Z/cNGy5mw6jPH8qSZX9UEBKGO81TAgMBAAECgYBEGeMGFvHi2N91yiFTMwaBE9Zh
+8OA24pnK9YZxZfOF9+Y/JmJte8aybQyaimn8tPhF9j1wlY9updisTqKJVAwuvnTu
+uZO6qHeKfeNdn+y6s4f6hLBM+9Ty/sYG3Q5iHF+uUapWRVLOiDWCbCVg/QJZgpO3
+tww9zA+C2tYO+ggacQJBAO44pv/WAPeuSr7/2VbMXFVzSXyxhoSFkOfubTKO5umv
+4AtMsWQXjRVV6qylscJqlpWe1WXk9xU4csShNkdwx7kCQQDCzW//PZTyl0rvbCES
+1DDqMw/ad3uW21j6NABODhWYI2vohf1mH4tY7aHrm7cBrz8QRqAfOvaBSkxok/iu
+jmtrAkAyVSf70CSeMGY8muQ58a3kpBo3zW6Fm471YiwSTZ0+bNmiqY6lflBh3Khb
+2BqJ4Gl2rXubLtiB1E5zezhzucGJAkAKR1C7hQJQ8o6vp2LvXWbfVKZnfpp00UoW
+mZvSgoe9KVFOSZOfSdbOcGt0xRiY7ChFsZRNUY0kMUlq0zPx8e3VAkBLunkMZmMC
+TjQc8zvpe4+4Hzevia+Mf8yCl48XDYVYvoJ+POIOumSwdD6GqfQVype+Z42FTus6
+umvosP1r/Y9V
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/pkinit-pw.key
+++ b/lib/hx509/data/pkinit-pw.key
@@ -1,18 +1,18 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,1D3412D4BC4B83A074369DD37A235A06
+DEK-Info: AES-256-CBC,6BB681A9006AAB625FB4F6ABAAAD70E3

-gbigerGjK/y7uOByTAObxdROrhA1MWeab5yvAm0R2yMyYgQbUgfSO6oDKj57T3aI
-HrnK6q7DPZPhjtH2LMhwrspdQzyrSUkcT7GzKhgyWWX8N+97T5m6iH/RAulL4EX/
-d+Wl6hm42bc/+/NPQhKDTz4OdylZIGkWpNtklLUNPnGOZBg+XFF/MkhhhFE7D6dh
-Y4CnyrlogQe1ajgBmtI0JioxdBnrZbhKw5Xq/4u4I6RW2ieSDmxjd/FcGOhahncR
-zBRJXHhXmeB8qqNwyI2PCRvshlXuIau4EsnlqUZ1e9NuK232YKMH3SR6G2wCFdpe
-yjIUO8WKnea4HYoQgpUujbk0t5qx9vJBzZHn324/dfVJVlWSANnUYWKeHfiVnwI9
-1RgMicnMUzR4GvhUtFr3EOgAFI1TiptjQ85yyUWmO1ixl4K/CfmGw4Sp89areueY
-D9y/Ri1f6nREMZjSVnCHGGOnfNPPVIwHMr5nTagBrKY3pKG1TFIevXkGOGYPb2HG
-wZ1H4YS/ObLQjAy2at8zViO+9lhE0a0IKFRZq2flgePBSW37n0kXhPn82jQgLyei
-Of98rpclwHEF3UazXti0k/HmVZPr/4aIpFmP3qnUcLaDa1gjGxrRgBS5jJvY72Y2
-Q+yWqqylGzr22C1M2uVcuJkr4LCYwjx3EC3SoxUTryyQWuRj32I3bv2ueWb6DLRb
-L0AYTYoTKkTB6kcBGwLasLCBcoPBg8qy6SoO3mFC+KGYHmkocTG1uyNUJjERqj4/
-/6iMuisYX+WQEWiBR+E/c1iXvzuaxtoAwNoZYfXR52T/ZNuykyYJBEgTHu01DZgN
+nWFDcxvCVnpJihwgerInuu4/xcW53Jpse5ptTvc+qc8v2mP9i81GSHkuq+QWbag8
+Blxy/D31KTkiULR4stc5VLd6EIG7u4YcKf37dvzPGSoPo/GXJAVr3zq69BAnvXp+
+BWomPDRzo4/iENiy/BEEvOU5LD1nUolVgddXfbLBO3djttOFZ+YxqHlxf2csW6iy
+/ucH6wCboZ+FbLsxSlPmQw1ft4K1DtK093Q/50G3O+s9auxkflfzWbmdAUeeztcj
+IXFix1Xjw3fQsYHqEh72e1osHLSTXL5aXpFJzV+gRkFAcuoQILbzP/m7o8WFKfeZ
+IwPahSq5vrsFipEl9vNqEd+FwZexQpUdGbqyDtpCMuHbiifimYb2WnKwEzuszE0+
+udlrfuqdUIxUcrfy/61Tfso+OZEU2Mqph7a/y+dmEzzYvsFsm6bZhLB9Whav+5IO
+naGC09TIOPb2fxBoWRxKL7WP3rS051lU7sd9yZhqYX5s97jYq+Z57iQVtWoRmQ4V
+oCXULmPserCg+ZBlcq+0H2aIWZBwQh8F11Dn4yaZyZkOfHQLtK8Xoni2zOhyRfXX
+i3gPz+xVbh2eMIKyQK4JI4mjeRRMFofQQtkpq74EhNjDwsfg+oh4VDsVXVfzKk30
+DQQpx4PsiNBLmGj64Ha1IyyGi/uTx4+9M204y4JZsSgMkcNgTu5HCMrRnnYQ2B2x
+QUnEHHQyMBSIdlvzHqmwwpisi6vWuE5jo2wn3IbRZCJZNPpzUdep/roi5DOckj5r
+ghwx5RPDToaYppJYrqf47Z7xD/1ZV0aAdYrwHVIeYU2DGem9mCm2vqjXv5yQv7vo
 -----END RSA PRIVATE KEY-----
--- a/lib/hx509/data/pkinit.crt
+++ b/lib/hx509/data/pkinit.crt
@@ -1,56 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 6 (0x6)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN=hx509 Test Root CA, C=SE
-        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
-        Subject: C=SE, CN=pkinit
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:98:f3:f9:84:dc:ba:51:5b:cf:a7:04:91:37:02:
-                    f9:d0:0b:40:66:a5:7f:2a:2f:89:32:ac:94:ec:00:
-                    42:76:56:b9:38:e1:81:4d:07:16:d2:f1:2d:91:67:
-                    81:d4:07:4d:0a:ee:80:9d:ce:b3:b4:04:86:14:5e:
-                    b6:50:e2:e5:e0:96:a3:32:e1:56:90:9d:59:d3:5f:
-                    b8:1e:91:c8:94:e2:8f:0b:21:e3:da:43:16:00:30:
-                    aa:d9:e0:c4:8f:3b:6b:a7:d9:fc:57:6d:a5:54:ab:
-                    5f:f8:4a:54:87:34:06:5c:44:25:98:99:e2:bb:62:
-                    10:e0:ad:25:27:cb:58:a5:4f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            X509v3 Key Usage: 
-                Digital Signature, Non Repudiation, Key Encipherment
-            X509v3 Subject Key Identifier: 
-                B4:B4:31:F7:E1:14:21:18:D4:59:D2:4D:37:4E:06:CC:6A:F6:53:00
-            X509v3 Subject Alternative Name: 
-                othername:<unsupported>
-    Signature Algorithm: sha1WithRSAEncryption
-        6d:63:a4:dc:95:ea:ca:05:e0:e9:e1:79:b3:41:8f:1c:80:dc:
-        61:41:1a:43:79:d0:f5:37:bd:7c:1f:7e:ea:ee:bb:33:3d:46:
-        48:2e:ee:22:7a:b1:a0:5f:b1:e0:81:7a:8f:12:f1:80:5a:0c:
-        db:47:ce:14:8c:c7:2f:7e:47:d7:63:fe:3f:62:a5:74:99:b7:
-        e7:58:24:c3:49:b8:b0:e0:f0:f0:5f:df:13:de:7e:5b:57:ee:
-        65:6d:51:17:51:02:c1:20:f3:e4:82:e7:fc:4a:95:01:d9:15:
-        89:4f:96:71:db:1e:66:73:4b:ad:be:3c:89:d3:b0:cd:50:aa:
-        40:e8
-----BEGIN CERTIFICATE-----
-MIICMTCCAZqgAwIBAgIBBjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIxNDgwMVowHjELMAkGA1UEBhMCU0UxDzANBgNVBAMMBnBraW5pdDCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmPP5hNy6UVvPpwSRNwL50AtAZqV/Ki+J
-MqyU7ABCdla5OOGBTQcW0vEtkWeB1AdNCu6Anc6ztASGFF62UOLl4JajMuFWkJ1Z
-01+4HpHIlOKPCyHj2kMWADCq2eDEjztrp9n8V22lVKtf+EpUhzQGXEQlmJniu2IQ
-4K0lJ8tYpU8CAwEAAaNzMHEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0O
-BBYEFLS0MffhFCEY1FnSTTdOBsxq9lMAMDgGA1UdEQQxMC+gLQYGKwYBBQICoCMw
-IaANGwtURVNULkg1TC5TRaEQMA6gAwIBAaEHMAUbA2JhcjANBgkqhkiG9w0BAQUF
-AAOBgQBtY6TclerKBeDp4XmzQY8cgNxhQRpDedD1N718H37q7rszPUZILu4ierGg
-X7HggXqPEvGAWgzbR84UjMcvfkfXY/4/YqV0mbfnWCTDSbiw4PDwX98T3n5bV+5l
-bVEXUQLBIPPkguf8SpUB2RWJT5Zx2x5mc0utvjyJ07DNUKpA6A==
-----END CERTIFICATE-----
--- a/lib/hx509/data/pkinit.key
+++ b/lib/hx509/data/pkinit.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCY8/mE3LpRW8+nBJE3AvnQC0BmpX8qL4kyrJTsAEJ2Vrk44YFN
-BxbS8S2RZ4HUB00K7oCdzrO0BIYUXrZQ4uXglqMy4VaQnVnTX7gekciU4o8LIePa
-QxYAMKrZ4MSPO2un2fxXbaVUq1/4SlSHNAZcRCWYmeK7YhDgrSUny1ilTwIDAQAB
-AoGAV2NtuJ90RG+0YLSXU1r76AXFsd/0m+G0/aLlI0Gyt3ItOXZ+LchTHgp2ApGk
-98OEHS7PhVpICh5bjN/gQq6gr6K1g8EemheEn/M0ad77y9g/6xkuyCgjeW8khVQ/
-KovidHqpwtmtMQhJJFOl3Rh1E0ULBeiVnYlOG6xIzxwWbUECQQDKUQFLwKjCxaew
-hCDEClAYgX+aJ3hLrkrZte/RwZnlmvyZJrMy4I7hBlu3ushgZuln4l14u8LQDJyg
-3Zod+YxHAkEAwYnNOnKT/euosOVqKJuLnnZtW7+Lu8NBzlCwdaSzIiYZnsIF5C+n
-zrX1v1p8TTjsu9cUKXgYtgknghbaBnyKuQJAEpPxrIUaehgwV9MqNxZDWJy7nOo2
-76wnj2pXhUlj2mOrAl09Y1SfiiZNUcfDEqcgk7uDncyQDQ67a0IuHsaFjQJAHAZq
-U3ZX+8LuMH9n+e1cMFwRxeFcyJmjo86HXuG0ltNRjm2mEL7d2875gPYHXd9KWIDy
-iHa9jU6SDAJnG91Y8QJBAIQHn9lEtJ+kLIWijyomdx0StLaaHYymqOiD/JiUhNrO
-+gOj9xsaK17X0HlQlAyodG/UwdncPnMXOjwCILQT+F4=
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKn12cAGGPTzXoQ1
+ONy+6UjfO2AUDhYrX0QN14oFjEVwbBfegZHXCiN1+9gLJaFSsCQmDSyCgTae47Wd
+YjKyoVGxv5ydQmG2lYJt7IL7hWjs/PPAioVKrQb2gg/r8krhsv4blt7XBHoA9H/N
+obiZ7ukPhDy+1HZhltnqFMzA81qtAgMBAAECgYBpVYZbvSuwfDiCxZ11KhjY4gkh
+dax5Tu4e9lk0IFYcHx3O+UbiRRzyd0fbUKVEw0OJU8/sWwGMAZNs1pqqgwz42oC1
+kA6ncdTWO9Um1x0Ym+X0pb7A9vfjG+4ehEdRJDDLVcscKo1xI7XUzQ3RQDw7cSvh
+UZAyCMFJ8W6DZMj5vQJBAN9ejWeyTIhZo+/pFtk3omRY9albvXecEDElvEi4ifxV
+SIuNJL93O7goIIyRlSxA8eJpjEoJBj2b2XnsWWWZif8CQQDCye/vsfT+3EMHq4HJ
+5sO/ej7sPuRtoVj4KnmnSR+St9XuFdQZce3Sdr1CxgQKTo/40HouIYe+qUgiTZ6E
+MmNTAkEAuaxyJKmMfqbs5AdAi+14GqvsAQyWUS+0MfZpLZXgdZU6yW3ZByMIzErm
+y5JUisWti4QrLnuT6XB8daHmqdLYZwJBALtilGVcJrm+nuUUAol+a7UaHsoaPpmQ
+bAxgoCNj3vG/1Bdz/FR2GzkqbSt9XomjxjCwLbmPHA04wGHvlZzK9G0CQF8rAFuK
+BUo6RJzP67PDUllkGvdjUC7wRcy++fAxCUfQSSOKXdFrzBDLEHTrxMpoOmnXGcn+
+NtzRMMe5Ta0FEtc=
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/proxy-level-test.crt
+++ b/lib/hx509/data/proxy-level-test.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICUDCCAbmgAwIBAgIJAP6hx2RbgHvYMA0GCSqGSIb3DQEBBQUAMDExCzAJBgNV
+MIICUDCCAbmgAwIBAgIJAP6hx2RbgHvZMA0GCSqGSIb3DQEBBQUAMDExCzAJBgNV
 BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQxDjAMBgNVBAMMBXByb3h5MB4XDTA5
-MDQxMzIxNDgwMloXDTE5MDQxMTIxNDgwMlowQTELMAkGA1UEBhMCU0UxEjAQBgNV
+MDQxMzIxNTMzNVoXDTE5MDQxMTIxNTMzNVowQTELMAkGA1UEBhMCU0UxEjAQBgNV
 BAMMCVRlc3QgY2VydDEOMAwGA1UEAwwFcHJveHkxDjAMBgNVBAMMBWNoaWxkMIGf
-MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpSBN+FKVC2wAP3byRsbA1+GRUTfz9
-E3QOGzsYor7OT0sL+wuBfqgBsDpDWLZYWOLHlKODg5ktBLm8+vehOiRuMgxJB0MY
-uNw86/JhQWp7bvFRttWVfZYReMwEjOTdK7x6Aa3ZvM5o/8Bo8NZq08/71X5cwBiE
-1zMmCUtZpcVchwIDAQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HQ4EFgQUw5aS8IKx4q+/8nHq7O+YUjs+D8UwJQYIKwYBBQUHAQ4BAf8EFjAUAgEA
-MA8GCCsGAQUFBxUABANmb28wDQYJKoZIhvcNAQEFBQADgYEAscBp6MWOKv6BMY6N
-NTl9eMnnYVT2B9ynGK+FsMFBdnDeJBj826cMzfk7nx+J5OcHB8YhaYv7GqpFa1gz
-8TACxL6bgzgtVmfCPYAOSVEcNVAvMg5IuDd78fDaFZsfgnR9kF3T81/nUAYu1Ldh
-iEdCHg9VXCrB9/EZOfK8zsnEzCA=
+MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDh8+LAR/RCu/2c1LrjVsLshgsAI3aZ
+JDEIaSodzjVkpsVsvfZNWtQgLW8BF9Uog0zsAbdd4XBVrFgOlLGGorYAP8tMgY5S
+QTzjtcgAJafhxV9nOCVTFKbzUE73mw9mcPwvti9yQ49XEWFJuhWKkqTjAYcYHRmz
+4Hm1NakB71kLCQIDAQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HQ4EFgQUIE9G2K8uCSD4nWLJo8wnCRbqPp4wJQYIKwYBBQUHAQ4BAf8EFjAUAgEA
+MA8GCCsGAQUFBxUABANmb28wDQYJKoZIhvcNAQEFBQADgYEAQFdHWa8k1yH+aStB
+uqVGkbeFtI8YSff60APfwHSfCTlCb39KWy7PepPAyamEiBvTgGBVA2xbqmWgEHbk
+lcXBCvuOVaugNWtfTIb+IMLAka5XhWYKyNP4cyr+kOhWSXb1Qj5xs33WyA4DIOiX
+iMbOvQcZ4xu/IoyoM10Hokk2dfQ=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy-level-test.key
+++ b/lib/hx509/data/proxy-level-test.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCpSBN+FKVC2wAP3byRsbA1+GRUTfz9E3QOGzsYor7OT0sL+wuB
-fqgBsDpDWLZYWOLHlKODg5ktBLm8+vehOiRuMgxJB0MYuNw86/JhQWp7bvFRttWV
-fZYReMwEjOTdK7x6Aa3ZvM5o/8Bo8NZq08/71X5cwBiE1zMmCUtZpcVchwIDAQAB
-AoGAWp/Qd6X71y/A972AbwsOR8Zjh9J8hsu8TLT9TTILLg27In3Sag/xR34douJC
-NEfZmHkVlJmGDljCSs6cdT7YMxsI7MAR24wzgg99x+0Of8V0lQD1I+cy5CUQdOoe
-LtqK6tufDuNG1ppeFc3s5iaWPQzkCwb3ZY7JcGjEk+Zm+CECQQDaTv07uY8moFUL
-n/s4/QGvQIAfGJVdtj+deNq2B5rSQX0lFGqEOtq1RqptwUpqnT37ArSiE3sEYjv0
-x8+YYLfxAkEAxoIk9nkdmKH33O/6vPTG7MYKhD+D4id2VDXASlEv7X4wIXjlNhj5
-cmAeDZ4GMrgeQTXwSZs0hYujrI9L5J0T9wJAT8XFa2mnEapM6W6QUobBctTS/Inz
-KsdJ/7UF1rZ4sJQVstL/CUqoWM11wZ18H/FNkMewUflkXnm3Bv9ssHXHQQJAZKrN
-Odzz4FqLCxT8D+UGGD7aSHS5We/vNwdHK6j+aC7tE5xuiL+jiJgrxXYU6JWsah+D
-aqB1wx+sci79KsNpwwJBALFqrd7N3t4D4Rh+VaR1qUSm8Lq/SCn4tYjucZpLb2bZ
-0szSqKs2XO97rhJd7lvo0YhlQptsPTg0JPURMwivzAs=
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOHz4sBH9EK7/ZzU
+uuNWwuyGCwAjdpkkMQhpKh3ONWSmxWy99k1a1CAtbwEX1SiDTOwBt13hcFWsWA6U
+sYaitgA/y0yBjlJBPOO1yAAlp+HFX2c4JVMUpvNQTvebD2Zw/C+2L3JDj1cRYUm6
+FYqSpOMBhxgdGbPgebU1qQHvWQsJAgMBAAECgYEA3lUkDv3+bNgccoCksOSDg0dW
+dblvjrsdAGCyz4dD5JlxdFHrlSxFxK/QJWw1E9s3CpeZvegBqFugfiB0Gr3qhLSF
+v+DZ+ItEP0h7wfkQT5uC1EW4J2xYP5E13whp3WLK2fz4GjrdJ6zfWA7sF9yX4jKn
+6k+FM1x5E6aVQWY4GZ0CQQD6z1tYiwDyx9xMS+XVIgOjfK2r8SXJrzQQX5Cm86OX
+j491q6f/J55fPchns8kwNggvr3NUeetQf1nO0UA4kPCjAkEA5qDZfm+ANWiY7ADh
+8bcYLOdwE5iKaAQa+ljQp/TRebMkbEkOZZxnBnP6Iy0sIirFCg3eAasEt80Z1YJS
+pzfUYwJADJRP2Y4HOyYJB46a9WiiVBXRxBjxMz9lVhjk8Wqw3s4lfNpiL6r2B4La
+xVDAG3nqSTH8j9UZl0z73SKjnPKwDwJAb7OsY96hXDzjBDuRM7+Yh/c4g2U4dBS4
+9FQcC5058BXiKEhiHrjX9XoqxurUG2BXuvzocCpiyJsgThcm7TLPPQJBAKriPvvg
+A8KY+iEEu+vV5+MhSqB+XPN6gXqpYsAV9ERim+QUMtmTRnzqdTKK322kr8uvNtn9
+yiR+tyXNPfJVUmo=
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/proxy-test.crt
+++ b/lib/hx509/data/proxy-test.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICMDCCAZmgAwIBAgIJAMJEvwnR1+2bMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
-BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE0ODAxWhcNMTkw
-NDExMjE0ODAxWjAxMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MQ4w
-DAYDVQQDDAVwcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzD9rvFqU
-UYec1cMnPavmb+4UBxxZ1ZCZly24yR30k5KERNmAeqNNI3rbxPhQGOF5x97Y/izm
-anNZxvH+EK75xLsweAYBoJ4K/Hzx2A8CYAbuFrV9Zomx4AUe35o4WWEQwJMwIxRm
-8E1BmiL4C71NwK6fC+BIdWiFKgOuOrm+5N8CAwEAAaNgMF4wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0OBBYEFD5WzyL5AGFFHSdahlmprI+OnUMlMCUGCCsG
+MIICMDCCAZmgAwIBAgIJAMJEvwnR1+2eMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
+BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE1MzM1WhcNMTkw
+NDExMjE1MzM1WjAxMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MQ4w
+DAYDVQQDDAVwcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAkzoQimHJ
+DYHQVBsVTMv70jTssPqGKT5ncSvSHXgib2PsH1VdGkVzPh+uh1mgAHj1olDUIJqc
+hdlAxP9PZTT1j+O/7Mlh4dg4e7NFywl22spM02gKaJeAjV7xfuc6d1x7PBYWaDnn
+lHZElBqr4SVb7tqNV+ryFWHrVBoaj6Pu7OcCAwEAAaNgMF4wCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0OBBYEFL2cibBmSKt2dSXSVn8UrgKyulzrMCUGCCsG
 AQUFBwEOAQH/BBYwFAIBADAPBggrBgEFBQcVAAQDZm9vMA0GCSqGSIb3DQEBBQUA
-A4GBAMhRGdqxHMzj625UCzMkAzrFLEnLJSXU1u3/RHlUQNyfjs5+UW49ImKBshCa
-3lNy4LQDh8MYjkA/mUphOqZjuHBsfkqlJPgLEhhAIns7vm9TJawY97cKO4gd40Ei
-4SQoEcWyKEObqyVQmZ2269wwqfT5BMRqoZPaD/a5jvB1HRNE
+A4GBAEATS9mHgOStCOzytxS+jGI+WMYdE2KKzdi5kNz3lCcu5+DZ6CLQcLGtml/S
+wR5IKl2KTKn//LpW60T6/Kg/o7Q3a+FckIne+lWyIVI3EvYQy3/IDmjQ6oY7pJXk
+Xtf4sg8s3kcrg97clq70utSHEeRGXCuNDgsO8O9FhPojBfqH
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy-test.key
+++ b/lib/hx509/data/proxy-test.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDMP2u8WpRRh5zVwyc9q+Zv7hQHHFnVkJmXLbjJHfSTkoRE2YB6
-o00jetvE+FAY4XnH3tj+LOZqc1nG8f4QrvnEuzB4BgGgngr8fPHYDwJgBu4WtX1m
-ibHgBR7fmjhZYRDAkzAjFGbwTUGaIvgLvU3Arp8L4Eh1aIUqA646ub7k3wIDAQAB
-AoGAcbgJ+xgPpok0CEyc55hzN/S9j+v4FJFrAqJBVTDpgNS98juLbjzH8S4xeKys
-o/2+OUtZU8OaEsDgxoTr6UwS4bgjUVxNJytUbkULNfuN8+k4ciyzVk9za7TT+1Q0
-MXDyHDE7kE2WlIB8a/qkzpZ2p1JnzGvDCDTyEJH1wu+r7VECQQDy4SEXk3eem4oU
-AeYUShkyxLgUu/AjkM7pMsdJeUCcohhwhGolUmJfusoIyztwU5IRByXXJhWE53io
-6UXYl0w5AkEA10gKJV4XM8pGxKppTIgcH04zK8U8pzzgXIh2WqRiDbOX2zk038ss
-5g/0amcCGqMac6UcTlsq9Hkb1Vjp7L7p1wJASmXRyDIA41HLwwMt4issetOte5Ry
-I8LYzrAiQYxl0VUJ3XWCOjp5Lc++0WDHrUm8JYEmAziEQPjSihMitQzraQJAcRk5
-q1P5II4+C4fzde9zxsaQf4hJSxriS/qtIwWFNemJ9/Pf4UqeNedf4p5nLpNNjD/L
-1SZ0NKeDhdwGWQgbVQJAcFMoL0PzBSWRwxhoOd6pu5+w/HrOYG1Y1v5Zf8pwtErx
-i2JYmlylQ7uc1s641us/bHz0UMUVOQQHnqKT4OMPQw==
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJM6EIphyQ2B0FQb
+FUzL+9I07LD6hik+Z3Er0h14Im9j7B9VXRpFcz4frodZoAB49aJQ1CCanIXZQMT/
+T2U09Y/jv+zJYeHYOHuzRcsJdtrKTNNoCmiXgI1e8X7nOndcezwWFmg555R2RJQa
+q+ElW+7ajVfq8hVh61QaGo+j7uznAgMBAAECgYBrJKCQ9KTqbYR9ENCpePGkgtuV
+2Fv2e/GvzKI2zAzTX7ag/vCog85gcZID8lecwGqSW5xkteAfEIIwW1UeZDIoEJU7
+fs9bugZSs93VJsxcjOJuYlBTPfPlmwuLJFgMziflTPQzo6Y187bmGesGTmlJDRqg
+XrhQFI77kTbgqxkY0QJBAMNcHDDsKXB/DFq4bvs85ZvYigvVXglvcNZ2BnV9aUNX
+oNvWNdLM6SxrYyq4OninJrWicmz3rJLy2Nx90aBunu0CQQDA7SjIwKNCpSGGsFQ/
+bZCbu3mWyOtusViRy1EyhhiNlvf8KV7xiLz9teJn2JjvzYH0vXqjbeSyl5BxAnJ+
+CyyjAkBTrhjFO+NkNIduNKIVK7iOUOqQtwxYrkt/EX8ixF1aYyacA916NhuK01Te
+75rcI30JQFQTKOPa7frGN36bYcbhAkBKGEt7npCVPfp8UihpG9lYFk6CXLQfFTmg
+9OdAckPnzT18uR7fwNZk0oAbxhImt1Tb/BGnxsL43ED7RidWxU/lAkB518SnUD2I
+xNlJibwCXbFm6qdyVzVcvVZGeqZyKlP2sK8Bve3zsxBtypSxepXG2fkC/QNJYYxe
+c/PeB9xYaoQI
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/proxy10-child-child-test.crt
+++ b/lib/hx509/data/proxy10-child-child-test.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICdDCCAd2gAwIBAgIJANtSso4F/YPVMA0GCSqGSIb3DQEBBQUAMEMxCzAJBgNV
+MIICdDCCAd2gAwIBAgIJANtSso4F/YPWMA0GCSqGSIb3DQEBBQUAMEMxCzAJBgNV
 BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQxEDAOBgNVBAMMB3Byb3h5MTAxDjAM
-BgNVBAMMBWNoaWxkMB4XDTA5MDQxMzIxNDgwMloXDTE5MDQxMTIxNDgwMlowUzEL
+BgNVBAMMBWNoaWxkMB4XDTA5MDQxMzIxNTMzNVoXDTE5MDQxMTIxNTMzNVowUzEL
 MAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDEQMA4GA1UEAwwHcHJveHkx
 MDEOMAwGA1UEAwwFY2hpbGQxDjAMBgNVBAMMBWNoaWxkMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDRY94DoMXpcQWDorXSjSv5phbgFhfFRA4gflBNlcI1sHMJ
-jYAusRylG44O+LqpxRkO16WAZl3aENLs/Y8BWx+yJ/NaokM1XhAE1EP6X/RIvfcF
-Cbhf7srgUhzBLcA0d9gCqaMO0fhWnd4c702GWG+HMKLdve/FZE3lS1DOj6YQ5wID
-AQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUsqNjmNmz
-g3dJD9IzRsaH3WuhEvcwJQYIKwYBBQUHAQ4BAf8EFjAUAgEKMA8GCCsGAQUFBxUA
-BANmb28wDQYJKoZIhvcNAQEFBQADgYEAP58arK5WdV5h7pj56/LJlEnyx8xhiTUG
-Y49T9JULQOG4gsGyA1dhdxM2IZQpLboUR6NvWuiLJyC4LJPn+2EqjK0LrzXhG2VB
-1/kDMqgNmI5eikOV8KkwAkt5SrLqHQvmQ5rJPrHALhvkmL/Uh0TEwzgzeXF/IvjM
-MUU7n22YsNY=
+AQUAA4GNADCBiQKBgQDF9X8Jz4WPaDa121N7NGI2KszNFtZBKv3G7wJmb7/DRA6W
+DD1p4T3VJrphg/2C9Du89Y5jX4/9iXJ0x2arVhBNnTXn4JVb6IQhn4681MIbZuPx
+KBJCf8aOg4f/ElqxaaKk7rBDERD4BJNr1XsSJcvj/6LhnamBZjIvqdYTLssvhwID
+AQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUUhcuEwrk
+p7meim4ztgCHCSrB8tMwJQYIKwYBBQUHAQ4BAf8EFjAUAgEKMA8GCCsGAQUFBxUA
+BANmb28wDQYJKoZIhvcNAQEFBQADgYEAWR4XYZF7EwUpK3yyVYn3n8zJiLU7MtPx
+0aKqjgzXkGGqMdGXCQUIahZrgrEfPXQbp7mfp0Lxzzus9It+81CvBNE8Pym3HElK
+yk9G2uE8YXvf9Ffs6YTLLkRbs8My9XiX/iyqUX32K6ZeMTueNsL7cxJRdCLa1APM
+E9yiQGZJyZE=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy10-child-child-test.key
+++ b/lib/hx509/data/proxy10-child-child-test.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDRY94DoMXpcQWDorXSjSv5phbgFhfFRA4gflBNlcI1sHMJjYAu
-sRylG44O+LqpxRkO16WAZl3aENLs/Y8BWx+yJ/NaokM1XhAE1EP6X/RIvfcFCbhf
-7srgUhzBLcA0d9gCqaMO0fhWnd4c702GWG+HMKLdve/FZE3lS1DOj6YQ5wIDAQAB
-AoGAc96ZutQ68MVUUdW2W/82+H1KZ1KScN0KHD0J3wUiZWdxITYmWrAzs8IdyHcn
-hE7HYQlAUl9TTBrHPdHKUuvEC2bZpUXFItXKUxAy+KwAl+ODhfm2H/M507/aA+jc
-1fBtpzEisVZV1Htp1A+YmSsbgEmXCV/I/pT6SS9FIflOs0ECQQD+ylFFSJzzr4xT
-c4G4Zb+EWrYYlrRq8Wru18LyqJxmlT5I1SxBRLgDmqJSGF8ibTtSAxt647Uw7Q1e
-oYLFGTaxAkEA0mJeV88Qytm1ktQbikDRVqtcldDyONtQspXnjSBFV3jXY69jEsL8
-+NZWTpD03lw7UNQdh0MieC7O9nr3YIxXFwJAduv9pOXwg/kS+Tx3dpbfHiqsxatJ
-yISoEZTZZCN45JSSPrJo9onZja0WSFUhylLLlkrm/6PaxVxPmjSuccqD8QJAfoGI
-GWT5xACFnnTM2qV/O45vbebmwCmgrMJXKhVtnNudKOQdvvphA4BfBX9EvzDWuhPS
-bbOA1qPO74ehmPzKoQJAAN3YQmzAN24WzyDi3g86l5B9tf7jGHNtsmLTITG24O0o
-8opaBS6rqb9PaxCTHEBAMPy4vCkwQ1UUpWyi5rjvFA==
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMX1fwnPhY9oNrXb
+U3s0YjYqzM0W1kEq/cbvAmZvv8NEDpYMPWnhPdUmumGD/YL0O7z1jmNfj/2JcnTH
+ZqtWEE2dNefglVvohCGfjrzUwhtm4/EoEkJ/xo6Dh/8SWrFpoqTusEMREPgEk2vV
+exIly+P/ouGdqYFmMi+p1hMuyy+HAgMBAAECgYAjZR/P20EgQRv3LD4i+1zMHp77
+1Kd+g3dYyId/VV/ORC7veUTJ17I8mG4e3YDIl27O/ID3F7EhPiAu7TBYVk0Xoog2
+RoVLKPRZJPwpVsrrCr0weIsjq81Yba6zkxhlnHj5Z0YLEHgLKCjKuL8UqC4R3Dlg
+lq698ofpn7wlny5S4QJBAPyqiPPRZhlAy7CLzVXD77YZddxD6sW0lL4/tSjEygv7
+2x6bNXSat+lusqXsz29BrXXLqtYpN+C8sQjQt1nHm5kCQQDIkitZvxLRELFa3LJZ
+GuGBrzDCyrYgukchGfI5XtWmpodksh+wZ9b5obYMx6/U70ZvuoiHSU6bC+2H28bO
+8RgfAkAmPa1SsauxQMRTaSVfyLL8LahP+RuMZsNoc/34OKiX3buRS05w4oXZV77E
+LC5NGXSmcnfdyAlEA2sL+YL2nKZpAkBzW0Zdlry+y6gFx1s4TnKWwOj9j9NSXXDd
+g+vBvV6KO8sxShVZw09sQerPzOW/RWMwjYtKrAnuuNyDwA7HJPknAkBjCaKHaYIU
+wsqki8qJ2aJKsFXqZYi54ykPO0olt1s651Ga3oUVy9IxbYWAuLOeXtq616z/ACjO
+VZzDozTvLqku
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/proxy10-child-test.crt
+++ b/lib/hx509/data/proxy10-child-test.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICVDCCAb2gAwIBAgIJAONwGxXRj9jPMA0GCSqGSIb3DQEBBQUAMDMxCzAJBgNV
+MIICVDCCAb2gAwIBAgIJAONwGxXRj9jQMA0GCSqGSIb3DQEBBQUAMDMxCzAJBgNV
 BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQxEDAOBgNVBAMMB3Byb3h5MTAwHhcN
-MDkwNDEzMjE0ODAyWhcNMTkwNDExMjE0ODAyWjBDMQswCQYDVQQGEwJTRTESMBAG
+MDkwNDEzMjE1MzM1WhcNMTkwNDExMjE1MzM1WjBDMQswCQYDVQQGEwJTRTESMBAG
 A1UEAwwJVGVzdCBjZXJ0MRAwDgYDVQQDDAdwcm94eTEwMQ4wDAYDVQQDDAVjaGls
-ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuullDtJworBIXZLCB5nEvC8T
-x9FvUt/C37TYjSHlpt4ScKl6ulH+9o9pmHylBlrGS3Yz/PLNl5NcJWglEd/XSDzR
-87TM6TnU2GkIaoQCpg/gkf2EP24CRQQyHdKqj5px3ezYybzH+uiGuG6F01o4kPTz
-5jNOtOL8l0iYedDzQncCAwEAAaNgMF4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0OBBYEFC4u8d6XsLAukrR3kIqhR5ZrNH0HMCUGCCsGAQUFBwEOAQH/BBYw
-FAIBCjAPBggrBgEFBQcVAAQDZm9vMA0GCSqGSIb3DQEBBQUAA4GBAKMKN7CSoopg
-RBm0Ybd8U0u49lXDyZnyOpuTI8OS6yBj9Ym/m9U+cJyvE6D9sVoBiFCW9nnR4eqB
-0SW3qiwe26FFAbliEjIk+N/+4mq0HC9YgquhoNtoTLltixCKom64UzaYkB1hdd1i
-yipCRlPOYElZzf84QDWNEzRG6qVAU7hN
+ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxRjdUkdjWRoveDwN0cPr+118
+gD/UZ08itjnX2l0GyfJg+jDDpJL8UrQ4hMHunVkb2U3xsk1uHfasL5xwiLBbcKFs
+buWdNvibNNgc/6tYIBFvdHwHkWrvL25rH4S52r4Q5akZk5mUyLwUkJbRV8PlPZPX
+fYB/IPWS8HJS67L5hI0CAwEAAaNgMF4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0OBBYEFKzTuZpWacAlXpWxgj/Cz9bn1A3YMCUGCCsGAQUFBwEOAQH/BBYw
+FAIBCjAPBggrBgEFBQcVAAQDZm9vMA0GCSqGSIb3DQEBBQUAA4GBADoWVtmzDBJJ
+ix4rF7/vJt1eKDjQ7YlUjLqTD/RVoBNS595P0G7aQwnpJ3U89fcSFmuqp+imCj1Y
+I49zzuVwYPkkQO/tjnZBh51PSVHtEst88/3kSLaDX9Vd+EZGjOJwvfE2eTdMOIxR
+U8if73SEH1GAhzVLy4CDwRLmbRinrDmq
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy10-child-test.key
+++ b/lib/hx509/data/proxy10-child-test.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC66WUO0nCisEhdksIHmcS8LxPH0W9S38LftNiNIeWm3hJwqXq6
-Uf72j2mYfKUGWsZLdjP88s2Xk1wlaCUR39dIPNHztMzpOdTYaQhqhAKmD+CR/YQ/
-bgJFBDId0qqPmnHd7NjJvMf66Ia4boXTWjiQ9PPmM0604vyXSJh50PNCdwIDAQAB
-AoGBAIJ7YqApSpZYR/yC8k8KCqxwlPd+fp+1M76l6jMEQeTuzKK3vcSKb1pCna3k
-/fNktV+CwiJIgjvZlI9Ml+xVflxtNSOZgFixxqgeGPZ1jUMm0xvr6WBt25d+zclb
-HpW3E7DllVF0bTp7wK8hGI0Z0T8qGdjGmh9q13eOf/v3LBRRAkEA9N1JVvIHah05
-FgMi6cOC0Qx4v1HOF4lV2Vai965dtkpmFyjFaCs698guBJyQ0dMA7qevseX8wiwM
-PZB8e8jCaQJBAMNpbCKqggEj8kSSlHQ0T+Fap7ihcci7hj5tyOKhAX9h5vFyF1tO
-acZ7AllZqrrx0GYhwq/s0V6lRsXC6/Djgd8CQFOQyZywkLM4Mek/PMUGgjiRxwuU
-AX+q0O+RT6CzkyvJDDpPIb/BMSiq2nmcbRgOqLzJ4X4W/UHPAoZoLvOXujECQE56
-eEMz1yI+HX4MoDJLEAmhLtqne9rx9Of9jz/1CXTvDKDLATZaN4DOxhK8QCT0GI3r
-4RRmN2+bUOD7d2Y2+GECQQCfiGuPvzBryDxdvfZs9kuvn7D4RgDmEskWEVdbhP9d
-Y8LWrxPA4SZL3fFG7b0m3KPdsaAiwCRgvC5PAdhpsr6l
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMUY3VJHY1kaL3g8
+DdHD6/tdfIA/1GdPIrY519pdBsnyYPoww6SS/FK0OITB7p1ZG9lN8bJNbh32rC+c
+cIiwW3ChbG7lnTb4mzTYHP+rWCARb3R8B5Fq7y9uax+Eudq+EOWpGZOZlMi8FJCW
+0VfD5T2T132AfyD1kvByUuuy+YSNAgMBAAECgYEAuItOd0K2Z/BXsBlyywzKQOLI
+twCM7WowUzUXwbLGr4HNgZT1Knwh24I5RTycIiIULESJ4OwVBeM4V5//0kxmYAtl
+LRpd/JRlxRNQcRWRBnm+aAd0dotjPS2NPfEbXBMekSGh6aTfKEgtt+3Omv6Xq9XP
+kTOvi9rdvtBFjBCIMiECQQDjyQXbjf9cFYmzR1HAxE5qihWXdKzJRl8Z3Hn63QoG
+e/K5xhlzJdUQrtjs+M+QSGuQkMGROpUWYOiBoph9bpQ5AkEA3YK75A+7CGj596Jb
+9ZuB8MSp+ZxRQXgM4c63bztqm6Tmt/56UWJG5+CWb7EJm9paoctLyOIZk6+QjqKd
+Ypb69QJBALL4KuYKd2y+b2awzocKtiH3RGevgGLUK7yCAkUcjtfxYxCbmTtjqjhl
+aIMoKs1OWVVIpw2YXbMriQLx4aYLz+ECQC/lo/ElgaDI6jwkrFPIY2mHbOWfamaI
+qehtxXZU17F+D7F7YkGUyZY8Futh0Z0UswJHLkTqtvMbRFvDR9rYoL0CQGBRpaKL
+nr3B1h3pxatxD+JFu7n0gT2dcX+hXJu5HEQF0avI00+MnZfmoVJcYOpRWY1DF4Yy
+IOIZqp4vHXXkhzs=
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/proxy10-test.crt
+++ b/lib/hx509/data/proxy10-test.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICMjCCAZugAwIBAgIJAMJEvwnR1+2dMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
-BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE0ODAyWhcNMTkw
-NDExMjE0ODAyWjAzMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MRAw
-DgYDVQQDDAdwcm94eTEwMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJdc5I
-Ynx3LIKW63t9dlbSVhPbLYx1vFg2k6eKG6q/3INLrtylxtp3mVxpYHVxT4EJMN5m
-wr2CixY02vaqRSsnZmDUTSEfHInvtjjXxVYbIXyT34QWrM0pLD6Sgos0fJe3KMYD
-ByiNMBh0IkpyTcqyeb8mCcRtClzUbcHr9NkzSwIDAQABo2AwXjAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUGAKhYNPztzv9WZExtC6Oubgj0uMwJQYI
+MIICMjCCAZugAwIBAgIJAMJEvwnR1+2gMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
+BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE1MzM1WhcNMTkw
+NDExMjE1MzM1WjAzMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MRAw
+DgYDVQQDDAdwcm94eTEwMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDr5QrS
+qIiUpCB/apA8G5IimJtPqm/4k43CfcROGCgxrxDHPda5iBxCyAsiO7x9laHopXZO
+nhBeg+VKdxt2rPOTKMdYtuJPkfXlygYfeA6//l5x7hS+qox63hEVfx1aH9LIlluY
+D8pOVqjxCola+QIIB0qI7Yrgg/yMPmHPFkJCQQIDAQABo2AwXjAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUUzjtn884zBIOSKDvWdtuqMrQF4YwJQYI
 KwYBBQUHAQ4BAf8EFjAUAgEKMA8GCCsGAQUFBxUABANmb28wDQYJKoZIhvcNAQEF
-BQADgYEAA+B+xr7ARPUG9xmKRQ2wrJnXAcEV6ndslXcvJS7pdkTcnGp6Yo5oNTQ8
-GmqFE1PE/IE0Njpz6wTT3xISKKr5NLgtFcMpnGFoZ6AQ1jQgxynVlQOx/Tch+fMd
-aijOuz8t0LTpSndhAl8BlJ+poLN2sYMkvUhue/t7A0IrYIkKDsA=
+BQADgYEAiJUW+LM9W1Uz7V0hkC5BPq7/w0i50zh1WI1eQZUUFEkPZISP3dO+UJ0Z
+dCIyZNh0MRkIo9LZ650vx0rnsvrIfD+iLM44hrbX66iCFE1N/SPvwXXOefZBp/ho
+nkO1UTTeApGzoiUpdkQhj3eMETCcBEtb+mPQUyAY1PicHvMcRgA=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy10-test.key
+++ b/lib/hx509/data/proxy10-test.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDJdc5IYnx3LIKW63t9dlbSVhPbLYx1vFg2k6eKG6q/3INLrtyl
-xtp3mVxpYHVxT4EJMN5mwr2CixY02vaqRSsnZmDUTSEfHInvtjjXxVYbIXyT34QW
-rM0pLD6Sgos0fJe3KMYDByiNMBh0IkpyTcqyeb8mCcRtClzUbcHr9NkzSwIDAQAB
-AoGAIyqdR6VpdKQgZ5fThqMRpMXB0ZCx5BtsippbtI//zl3/zUZI3edIW3g52Wst
-FQp7y87sA6Qa0J7W0YMna7GHRpnEc5pgFv8amiJhIM+uxcjQOByXLfmOO5i4g78R
-1HGbT7VfEJNjDszVbFH49XQQGNgrlS3oFw+wtlBYB09s3gECQQD5plvCIsGwIzTC
-73JrAUTER5zDAGgEHNWLn1TJ2MGPBXBBXv4Hlj1TZJIM/EYsz0sulIpH2710wMOJ
-eQFvYUubAkEAzpWmwbD/RsVnmBeOgnEAFdJ7qIZPZ0CAlcntWbDwKnGqbJ8ZWhMo
-etzaZhrOY3QiAas0bdSGPEiCAmW/CA9qEQJAeQtQMjDn+J8ZVesDbx6OWRzfxSzN
-QjE42RnH4pZWQyI/63JDeSo/Uc/RgLpQzCk2Kr+azHyev503MdCaAYcLQQJBAIQ1
-dhFDizvpnhDSEpwcYWeV2xnRSwPTXfd+0W2zNSCUufLmJz1kQWXP7d2mjitL6W+T
-9+vKNVZjOQD7yLQJ2WECQQC/ClIgX9Npa4cO/3ttODswubwY0mZU25otW0TKYu7z
-5g37JWUv1AwFzPmisWz7v+aJkJY7Tp1aGMZy8y+9r0hF
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOvlCtKoiJSkIH9q
+kDwbkiKYm0+qb/iTjcJ9xE4YKDGvEMc91rmIHELICyI7vH2Voeildk6eEF6D5Up3
+G3as85Mox1i24k+R9eXKBh94Dr/+XnHuFL6qjHreERV/HVof0siWW5gPyk5WqPEK
+iVr5AggHSojtiuCD/Iw+Yc8WQkJBAgMBAAECgYEA4ahwiwaH6VF8eQcSxT1GtWux
+HyuXA377nDM9Z8t6H9UtwrtoPoFzL3s4E157uNM8WFZ4b0qLtC6OWIbKMePO+IBd
+sf0IgaHLbc5LhG86wfwDmvd/r577BD00onuT+JsOICfF4Ko5lJ+A27T3tNtaG5iY
+RG5mNYrcYIBbbjb/iVUCQQD3BeiKx9NzYDDTZEt+UAR/nEjAHiUWVgN44vDGZJg7
+bsFpVQPX1nzhi/13zGA/xEx3EPbnV2JeS7yHd/2Uz35nAkEA9Hea3YAQi5+R5Xjw
+JNHoOb0SsismCWUyILXhdYcVCsirpag20I5ORBYAK9GY3nYdyEpXPbhra6bXpDYy
+JDSBFwJALgeX0WRy7mjaMEncF2lprS2+EK6NUqAsfXYsT4unIkv9FleVI77//jdL
+v+sBdGBrrzQmDe2mktOiCcw+IGCZuQJAN2mQ8dogZfWSdWg3TrFBqSzBOx9qrMCC
+X0W6yBAJZftcZN0/J4DKHsa53TTSKMKvN4IaSkQuHSWhRXh/XxODmwJBAK4wBVAU
+XxdZYYgR5+xxqOi/Dv2muC6rv4hF2EzJkjuewF5QIOhZFKeq9rAQ/A3GeKaGhadN
+vNZSBjrxRg0t9Q8=
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/revoke.crt
+++ b/lib/hx509/data/revoke.crt
@@ -5,22 +5,22 @@ Certificate:
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
+            Not Before: Apr 13 21:53:34 2009 GMT
+            Not After : Apr 11 21:53:34 2019 GMT
        Subject: C=SE, CN=Revoke cert
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b1:c4:3b:0a:bb:c6:09:cc:70:17:ad:40:fa:81:
-                    3f:a6:10:74:14:d7:72:e8:99:03:49:c4:bb:f2:0a:
-                    94:da:f5:42:7c:33:6a:f6:d4:fb:ce:64:cd:9b:08:
-                    f5:76:4f:ee:24:7e:58:c4:b4:4a:e9:8f:6c:b2:8c:
-                    82:42:06:3e:c6:a3:bc:fb:96:3f:7f:ce:cb:15:79:
-                    46:38:35:df:0c:2b:28:f3:1c:83:4f:0e:84:16:ea:
-                    20:07:c6:bc:29:98:33:d8:a9:09:3b:18:33:4a:6e:
-                    8e:6c:bd:86:f4:35:97:30:ae:fe:6f:2e:dd:c3:4b:
-                    a7:9a:d8:32:41:c9:e3:46:55
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:b5:f9:d4:8b:46:84:8e:c3:2f:19:0c:3e:1b:67:
+                    90:a8:e4:5b:e9:2a:94:aa:2a:01:38:43:21:3c:ef:
+                    b1:0f:95:5a:49:67:d3:26:71:06:85:c7:33:7f:39:
+                    65:30:ac:8b:2d:be:c3:f6:25:3e:ab:3a:35:9a:2b:
+                    bb:82:42:4c:8c:d7:4d:1a:7d:4c:9a:74:d7:01:37:
+                    63:be:68:c3:4f:31:5a:94:60:5d:e4:7b:1c:dd:dc:
+                    24:b7:82:1c:a1:78:8e:4e:fd:c4:12:60:b8:9c:59:
+                    00:45:b3:86:da:9c:c1:1c:c3:3d:28:85:66:9b:2a:
+                    bc:ad:ba:cd:c7:59:83:e9:09
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,26 +28,26 @@ Certificate:
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation, Key Encipherment
            X509v3 Subject Key Identifier: 
-                6E:3C:ED:E9:4B:20:CE:50:64:4E:30:0A:3D:33:35:13:0E:B5:7E:A0
+                F9:0F:F5:C8:C0:E7:DB:3B:2C:7F:E6:7F:20:C8:42:5C:D7:AD:8D:53
    Signature Algorithm: sha1WithRSAEncryption
-        10:5a:65:89:e9:2b:3e:44:ad:8f:73:d3:f0:a1:e1:15:0e:c5:
-        b9:27:5f:e7:9c:b4:73:10:ad:e9:9c:e3:7a:bd:f3:2a:bd:0c:
-        c9:d6:c3:39:41:f9:16:ce:eb:61:77:3a:9d:f7:a0:20:ef:89:
-        a5:50:3e:01:df:1a:86:80:3e:f2:5f:d2:b3:10:5e:1f:28:b6:
-        3f:d8:34:41:0c:bd:cb:fe:d9:63:46:4e:5a:23:d6:3c:83:eb:
-        6d:22:25:bc:09:20:b8:1f:08:b9:f9:9a:a4:e5:1d:39:b4:79:
-        89:e5:c6:34:26:2b:9a:2e:cf:3d:66:d3:c8:ee:bf:f4:8e:03:
-        bf:d1
+        96:fa:b9:e0:bd:87:4c:61:e9:c3:6d:6c:a9:94:5d:1d:ae:85:
+        4d:fa:22:75:1f:cc:d3:21:c1:5a:d5:19:ef:cb:27:b7:fc:a2:
+        73:68:72:d8:78:b8:cd:b3:ac:32:b9:8d:da:15:3f:9f:26:e8:
+        6e:cb:05:e8:a4:72:b1:55:df:1d:b0:69:94:15:e1:38:68:26:
+        58:25:da:b9:a1:6f:7d:a8:0b:67:8f:b4:b3:8a:0d:92:b0:0a:
+        cc:77:77:27:ca:43:bf:c3:4e:73:09:9f:b3:91:a7:06:95:0f:
+        96:0e:78:7e:76:b8:80:52:07:5d:90:a3:3e:bf:10:b3:4e:0f:
+        43:91
 -----BEGIN CERTIFICATE-----
 MIIB/DCCAWWgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIxNDgwMVowIzELMAkGA1UEBhMCU0UxFDASBgNVBAMMC1Jldm9rZSBjZXJ0
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxxDsKu8YJzHAXrUD6gT+mEHQU
-13LomQNJxLvyCpTa9UJ8M2r21PvOZM2bCPV2T+4kfljEtErpj2yyjIJCBj7Go7z7
-lj9/zssVeUY4Nd8MKyjzHINPDoQW6iAHxrwpmDPYqQk7GDNKbo5svYb0NZcwrv5v
-Lt3DS6ea2DJByeNGVQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
-BgNVHQ4EFgQUbjzt6UsgzlBkTjAKPTM1Ew61fqAwDQYJKoZIhvcNAQEFBQADgYEA
-EFpliekrPkStj3PT8KHhFQ7FuSdf55y0cxCt6Zzjer3zKr0MydbDOUH5Fs7rYXc6
-nfegIO+JpVA+Ad8ahoA+8l/SsxBeHyi2P9g0QQy9y/7ZY0ZOWiPWPIPrbSIlvAkg
-uB8IufmapOUdObR5ieXGNCYrmi7PPWbTyO6/9I4Dv9E=
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNTMzNFoXDTE5
+MDQxMTIxNTMzNFowIzELMAkGA1UEBhMCU0UxFDASBgNVBAMMC1Jldm9rZSBjZXJ0
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1+dSLRoSOwy8ZDD4bZ5Co5Fvp
+KpSqKgE4QyE877EPlVpJZ9MmcQaFxzN/OWUwrIstvsP2JT6rOjWaK7uCQkyM100a
+fUyadNcBN2O+aMNPMVqUYF3kexzd3CS3ghyheI5O/cQSYLicWQBFs4banMEcwz0o
+hWabKrytus3HWYPpCQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
+BgNVHQ4EFgQU+Q/1yMDn2zssf+Z/IMhCXNetjVMwDQYJKoZIhvcNAQEFBQADgYEA
+lvq54L2HTGHpw21sqZRdHa6FTfoidR/M0yHBWtUZ78snt/yic2hy2Hi4zbOsMrmN
+2hU/nybobssF6KRysVXfHbBplBXhOGgmWCXauaFvfagLZ4+0s4oNkrAKzHd3J8pD
+v8NOcwmfs5GnBpUPlg54fna4gFIHXZCjPr8Qs04PQ5E=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/revoke.key
+++ b/lib/hx509/data/revoke.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCxxDsKu8YJzHAXrUD6gT+mEHQU13LomQNJxLvyCpTa9UJ8M2r2
-1PvOZM2bCPV2T+4kfljEtErpj2yyjIJCBj7Go7z7lj9/zssVeUY4Nd8MKyjzHINP
-DoQW6iAHxrwpmDPYqQk7GDNKbo5svYb0NZcwrv5vLt3DS6ea2DJByeNGVQIDAQAB
-An9mxQtdKTFUeNxU09S8/fvOBbUWV3gXAF7mRtZhF7z22NOW+iLckEUDDUPQXV2L
-CKqkbmbjUVf9ru0oTBMCGJoxRYMF+UUPyCV/2EZFZAOJ5RfpCHAbOO7PfIZarj6K
-D13HS4P8fxMQiSq3hqVU2GYW+i/n4QGTYIPVqRae8lKBAkEA4BL0YfKTpGsS5NA/
-dPGbljkthRfUqlan1d0BtomLhE77SPyhX25DhW9B6VTZu5D7klRjr3/Djo9qBKE9
-xrVYeQJBAMsYOIbSDPDvF1oKhyutj9/zkXskUXci/6a1diPrUXF2cPzyKv+VWpyd
-AB3yWaCLgkyeI5l3KJbiM/t7xa6FXb0CQQCmNOkZDjn9p36oQuAO+ngSAe+F3Ztd
-jlGIDRsMLxJR3dP+24VHqB5lh5U4YjvvKSex7u7Sas6/nBljvcZ48mLhAkEAiCX+
-jvL1VfcSMnxoTTGXB8zitCiOrE08EOgJAN9Zw7Rg3lEB3kCjc+YUE/9JckTT3sUM
-nG6zOSL/MhGxXeNuCQJAW/6AqwhOHIDevBqiDWNTPnM0FkQMkDM9rdN4JWyARJ5b
-mNcdiUjyg/akjumwT4cma9PRKX3HW3S9293oJ9twhw==
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALX51ItGhI7DLxkM
+PhtnkKjkW+kqlKoqAThDITzvsQ+VWkln0yZxBoXHM385ZTCsiy2+w/YlPqs6NZor
+u4JCTIzXTRp9TJp01wE3Y75ow08xWpRgXeR7HN3cJLeCHKF4jk79xBJguJxZAEWz
+htqcwRzDPSiFZpsqvK26zcdZg+kJAgMBAAECgYAyQKWTOIwOqJPvBNR52OW33igL
+gbjALQ1dLhyVqVNqDEJ8lvFWYkv80X/FGGJ7SIq+vTl8VdiyjEaVJpKHbCubGbnp
+9/SWW3Fykcep3VpuKOm7p4nHgv/yKnEwH6aXz//PH+eRkmExdPV9PxqB4Fu3taFB
+n95Sy66cYKlZoPH5SQJBAOaMreh2Ne3cHBWy6v0/1ZyTFpVhj1i2hNcB2Pr7kkhM
+kHXR/aJzCp1UyS80XWiHb9uw2or9CZufjs3KziNNoMsCQQDKEHZJb4Y4gVS4Tj0g
+e7Oy8Di30BJNJ3+Lzsg5H1AbTIkJtDegRek7suyCoNb1Dvv1B2ghgq5bzab02hb4
+F4b7AkAm+WtA3BL71fTteiSdkVgEMx1jPW3lOl20lzxeGX8+N6tIL6qn9ri5piao
+kzqjPBod0oTvcB1asJuMkJdOgoYHAkALgOJrDdlTUDGViIa8Wa6CSmDAPi08jToa
+qHwHnHvAAhxvG/5qtnAvwODsEuIJ839ulKxd9AWfHlcZ62yRVS2PAkEAtUpgCPJZ
+H6JRhzra7NHe6smuJsSfNFftd+3ZrnZcICh2adCB1gMda62wUkHiFeU7YDGccaVJ
+oCoxV0wz83jnkA==
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/sub-ca.crt
+++ b/lib/hx509/data/sub-ca.crt
@@ -1,60 +1,60 @@
 Certificate:
    Data:
        Version: 3 (0x2)
-        Serial Number: 10 (0xa)
+        Serial Number: 7 (0x7)
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
+            Not Before: Apr 13 21:53:35 2009 GMT
+            Not After : Apr 11 21:53:35 2019 GMT
        Subject: C=SE, CN=Sub CA
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:e3:6d:42:f0:72:93:2a:b5:ea:6b:f3:80:ac:50:
-                    8f:ed:ae:bd:1c:76:3b:d7:50:61:d9:a1:32:2f:57:
-                    01:7a:2d:9c:d4:c9:ab:91:ee:91:1b:cb:59:1d:6e:
-                    01:af:de:24:8d:00:26:15:31:52:be:11:16:a5:8a:
-                    59:4b:9d:b8:49:a9:2a:ae:9a:56:6d:0f:9f:21:4b:
-                    6a:11:61:e2:d8:72:b2:b7:da:2d:e6:36:b3:90:82:
-                    4f:e3:24:36:96:0b:49:5c:48:6b:e2:f9:ff:40:24:
-                    ea:d8:3e:da:a3:72:1a:82:ac:0d:1d:a6:a0:0f:54:
-                    e1:18:dc:e9:3e:11:c5:ae:9b
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:d0:e4:3e:b2:ba:b3:7c:8e:ee:21:15:c5:9a:05:
+                    ca:02:2b:e7:38:8c:0c:2b:32:39:f1:39:d1:82:0d:
+                    c8:6e:53:5b:d7:bf:2f:89:3c:6d:7e:f3:b7:86:35:
+                    a9:5c:5e:5d:e8:92:b8:08:3d:4c:13:60:b6:bf:fa:
+                    8c:68:2d:92:de:f7:30:6e:10:9e:9e:b0:90:8f:3b:
+                    ef:28:01:7a:11:3d:e7:8d:89:11:d5:7c:d7:dc:45:
+                    24:4c:08:05:8a:86:6f:e8:78:9c:f1:91:0e:3d:41:
+                    aa:4c:93:6d:9c:9c:6e:bd:1f:19:a6:6e:e8:8f:eb:
+                    3f:ae:58:c9:64:e1:2a:dc:f7
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Subject Key Identifier: 
-                10:89:0B:17:61:CE:7E:63:8C:11:68:8F:FF:D5:C0:39:13:2C:BF:C3
+                2A:1E:28:07:27:76:85:BB:9D:D2:7C:F8:27:34:C2:D5:46:1E:C6:0F
            X509v3 Authority Key Identifier: 
-                keyid:51:3C:E4:A7:30:14:8C:55:74:95:1C:58:6A:F2:C6:05:6A:A7:E3:F1
+                keyid:A8:F7:9B:F2:D4:FE:78:3C:93:3B:A4:9A:0A:9D:A7:53:83:9B:AD:D1
                DirName:/CN=hx509 Test Root CA/C=SE
-                serial:9E:4F:9F:99:2B:2A:BA:7D
+                serial:F0:21:B9:BA:F4:60:2B:EC

            X509v3 Basic Constraints: 
                CA:TRUE
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation, Key Encipherment, Certificate Sign, CRL Sign
    Signature Algorithm: sha1WithRSAEncryption
-        5b:fa:55:63:b4:03:5c:a0:24:33:da:b3:01:05:87:2f:7c:27:
-        32:85:43:df:b5:18:3f:85:4d:cc:31:d7:10:28:08:f3:40:9d:
-        c1:af:29:32:0b:bd:f1:18:e5:d3:f7:21:df:40:9e:07:ae:5f:
-        e4:b2:09:e4:a8:ec:35:f5:d3:a0:59:3a:ab:a2:6f:1c:ce:74:
-        01:55:74:45:83:08:cd:05:56:cd:a5:63:21:d4:fc:18:47:17:
-        f9:fb:8b:1c:71:2d:be:6e:53:a1:92:0c:f4:f4:54:49:77:38:
-        88:68:18:28:dd:3b:7c:b7:ed:34:74:1b:34:af:2d:25:f9:ca:
-        d2:bc
+        73:75:e6:e6:65:66:55:c0:5f:75:4f:3a:70:bf:e3:e9:16:6f:
+        1e:5c:18:73:ed:a5:24:9c:a2:c6:ac:5f:5f:1e:57:b5:df:58:
+        07:a8:ca:43:52:e9:7c:9f:08:ef:d6:89:bb:8e:4d:eb:cf:9c:
+        fc:2e:70:a3:ae:22:ec:23:a2:8b:aa:eb:92:60:92:cb:4b:65:
+        7a:d5:16:ec:49:43:2b:2c:e9:20:e3:04:05:64:f5:34:aa:ca:
+        df:12:7b:12:c6:b4:69:68:c5:2e:33:5c:9c:93:a7:6d:22:5d:
+        94:0d:26:f9:df:aa:da:d1:e3:bc:ad:65:1c:69:bf:65:b0:17:
+        cb:38
 -----BEGIN CERTIFICATE-----
-MIICWDCCAcGgAwIBAgIBCjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIxNDgwMVowHjELMAkGA1UEBhMCU0UxDzANBgNVBAMMBlN1YiBDQTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA421C8HKTKrXqa/OArFCP7a69HHY711Bh
-2aEyL1cBei2c1Mmrke6RG8tZHW4Br94kjQAmFTFSvhEWpYpZS524SakqrppWbQ+f
-IUtqEWHi2HKyt9ot5jazkIJP4yQ2lgtJXEhr4vn/QCTq2D7ao3IagqwNHaagD1Th
-GNzpPhHFrpsCAwEAAaOBmTCBljAdBgNVHQ4EFgQUEIkLF2HOfmOMEWiP/9XAORMs
-v8MwWgYDVR0jBFMwUYAUUTzkpzAUjFV0lRxYavLGBWqn4/GhLqQsMCoxGzAZBgNV
-BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0WCCQCeT5+ZKyq6fTAM
-BgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB5jANBgkqhkiG9w0BAQUFAAOBgQBb+lVj
-tANcoCQz2rMBBYcvfCcyhUPftRg/hU3MMdcQKAjzQJ3BrykyC73xGOXT9yHfQJ4H
-rl/ksgnkqOw19dOgWTqrom8cznQBVXRFgwjNBVbNpWMh1PwYRxf5+4sccS2+blOh
-kgz09FRJdziIaBgo3Tt8t+00dBs0ry0l+crSvA==
+MIICWDCCAcGgAwIBAgIBBzANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNTMzNVoXDTE5
+MDQxMTIxNTMzNVowHjELMAkGA1UEBhMCU0UxDzANBgNVBAMMBlN1YiBDQTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0OQ+srqzfI7uIRXFmgXKAivnOIwMKzI5
+8TnRgg3IblNb178viTxtfvO3hjWpXF5d6JK4CD1ME2C2v/qMaC2S3vcwbhCenrCQ
+jzvvKAF6ET3njYkR1XzX3EUkTAgFioZv6Hic8ZEOPUGqTJNtnJxuvR8Zpm7oj+s/
+rljJZOEq3PcCAwEAAaOBmTCBljAdBgNVHQ4EFgQUKh4oByd2hbud0nz4JzTC1UYe
+xg8wWgYDVR0jBFMwUYAUqPeb8tT+eDyTO6SaCp2nU4ObrdGhLqQsMCoxGzAZBgNV
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0WCCQDwIbm69GAr7DAM
+BgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB5jANBgkqhkiG9w0BAQUFAAOBgQBzdebm
+ZWZVwF91Tzpwv+PpFm8eXBhz7aUknKLGrF9fHle131gHqMpDUul8nwjv1om7jk3r
+z5z8LnCjriLsI6KLquuSYJLLS2V61RbsSUMrLOkg4wQFZPU0qsrfEnsSxrRpaMUu
+M1yck6dtIl2UDSb536ra0eO8rWUcab9lsBfLOA==
 -----END CERTIFICATE-----
--- a/lib/hx509/data/sub-ca.key
+++ b/lib/hx509/data/sub-ca.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDjbULwcpMqtepr84CsUI/trr0cdjvXUGHZoTIvVwF6LZzUyauR
-7pEby1kdbgGv3iSNACYVMVK+ERalillLnbhJqSqumlZtD58hS2oRYeLYcrK32i3m
-NrOQgk/jJDaWC0lcSGvi+f9AJOrYPtqjchqCrA0dpqAPVOEY3Ok+EcWumwIDAQAB
-AoGAcDAw6j4K3PHaTyBSpC4loeEmBslIYcGUU3ASOooX/3ZKvCkzyow95tEcB8mB
-aYkSzL97Cc9H+tyhKE4kGIoYIse1D1ANUTKxdbzf62QQbSVgmKutBHEOrRoB2/97
-sE7APe6tyvOVqZleCjb/8NgzbzsZtH6mQmSQZj/SsQvmDSECQQD/CF7b8oZ5VYGJ
-GZUn5iDiT1RfIezZjE+gvttxinxv2HipzJ1s8ySTWBCqRB1AhuSHX6zOP3GV6cg9
-UVUd6pnRAkEA5EoWHohhMskL6pdOl4HTqyvCmLheY3y9wn6KRdFj624gyI2hyqYn
-iIyNDcfdu4YtLi4pH6+szvqmb3TvQk3wqwJAJh3XJ6JozMulz5reOxdfBNP8dTd5
-0c3xvMGpxJ+BF6pP5njpcnYomkkIPJpvkMxYbY80IaND07ccMWXthcohcQJBAN9u
-G0P62pan6n/JYuQp7o6jH6v1FnxshBStYIuAqjir6m4fIHCEOkEMvqj0KnH0mpeO
-GjWm7I0PCIIhgmH0gk0CQAamGhuYqbpoAJDWep/F/x3AXz6FqqBN1o+5N77d6XcJ
-RIU9tIRgcyecm0CFEtHcjzlQ1V4f2GXuoTkZn7o0ZjE=
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANDkPrK6s3yO7iEV
+xZoFygIr5ziMDCsyOfE50YINyG5TW9e/L4k8bX7zt4Y1qVxeXeiSuAg9TBNgtr/6
+jGgtkt73MG4Qnp6wkI877ygBehE9542JEdV819xFJEwIBYqGb+h4nPGRDj1BqkyT
+bZycbr0fGaZu6I/rP65YyWThKtz3AgMBAAECgYA9BcBPI/1U8MgdwCd2hCRsF/k2
+6qqPX9/PWU2byXz4xb85um8fjxiJkpbVTQ3JnwOd8mZyeb2kl4crc/zaXh3eHwMk
+rWbUeUcnVurjWOCH6d2Ki5mp18aUPseUGMT87OK3QFTJhjMSpnpnEIiNbSL0xnxP
+OlRwuMRhuuin9HceKQJBAPyV5Jy7QH0Xa4l8B8mRrbC/RxCnLg6heBn8+NyoZidP
+kYzOCWeJqm5fCNVzIvXl6aNWX4aTUyzUS5e1bJbkwiUCQQDTtyScIUfDE4G5uIjT
+7f6QQOMQUMz8TqWr4n1Fo1INAKWc0kq2GWpNS847pnLIGwT3SfJSyfv+3o/5I97e
+eIHrAkEAqqm4uvGGhD7jyRRFyrskqYzEPotHAlm1ZZHYsHcT9rG7fXDlR9DrmAGc
+XWSbFZyP/W3pw2sdwud6X/oUcewFBQJBAIan3nYbSLxPZNwN/aDlp1pymrje23HC
+R+cKF+k51k8E0VDsA67MfWsKQvJ3jFuvq7no42I6q7dQMTwhz3eqJ98CQQD4ylKI
+vYrOlD+F+cR+Nc78kZ0PweINxTIzSwi6iacAku+2AqTbT8gRgo7fA3pbkdgCwItd
+SVKhDVvKNeLzk9c5
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/sub-cert.crt
+++ b/lib/hx509/data/sub-cert.crt
@@ -1,26 +1,26 @@
 Certificate:
    Data:
        Version: 3 (0x2)
-        Serial Number: 11 (0xb)
+        Serial Number: 8 (0x8)
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: C=SE, CN=Sub CA
        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
+            Not Before: Apr 13 21:53:35 2009 GMT
+            Not After : Apr 11 21:53:35 2019 GMT
        Subject: C=SE, CN=Test sub cert
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:ab:c3:df:fd:78:b0:14:50:bf:50:a4:83:b4:cc:
-                    45:bc:0e:94:e7:1c:50:d3:08:54:e8:55:2f:ee:f9:
-                    b5:0a:d7:d5:2d:a8:c0:6f:6a:d7:9b:b5:86:fc:58:
-                    c9:26:af:c5:f4:ca:85:b7:02:d0:d6:e1:ae:40:1c:
-                    3b:f5:6a:52:77:28:69:d1:9d:2e:55:9a:9d:d1:f6:
-                    02:09:c8:b8:b7:cf:91:27:1d:7d:7f:43:1c:8c:26:
-                    da:25:40:a2:01:17:30:b9:63:bf:7f:16:17:27:7d:
-                    0f:d2:be:a9:5c:4a:ef:9b:69:96:47:57:2c:c2:7b:
-                    96:e6:f6:5e:52:0c:7f:6e:b9
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:b7:da:10:c8:e4:49:3d:8b:b7:09:40:8d:bd:62:
+                    7c:65:82:f1:ed:4f:fa:ac:19:9a:8e:ea:f8:6e:61:
+                    32:c5:62:11:5a:aa:eb:81:70:2e:ea:74:d1:17:db:
+                    8c:ca:43:89:23:b7:0d:ab:a8:6e:7c:5d:2f:71:4e:
+                    ef:63:ae:db:32:69:d0:54:9d:a7:85:10:ff:85:71:
+                    0c:b2:f2:bf:6a:5e:40:3c:e2:04:c0:13:db:6c:25:
+                    a5:66:d8:93:01:80:b4:29:fa:5c:e4:13:3d:24:ee:
+                    d4:14:90:7f:c9:40:a9:82:15:54:fd:9a:a4:49:74:
+                    f9:3c:3b:c3:d6:36:ae:8a:bf
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,26 +28,26 @@ Certificate:
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation, Key Encipherment
            X509v3 Subject Key Identifier: 
-                D1:60:4E:5F:2C:FE:F4:DE:29:DB:F2:5E:BC:2C:B2:DF:73:58:84:42
+                55:2A:85:39:32:4F:F9:95:1C:42:EF:E7:37:6F:BA:49:EB:18:11:B7
    Signature Algorithm: sha1WithRSAEncryption
-        65:4b:14:a0:36:3d:41:8c:2b:e0:b8:f8:b6:d8:50:43:3c:31:
-        97:17:71:15:93:ef:8a:bb:6d:73:40:9f:37:db:51:56:68:9f:
-        ce:88:ea:89:0e:f0:31:c0:11:f8:85:43:54:76:3e:41:7e:46:
-        99:1b:05:8a:ce:79:05:65:b2:bf:4c:c4:12:ac:dd:34:69:c6:
-        f7:31:02:db:8f:a3:ed:ac:4d:fc:a8:b1:ca:be:5e:65:2e:12:
-        91:8b:c3:b1:05:b9:2a:b6:04:30:f9:57:cd:01:0d:db:a9:b1:
-        cc:3b:2a:0a:53:9c:2f:3a:0c:a3:36:d5:7b:5e:8a:cb:be:75:
-        70:af
+        76:d5:be:d1:e7:59:cb:0a:8d:c8:3e:9b:ab:fa:1f:28:a9:67:
+        d2:db:29:f3:3b:f4:bc:84:9e:4d:39:52:c7:40:ec:8a:09:c9:
+        24:b1:b1:02:e3:89:c8:c8:85:5a:35:45:de:d2:02:78:a1:c2:
+        dd:64:5a:35:1c:a1:7b:d5:c4:d6:b6:29:57:04:38:9f:f1:79:
+        a9:b4:82:f8:98:ab:7d:74:94:15:4f:4b:1d:04:e8:86:d6:bd:
+        87:b7:27:cc:17:4d:eb:f4:34:1d:be:37:2e:36:e0:e0:51:69:
+        f9:87:ac:d0:86:4a:bf:93:8f:a3:75:fa:ac:1a:34:11:05:80:
+        97:c3
 -----BEGIN CERTIFICATE-----
-MIIB8jCCAVugAwIBAgIBCzANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJTRTEP
-MA0GA1UEAwwGU3ViIENBMB4XDTA5MDQxMzIxNDgwMVoXDTE5MDQxMTIxNDgwMVow
+MIIB8jCCAVugAwIBAgIBCDANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJTRTEP
+MA0GA1UEAwwGU3ViIENBMB4XDTA5MDQxMzIxNTMzNVoXDTE5MDQxMTIxNTMzNVow
 JTELMAkGA1UEBhMCU0UxFjAUBgNVBAMMDVRlc3Qgc3ViIGNlcnQwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAKvD3/14sBRQv1Ckg7TMRbwOlOccUNMIVOhVL+75
-tQrX1S2owG9q15u1hvxYySavxfTKhbcC0NbhrkAcO/VqUncoadGdLlWandH2AgnI
-uLfPkScdfX9DHIwm2iVAogEXMLljv38WFyd9D9K+qVxK75tplkdXLMJ7lub2XlIM
-f265AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTR
-YE5fLP703inb8l68LLLfc1iEQjANBgkqhkiG9w0BAQUFAAOBgQBlSxSgNj1BjCvg
-uPi22FBDPDGXF3EVk++Ku21zQJ8321FWaJ/OiOqJDvAxwBH4hUNUdj5BfkaZGwWK
-znkFZbK/TMQSrN00acb3MQLbj6PtrE38qLHKvl5lLhKRi8OxBbkqtgQw+VfNAQ3b
-qbHMOyoKU5wvOgyjNtV7XorLvnVwrw==
+hvcNAQEBBQADgY0AMIGJAoGBALfaEMjkST2LtwlAjb1ifGWC8e1P+qwZmo7q+G5h
+MsViEVqq64FwLup00RfbjMpDiSO3DauobnxdL3FO72Ou2zJp0FSdp4UQ/4VxDLLy
+v2peQDziBMAT22wlpWbYkwGAtCn6XOQTPSTu1BSQf8lAqYIVVP2apEl0+Tw7w9Y2
+roq/AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdDgQWBBRV
+KoU5Mk/5lRxC7+c3b7pJ6xgRtzANBgkqhkiG9w0BAQUFAAOBgQB21b7R51nLCo3I
+Ppur+h8oqWfS2ynzO/S8hJ5NOVLHQOyKCckksbEC44nIyIVaNUXe0gJ4ocLdZFo1
+HKF71cTWtilXBDif8XmptIL4mKt9dJQVT0sdBOiG1r2HtyfMF03r9DQdvjcuNuDg
+UWn5h6zQhkq/k4+jdfqsGjQRBYCXww==
 -----END CERTIFICATE-----
--- a/lib/hx509/data/sub-cert.key
+++ b/lib/hx509/data/sub-cert.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCrw9/9eLAUUL9QpIO0zEW8DpTnHFDTCFToVS/u+bUK19UtqMBv
-atebtYb8WMkmr8X0yoW3AtDW4a5AHDv1alJ3KGnRnS5Vmp3R9gIJyLi3z5EnHX1/
-QxyMJtolQKIBFzC5Y79/FhcnfQ/SvqlcSu+baZZHVyzCe5bm9l5SDH9uuQIDAQAB
-AoGAeN4T74SOuyz7A19RAte/to64P00Qnv+85+SSH2L9/8xTSZb3GzAe2oZJn6dG
-nP+RmCkvINJNbPhQKvLzSkXwEpvCd7hU+v5uAd906Wu8af7a1W9JaJH2mSbWhRhL
-/aa5gRY8buNy4IH0uGiv1Yti7GHTBLMsZGxZPKLL5gpz80UCQQDgeyq0wu0EhvX1
-JlgK2uhc9p6toZ12XwjAH3ikEYtKOEr7kzlEBnPMqUWU/5hrh8sLtoq/Rhy8lrYj
-e4YmiSOXAkEAw+Hdee6ie2IJRolpOsiiZ5GqjxLYILBIzS0xnIIgpJGU4g42fTT3
-rJ54nanAs6ebwqV5mgVelRvGMrYpN0IKLwJBAKLhm9Y3TgWn69Wqsd2Gg23Y4MA5
-8WhPgqjs7PuXY0tCV139sGKkj+ejt0Jqx2zWxkTEeh5ZwEYy0Qwj9+4EOhcCQD2l
-Sn9CI65y1vp06kIOvFWd2TB3vL7k27R+oZtgtIc2LcXKtUlILx4LLWho8PVZLULf
-stpPEEoa2JBDFcuHJA8CQQCc/rbxp/yofG9hxFTVZvB3+USQPN7vMijkd5ppwpkq
-+hyaHDANZsPEG39Gw6roX0z1lWVkVYl7cT2AlsCwOaFJ
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALfaEMjkST2LtwlA
+jb1ifGWC8e1P+qwZmo7q+G5hMsViEVqq64FwLup00RfbjMpDiSO3DauobnxdL3FO
+72Ou2zJp0FSdp4UQ/4VxDLLyv2peQDziBMAT22wlpWbYkwGAtCn6XOQTPSTu1BSQ
+f8lAqYIVVP2apEl0+Tw7w9Y2roq/AgMBAAECgYEAqMuzIV5GyBTgZcQ43inv4BtL
+FwCZOyz+tDyS/nSK8qHJIR9PvbVLvcKmvmq6ZnF/FaVZDcNEPTYo+rToIPNHFv/l
+WPAcDEfftXBd1kci5OnsmSc9KFNG6esxyS3N2zCuJwx0jpzqbI5nnolcR3RvPp2x
+o8pH+6pn7atmQkSK1vECQQDuQWuOF+HyNknci5LUB91kFIOrylzMI/jEETWbiB1Y
+BLinXTh89kiZ5T4o6rnIPgW9G7QaFS08UcM3CQuqMbwdAkEAxYtiT59yFydBCu4r
+Hkcte7Vy/pFjUiKYASDJ5UqAgU/KqPO6Lr2b8F7FuO1OXhbfwP8r2zv5sHC1ALsK
+FXBTiwJBANZhsz/GKZ7iTo/OXy2+be1RsDDyA5IEhCEYQx5R2eWLSgP+k4eNrEId
+zlLO8qBFfrBsryAREgUGpRtuXjqkSdkCQQCiKpJCGvpl12ultW7gJD5KV+JW6LNI
+Me3mvyv+dvKXNRGBMNOemzjwUlyuOuEijFSS8ublyo5nMZ7lQqY8g0GRAkAR2noA
+2Hx+SGetfySmyJ2dLNhGK3HQO4kev1NmukwHEjuJT5xNBPUIoXOslzFtvhjh6Tj7
+hWmUAvqrKK/P2J4M
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/sub-cert.p12
+++ b/lib/hx509/data/sub-cert.p12
--- a/lib/hx509/data/test-ds-only.crt
+++ b/lib/hx509/data/test-ds-only.crt
@@ -5,22 +5,22 @@ Certificate:
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
+            Not Before: Apr 13 21:53:34 2009 GMT
+            Not After : Apr 11 21:53:34 2019 GMT
        Subject: C=SE, CN=Test cert DigitalSignature
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:9c:d9:70:8b:a1:4d:1e:7e:7c:f8:12:d5:42:05:
-                    78:48:c1:37:4e:85:5a:0a:be:6c:b3:51:67:c1:50:
-                    b0:7f:36:80:bc:f0:65:4b:90:d1:2e:28:f1:ef:f5:
-                    67:a2:13:61:75:44:63:ac:61:7a:54:ea:85:0b:4a:
-                    b1:d4:06:b8:77:5c:ff:86:e7:38:b1:92:46:c6:5a:
-                    70:d8:f4:40:42:ab:13:83:cb:5d:5c:d2:b9:1d:c4:
-                    cc:7a:b8:c7:04:a3:34:b8:3c:df:5e:c0:03:59:c8:
-                    0a:e2:17:bf:7a:fa:e0:cd:d5:b3:5f:ab:3d:f4:43:
-                    46:cf:03:8f:2f:4e:1f:7b:cd
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:e0:5f:8e:d3:15:38:4c:21:98:24:7f:a8:ad:b6:
+                    0a:dc:f0:32:01:47:f0:ec:28:f0:8a:f6:7b:b5:3f:
+                    72:c1:0c:43:d6:f4:8e:7a:a1:93:11:e7:fe:69:3c:
+                    44:85:35:d8:c4:61:ca:37:e4:13:75:71:ed:ef:8a:
+                    9a:25:6f:8e:cf:7f:1f:06:e3:6f:ae:32:9a:35:07:
+                    ac:68:d2:eb:da:33:4d:7a:97:9d:b9:6f:d8:3b:40:
+                    7f:2c:f7:a7:36:24:9d:95:17:ae:a6:d1:2f:a1:19:
+                    0f:2e:b3:6b:3b:22:1c:bf:fd:82:f3:9a:75:02:d1:
+                    f4:41:a7:73:b3:53:35:88:1d
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,26 +28,26 @@ Certificate:
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation
            X509v3 Subject Key Identifier: 
-                19:E8:0F:9C:D3:12:84:25:16:2D:1A:21:53:39:C1:71:0D:33:25:2F
+                D9:8A:90:B1:E9:4B:A1:EA:DC:BF:53:48:B8:32:28:A5:B8:83:A7:37
    Signature Algorithm: sha1WithRSAEncryption
-        a2:8b:92:24:0b:e4:47:cb:1e:40:3c:cc:31:ef:4e:76:cf:1a:
-        29:8c:8b:a6:ba:87:19:80:4f:a6:26:21:b2:ae:41:ca:ae:2a:
-        fe:1a:0f:f8:70:30:17:a2:41:7d:d3:62:36:8f:72:3c:50:d2:
-        b7:1e:22:ee:95:0c:20:14:26:47:99:50:97:a6:e1:da:c5:88:
-        cc:f7:5d:77:f7:73:ab:c4:f7:50:06:11:44:4d:31:26:b5:80:
-        70:67:aa:0c:d8:d0:b0:b0:b5:10:a6:3a:3b:cf:ef:bb:de:6e:
-        12:d4:cb:38:86:16:f1:b2:47:3a:29:c4:07:6c:cf:ef:6b:d5:
-        40:f8
+        58:bc:cb:78:5b:35:90:97:36:66:ee:da:d5:0d:dc:f2:f2:a5:
+        79:19:1c:d4:56:0e:94:91:a2:9a:ac:f0:f3:98:88:35:e1:48:
+        da:08:96:4c:6f:f4:06:f8:b9:a1:2a:d0:17:d4:c0:6a:bf:9e:
+        f7:95:5c:e5:35:41:d3:a4:c9:da:8a:95:93:33:d2:8c:19:46:
+        01:c2:17:e1:0d:55:ad:f4:87:8c:40:99:e3:26:41:d4:1e:a1:
+        fb:3d:2f:76:4c:3d:c6:92:3f:df:53:30:9a:e8:99:ff:64:ac:
+        42:a3:3c:47:eb:6a:39:54:82:43:99:2f:54:d3:6a:97:d9:55:
+        1f:16
 -----BEGIN CERTIFICATE-----
 MIICCzCCAXSgAwIBAgIBBTANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIxNDgwMVowMjELMAkGA1UEBhMCU0UxIzAhBgNVBAMMGlRlc3QgY2VydCBE
-aWdpdGFsU2lnbmF0dXJlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCc2XCL
-oU0efnz4EtVCBXhIwTdOhVoKvmyzUWfBULB/NoC88GVLkNEuKPHv9WeiE2F1RGOs
-YXpU6oULSrHUBrh3XP+G5zixkkbGWnDY9EBCqxODy11c0rkdxMx6uMcEozS4PN9e
-wANZyAriF796+uDN1bNfqz30Q0bPA48vTh97zQIDAQABozkwNzAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQUGegPnNMShCUWLRohUznBcQ0zJS8wDQYJ
-KoZIhvcNAQEFBQADgYEAoouSJAvkR8seQDzMMe9Ods8aKYyLprqHGYBPpiYhsq5B
-yq4q/hoP+HAwF6JBfdNiNo9yPFDStx4i7pUMIBQmR5lQl6bh2sWIzPddd/dzq8T3
-UAYRRE0xJrWAcGeqDNjQsLC1EKY6O8/vu95uEtTLOIYW8bJHOinEB2zP72vVQPg=
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNTMzNFoXDTE5
+MDQxMTIxNTMzNFowMjELMAkGA1UEBhMCU0UxIzAhBgNVBAMMGlRlc3QgY2VydCBE
+aWdpdGFsU2lnbmF0dXJlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgX47T
+FThMIZgkf6ittgrc8DIBR/DsKPCK9nu1P3LBDEPW9I56oZMR5/5pPESFNdjEYco3
+5BN1ce3vipolb47Pfx8G42+uMpo1B6xo0uvaM016l525b9g7QH8s96c2JJ2VF66m
+0S+hGQ8us2s7Ihy//YLzmnUC0fRBp3OzUzWIHQIDAQABozkwNzAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQU2YqQselLoercv1NIuDIopbiDpzcwDQYJ
+KoZIhvcNAQEFBQADgYEAWLzLeFs1kJc2Zu7a1Q3c8vKleRkc1FYOlJGimqzw85iI
+NeFI2giWTG/0Bvi5oSrQF9TAar+e95Vc5TVB06TJ2oqVkzPSjBlGAcIX4Q1VrfSH
+jECZ4yZB1B6h+z0vdkw9xpI/31MwmuiZ/2SsQqM8R+tqOVSCQ5kvVNNql9lVHxY=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/test-ds-only.key
+++ b/lib/hx509/data/test-ds-only.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCc2XCLoU0efnz4EtVCBXhIwTdOhVoKvmyzUWfBULB/NoC88GVL
-kNEuKPHv9WeiE2F1RGOsYXpU6oULSrHUBrh3XP+G5zixkkbGWnDY9EBCqxODy11c
-0rkdxMx6uMcEozS4PN9ewANZyAriF796+uDN1bNfqz30Q0bPA48vTh97zQIDAQAB
-AoGAScGuPNrTCv3sAjPI+MzdrUi+mzv2BYtaTlB/e9ZXyNp2W2KoH4qv8wbqDi7W
-Vs7KS3ynak5EWl4VxiOPz+aBI1OfpCVKzuDR8IkSQ0rE0ufMOG54QP0SG7mp3dPX
-bsXvyeqO1EOVj5H4oqJKkydDRQpkm8RszaNJ+o+sEWlgAIECQQDNxs8O0iYc6xRg
-XDOIE9l/B4Fi/YXl9Pcs0xq2Cwk22NvzSQyYo+mHt2GK2xGYkyPV/dTXAbe0RaVa
-YcbZhFUdAkEAwyGYBbs5JAtKWVp4bJZ95pepeBGPeZ/X4UbqTiZe9gPXrr3ax/qE
-eVezTCOD1ZUEacpTHWWrp0fBZXixMdtycQJBAJpGCQqFh0l6/UXZGlFVAGT6TYjX
-pcFnzMBwbMA6uefC4fQdujHeAcFcPOcLor+O4PkYWq/ve7jN1lBSqfB+BAkCQHde
-6b0317DxJz6aVek39zVFumq1c2wYGNy7oULFvnoJx7wicOC9pKUGvazqXRAf5V9C
-Yq4tMGFZSDpnJx80/EECQCdJqAA4kpOI/tN4dT6si+EeXYXZPHALGy39x/eTRT0N
-gZfB2IB0AvmpRUyr/d+XOewD/u7Rf7dnNdFQPrKq+sE=
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOBfjtMVOEwhmCR/
+qK22CtzwMgFH8Owo8Ir2e7U/csEMQ9b0jnqhkxHn/mk8RIU12MRhyjfkE3Vx7e+K
+miVvjs9/Hwbjb64ymjUHrGjS69ozTXqXnblv2DtAfyz3pzYknZUXrqbRL6EZDy6z
+azsiHL/9gvOadQLR9EGnc7NTNYgdAgMBAAECgYBkPIxz5ID4EfIELDvRDwifV3cf
+d2I8PrXnfuIZQLUlZTNRboPQaSpoz3mqzc/Wqw2h/gX3Hh9LUpB3eTYQD1x+o9eu
+mXKiPM3FwPCQc02YDqnEc0JCYKcnKE1erOahNkQX+9/AWRwkHLirBV0N1B3LaMdE
+fSmywG7f6OFGTd64wQJBAP0shEYGjTIaL8IO3S5Xd1czd0JBJoCpW9nLPs3hko3j
+2cPyIHYrObZomln5CfeiMQO04ybK1AB/ob740wn6R/UCQQDi4L0wMLMLlkt6aFGa
+WVqV/uFPrAXjri794MKDDU1MJbKVZ4iRpNvYQ9jdguHZiEFg7EoEWuCux/MiKTdq
+my6JAkEA2+PDSvK7xc1at4ijcHGFdJZ9uWzOnSb7YNGXTcfiuxwv8nEk4p2udZCq
+pwSXNJ6JRbfhJrs5oOk5uZ1x5pOb1QJAeuCrtrj5kBIDqTVs1QMGG+0izMrnmavS
+SbB8yQvgTJiyQ1cC0ZcPdu8wOrDTb8TrW/o+EGPEAwXKejsGh5equQJBAKYiKpbj
+NTNco3kniWejAiw2813S0y92JmLm9GkBv38W+lww4z386bzDfn18Qgw6JrXVd2QP
+IU7AzX3sdqBp1ZQ=
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/test-enveloped-aes-128
+++ b/lib/hx509/data/test-enveloped-aes-128
--- a/lib/hx509/data/test-enveloped-aes-256
+++ b/lib/hx509/data/test-enveloped-aes-256
--- a/lib/hx509/data/test-enveloped-des
+++ b/lib/hx509/data/test-enveloped-des
--- a/lib/hx509/data/test-enveloped-des-ede3
+++ b/lib/hx509/data/test-enveloped-des-ede3
--- a/lib/hx509/data/test-enveloped-rc2-128
+++ b/lib/hx509/data/test-enveloped-rc2-128
--- a/lib/hx509/data/test-enveloped-rc2-40
+++ b/lib/hx509/data/test-enveloped-rc2-40
--- a/lib/hx509/data/test-enveloped-rc2-64
+++ b/lib/hx509/data/test-enveloped-rc2-64
--- a/lib/hx509/data/test-ke-only.crt
+++ b/lib/hx509/data/test-ke-only.crt
@@ -5,22 +5,22 @@ Certificate:
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 21:48:01 2019 GMT
+            Not Before: Apr 13 21:53:34 2009 GMT
+            Not After : Apr 11 21:53:34 2019 GMT
        Subject: C=SE, CN=Test cert KeyEncipherment
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:e4:33:6d:d1:fb:6f:01:fa:6b:47:fb:3d:e7:6c:
-                    42:e6:14:ea:cb:ff:b4:2a:93:61:fc:ac:bb:ee:d0:
-                    e2:44:a6:a7:d6:a4:ce:dd:5c:a1:4d:27:5b:66:50:
-                    34:c1:b6:13:79:9d:d6:63:7e:c9:d6:02:ae:40:9e:
-                    74:a8:12:9a:2e:ff:29:03:e4:11:a4:f4:ed:97:55:
-                    85:39:9c:c0:53:f6:86:89:e7:a8:cb:8b:d9:0b:36:
-                    cf:d2:b7:c6:69:83:e7:d0:f8:ed:30:1f:c4:e9:94:
-                    b5:0b:82:5a:2b:d9:47:42:7e:1f:55:9f:d9:28:89:
-                    26:a3:9e:ef:0d:05:63:d8:f9
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:e2:cd:e0:12:3d:06:ab:10:07:27:37:a5:61:9d:
+                    a0:95:7a:e4:27:4d:d3:51:42:c0:90:6d:c5:6b:89:
+                    97:d8:4d:46:8b:79:13:38:ad:1b:b1:ab:81:d6:be:
+                    2c:5b:6a:43:e2:1d:77:ea:53:84:6f:ec:9a:75:52:
+                    82:87:fc:72:ee:c4:78:d0:6f:11:77:19:d2:f4:03:
+                    05:01:f6:e6:b6:ea:55:8d:cf:d5:38:e1:d2:44:bb:
+                    e9:4a:d8:a7:90:b4:17:c8:38:e6:a7:b3:74:07:3e:
+                    ea:b5:c8:cf:dd:eb:f3:f1:40:db:f4:88:cd:ea:ab:
+                    da:be:e9:ce:8a:7e:bf:24:a3
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,26 +28,26 @@ Certificate:
            X509v3 Key Usage: 
                Non Repudiation, Key Encipherment
            X509v3 Subject Key Identifier: 
-                F8:68:AD:D6:DE:5F:4D:14:B8:A0:FA:79:3B:45:57:1E:55:BA:BF:F9
+                72:15:D6:43:78:57:2F:0E:37:47:51:46:9F:53:37:B7:96:6C:EA:88
    Signature Algorithm: sha1WithRSAEncryption
-        9a:42:8b:67:03:2e:fa:b0:fc:df:ab:da:65:88:85:86:26:f7:
-        ed:a2:38:c1:40:0b:41:80:a8:42:23:c6:cb:9c:c5:8a:e3:c7:
-        92:07:c9:23:3c:b6:f5:76:cf:59:3a:dd:57:e3:64:11:c8:62:
-        45:99:e3:d6:bc:ef:03:fd:a2:aa:1b:6d:fb:fa:db:7b:01:56:
-        71:b7:35:ad:7e:5d:b0:3a:ad:8b:00:74:39:f9:d1:32:77:45:
-        ec:4d:5b:d2:99:2e:bb:2c:d1:a4:51:f9:aa:60:c3:f0:d7:07:
-        65:4b:54:bf:d1:d2:9b:b5:f7:f1:89:73:f5:67:00:70:9a:da:
-        ee:b3
+        68:02:c9:64:8a:bd:03:90:aa:78:3f:5f:81:e4:61:dd:0e:c2:
+        80:29:e1:56:dc:42:8c:bf:e0:0c:9d:21:c2:4e:12:22:41:7a:
+        97:8f:53:d1:c0:21:9d:d4:f0:c6:62:e4:83:ce:d9:23:e7:7a:
+        6c:9c:92:87:18:2a:17:cf:aa:7a:20:4e:b4:34:e3:c6:23:71:
+        6e:18:7d:d7:c1:7b:4d:c9:7f:17:48:a4:42:89:05:d9:d5:96:
+        76:92:b8:42:9a:2a:76:a7:e2:36:02:a7:b1:a5:c2:87:51:63:
+        3d:5d:1f:84:3b:48:30:92:ea:40:e2:18:b1:1d:53:76:98:cf:
+        fe:bb
 -----BEGIN CERTIFICATE-----
 MIICCjCCAXOgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIxNDgwMVowMTELMAkGA1UEBhMCU0UxIjAgBgNVBAMMGVRlc3QgY2VydCBL
-ZXlFbmNpcGhlcm1lbnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOQzbdH7
-bwH6a0f7PedsQuYU6sv/tCqTYfysu+7Q4kSmp9akzt1coU0nW2ZQNMG2E3md1mN+
-ydYCrkCedKgSmi7/KQPkEaT07ZdVhTmcwFP2honnqMuL2Qs2z9K3xmmD59D47TAf
-xOmUtQuCWivZR0J+H1Wf2SiJJqOe7w0FY9j5AgMBAAGjOTA3MAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgVgMB0GA1UdDgQWBBT4aK3W3l9NFLig+nk7RVceVbq/+TANBgkq
-hkiG9w0BAQUFAAOBgQCaQotnAy76sPzfq9pliIWGJvftojjBQAtBgKhCI8bLnMWK
-48eSB8kjPLb1ds9ZOt1X42QRyGJFmePWvO8D/aKqG237+tt7AVZxtzWtfl2wOq2L
-AHQ5+dEyd0XsTVvSmS67LNGkUfmqYMPw1wdlS1S/0dKbtffxiXP1ZwBwmtrusw==
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNTMzNFoXDTE5
+MDQxMTIxNTMzNFowMTELMAkGA1UEBhMCU0UxIjAgBgNVBAMMGVRlc3QgY2VydCBL
+ZXlFbmNpcGhlcm1lbnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOLN4BI9
+BqsQByc3pWGdoJV65CdN01FCwJBtxWuJl9hNRot5EzitG7Grgda+LFtqQ+Idd+pT
+hG/smnVSgof8cu7EeNBvEXcZ0vQDBQH25rbqVY3P1Tjh0kS76UrYp5C0F8g45qez
+dAc+6rXIz93r8/FA2/SIzeqr2r7pzop+vySjAgMBAAGjOTA3MAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgVgMB0GA1UdDgQWBBRyFdZDeFcvDjdHUUafUze3lmzqiDANBgkq
+hkiG9w0BAQUFAAOBgQBoAslkir0DkKp4P1+B5GHdDsKAKeFW3EKMv+AMnSHCThIi
+QXqXj1PRwCGd1PDGYuSDztkj53psnJKHGCoXz6p6IE60NOPGI3FuGH3XwXtNyX8X
+SKRCiQXZ1ZZ2krhCmip2p+I2AqexpcKHUWM9XR+EO0gwkupA4hixHVN2mM/+uw==
 -----END CERTIFICATE-----
--- a/lib/hx509/data/test-ke-only.key
+++ b/lib/hx509/data/test-ke-only.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDkM23R+28B+mtH+z3nbELmFOrL/7Qqk2H8rLvu0OJEpqfWpM7d
-XKFNJ1tmUDTBthN5ndZjfsnWAq5AnnSoEpou/ykD5BGk9O2XVYU5nMBT9oaJ56jL
-i9kLNs/St8Zpg+fQ+O0wH8TplLULglor2UdCfh9Vn9koiSajnu8NBWPY+QIDAQAB
-AoGAH0L0XnnFYU3++GNwvY1VNNPUvpGPCu4Z1FWNgU/YT3NNNthpBmY0Kq+jk8aV
-E5xv2o9G2WZ7G/hOCsgqTwQNXvSK27rZdIs6YB3MqcZIB0PJWOe7LYkMM3sVxqhU
-7Z10eNfqkMvR1CLsDmHTw3iSmJ5mblwjFUJJpxt5jQV3o4kCQQD7mni/lInowbEz
-er0lAOIdiZLc78r6GZmrELbQ2gMwq87citbvG4A8/0g6px84S9XY+Bwe6qrL39V/
-gLVQ0FzjAkEA6DBEm1vgHiqMiVqfg2Mg/J0GEQzpaM8ceuMogJHIhFVR/xamy2sx
-48QYxNC5W6JBVQ45fMjQDJOyUV55fn6VcwJAIGvWVXGRl9GlwOl3CBamDIJWz2uC
-71lvKND9jcoaESKChH7LlYIoszN+Hji82CdFhjDqhr1churv+v8d3i0LWwJBAKx+
-r3l72BSRJ7cjTD4f9vG09jzUitMCivYArKZXp9AoUrJf8apOCNJdbMlLB2m8MS0v
-VCYQSgAN+fvZZAlFoWECQQDVWY70F0M5gAfsRznp5TR+wUdAgC7jNnfi5AGr6I45
-295Np9IgYWb3baxgy1xC05NdUZQSzfdaFWACw3iqx6U5
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOLN4BI9BqsQByc3
+pWGdoJV65CdN01FCwJBtxWuJl9hNRot5EzitG7Grgda+LFtqQ+Idd+pThG/smnVS
+gof8cu7EeNBvEXcZ0vQDBQH25rbqVY3P1Tjh0kS76UrYp5C0F8g45qezdAc+6rXI
+z93r8/FA2/SIzeqr2r7pzop+vySjAgMBAAECgYEAkj4Rp3D2JcM1+ZGl7+WFsB0H
+lFhYU+No6zf8vjSAVpatUC2HuVnVq6BdHiyNyXwhvWEm+09S7CByEAhd5nVfXWMV
+ngzh6td0EkG7TuHpnjIJ4v8O/54eWbWXzA5VPaSIcXmZKAvV6llIYB6aXoq5KNPi
+RvP5NnwnNb1m8b8vZFECQQD6VG/bEacZukpbyQdrD1U1H48nmsyEd9caCs5JA+RX
+GDLlFjNa3I37Fda4yFn8xzXBh3wzGViiuLWFsqEtQ1BPAkEA5/EFxwUoSB7ne47+
+gDT3Ix13MakchnaTKwzL1eqsacGMkTbvJfiYRljnTsaBfglw6rIZCmD9vTQaNFTQ
+QvMdbQJAZ1pJPFdTeGnTnYWoTGluMpqvDhj5a4/W/WeMt9Slh9fz22WJGnCJJitk
+FbKShKzy4s4/VxGV6Mj+GQ8hQIDUPQJBAMWLiMorYFWczLd14Nk9Q0hLLlvDlyIH
+F+1QpsN5boNcb+a2jRUgGEHCMq/rbhr025FpQt6OIU7mc3Mi0YZUHjkCQCjVhTn0
+E7eVQJfgVz0PPmDjtNdjmPiuTFOusE7Bb+WEjLXYL1TePJ9WfkSQeCmmUXv3tTEy
+IPgyB57qBPYQ970=
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/test-nopw.p12
+++ b/lib/hx509/data/test-nopw.p12
--- a/lib/hx509/data/test-pw.key
+++ b/lib/hx509/data/test-pw.key
@@ -1,18 +1,18 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,5BC583A0C8AD38408305F4E9978B50B8
+DEK-Info: AES-256-CBC,CFA3EC7C5C1F7AAD3EAE77F3087833DA

-QJMnvFA80I0R9Ipj+Hcq34Dy6fHv47gxoxBvIO7Z6PsT6Nj9AItzRgVwTaAzIV5A
-XtEtUhT8WUD7mQbmOvJ0m0cQWJtY46JDJWGKhmLPOmqTlXd6UK4g7zh9x6G1O9vq
-xDFjmP/i4v2+MLExLJ850txFWSSLBzFbpkDB7r7nozrMupgWqqdotjbEEwTkTDRE
-xNRlb7XsgAeYuHN7Pe+iSDDJNZfH0sxpAeMnGpQBuGpS5MgToIPfysBj9VHcvhwy
-qaygJJxNy3pLS+FrdxD8bomzC4ECSKwsGG8uZBccp2l+VXwZikXdxY+pJYXbpZQN
-Ww0dMfRfw/f/6+sadkAiU1Xtml+U8HNlJVpyeZcdMPLstnEbf881bVDwWbqqZ6zG
-qz/ikmI5S4XnJf2LskujZHLcqdhzy5yRGqm37L60BK3P6d3OHfKJmJfvYYkpzti9
-NkggO9Sje7vRNaOy9ZgkifoiFkTQjjQ3eEIXfVlMQkENHRNv71ojJ44ZJVu6ihhr
-AL7hxnlHOiwY/lF3u7Y5su9x6fpRUpcJeTqb+2b6fdtEIenb0QFYSO4c73858VQy
-K5zrihXCrx3ptJMPiyy8jGA9DGs7RQYi64CVaf4TgHBKaJOl7xBlNJSfgjOv8vDB
-9Ta+OFCeSGr/W6ACtUkAVj8mXplCt5htAmBK1yt0g5W5ucTwoOgTe3Crfectf6aQ
-MKCeIrseM1lE65mLOFTJiEjX0KSKa08P7HhceHq5lyzNgaJu0Mq8krlJFpsE/d5q
-ifEH5iZvZyFBfYm9BIb7YHDlQtwn0wNcGeQ4mXS2AS/Uy7GGyanzwrF/nKjcvefI
+/MGac49rvDDpzJEqwVc0F+mNGN68ocHe28DD12sRbQa40ovHACFxbMUl+YhMLOXU
+wwYtPhCYCM4RmgJoy5IhCk/KRPWuS5XSTMJ4w30wKz++gCXMDne/kWGdEguaC6YR
+oVnVp6l9HUh+KYXjep7tV1x1bEuu9P8y5WvzHtd2BTMWIRQktgR7+dUX9TVfHZon
+DTmqzy2zIzwDy/CeB93EQnzihn9HQsUPn3xs8OXWInhWta0sd+QE3vfpkM3RMSd0
+NQIOoU7nHtLSy4GixPotXkS7uEfTOXtRJmjkSRRbkENXrSXb5JPnqNYubk9ae22s
+d5GIJxW3kJGFHpA6kRivJ8QIcMl3PUtxn+XAx608uP+h43xV/6U7YQyUaWH2DlRK
+UJUdr1ZLXLtLu+osvC8so1eP09Lig0MAuynxZI8736QSaDkeOaifQzG5BhUSjm4t
+J/su+xh7AMPkMZg+8MASflhDcly/TKlbBr/UG1tPKqrX2F4TkKVV16DGFzWL1VPv
+GcTWe4mcX9DZ0J9mgI3Gjd9QFCBIR5otGHmJ/2KGXg0WljBltM5g1GOZ55aOidE3
+Ui0D6m40JyUiRSraQd0DghWJwnoJARHwsx1KP1PCEuzNDgEcZoNhrCvaDtl8NQ4s
+AMPuFddB0i//z68J2VoFtRNtc4k96Im+sDGkPA0ivxQkML17bxSB4VBLojkVHaSH
+KyPHNUiioYsULOTfzdbdG5kF5y/0dJcuBeTCTIlbGGKkIBZHLcrXpaxXO4UmDFWj
+9g4cIVdZ04SAWA5f3Q2e3kcmwq5eohoqUHbSgJ6BOmLGvMwHQ/wMOYop0nuZVkzs
 -----END RSA PRIVATE KEY-----
--- a/lib/hx509/data/test-signed-data
+++ b/lib/hx509/data/test-signed-data
--- a/lib/hx509/data/test-signed-data-noattr
+++ b/lib/hx509/data/test-signed-data-noattr
--- a/lib/hx509/data/test-signed-data-noattr-nocerts
+++ b/lib/hx509/data/test-signed-data-noattr-nocerts
--- a/lib/hx509/data/test-signed-sha-1
+++ b/lib/hx509/data/test-signed-sha-1
--- a/lib/hx509/data/test-signed-sha-256
+++ b/lib/hx509/data/test-signed-sha-256
--- a/lib/hx509/data/test-signed-sha-512
+++ b/lib/hx509/data/test-signed-sha-512
--- a/lib/hx509/data/test.combined.crt
+++ b/lib/hx509/data/test.combined.crt
@@ -5,22 +5,22 @@ Certificate:
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 21:48:00 2009 GMT
-            Not After : Apr 11 21:48:00 2019 GMT
+            Not Before: Apr 13 21:53:34 2009 GMT
+            Not After : Apr 11 21:53:34 2019 GMT
        Subject: C=SE, CN=Test cert
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:e2:00:4a:75:49:06:9b:9e:be:96:65:75:13:19:
-                    d2:26:43:b6:8b:67:39:3c:40:07:6c:97:74:2f:0b:
-                    b8:a2:ca:da:34:b5:2d:bb:c4:17:27:c7:4c:ef:f4:
-                    2f:2c:d9:5b:45:2b:67:48:55:b7:95:0d:ec:67:3e:
-                    d7:93:f2:2b:5b:13:01:ba:43:41:06:c2:14:13:b6:
-                    f9:cb:92:7e:60:0e:2d:cd:75:61:25:0d:19:b0:f5:
-                    85:97:47:85:d6:48:09:1c:1d:16:14:21:73:5e:99:
-                    79:dd:79:27:75:4f:f5:24:dd:b2:ae:db:c6:9f:e1:
-                    37:55:5c:88:4d:97:fe:96:7d
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:c2:67:b4:e8:2d:d7:5b:61:b3:2b:01:d7:d2:21:
+                    89:72:f8:fa:68:4d:b8:73:5a:bd:0d:bd:85:90:89:
+                    a4:28:a5:a3:7e:a9:06:da:d8:d0:73:2e:ba:63:33:
+                    7f:e1:03:3e:f7:b0:33:a9:87:ed:44:45:bc:0b:38:
+                    b9:49:5f:82:8c:59:c2:50:42:42:c4:a9:55:93:ca:
+                    c1:34:5a:3e:40:23:b6:dc:5f:df:3a:ec:6b:32:6a:
+                    c7:0d:38:b7:49:9b:f3:9f:46:d0:03:24:6e:12:d0:
+                    3a:36:64:5e:f6:f3:38:0c:71:0d:79:c0:bd:2b:0b:
+                    7e:3b:f9:d2:3d:84:f6:37:f9
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,41 +28,42 @@ Certificate:
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation, Key Encipherment
            X509v3 Subject Key Identifier: 
-                8F:3D:D0:8C:5D:35:CC:31:59:12:6F:C5:56:DF:1A:84:2D:8A:AC:51
+                D5:18:04:E8:5C:B5:E3:79:6E:9C:31:B2:F6:8E:4F:A3:E0:15:77:0F
    Signature Algorithm: sha1WithRSAEncryption
-        b9:a3:2c:a9:df:13:01:8b:9d:dc:82:8a:57:ad:d7:7d:41:83:
-        f3:28:ad:7b:da:24:b4:3b:82:f2:80:b3:db:0b:a4:e4:bf:4e:
-        27:1f:5b:3f:f1:89:ca:76:c2:e8:03:86:88:59:5f:51:01:af:
-        cc:d8:63:9d:cf:2e:de:10:25:48:26:5f:99:62:dd:14:78:ad:
-        82:7b:e6:7c:93:48:37:4f:ad:8a:94:0c:98:3b:d9:e9:84:aa:
-        8f:d6:68:c2:f3:d1:80:50:30:ff:5e:e6:24:8e:1a:a1:0c:5b:
-        c3:c9:ab:d6:76:fb:77:8e:ee:dd:56:d7:60:8e:49:65:65:0d:
-        20:fc
+        94:da:b1:ff:5b:fa:20:dd:fd:44:b6:32:42:f3:15:29:f1:64:
+        5a:b9:fe:36:d3:2e:cf:c9:ad:20:af:f5:c4:30:28:8a:1c:25:
+        18:d5:b6:dd:df:33:f3:4a:92:37:e2:c9:a3:45:15:cb:e1:05:
+        aa:cb:af:bc:74:5c:85:e0:cc:d4:09:c1:cd:11:6a:dc:a5:ad:
+        b0:13:bb:95:06:48:dc:9c:50:c3:ae:03:6d:88:dc:27:1f:d5:
+        7f:d4:05:e1:18:dd:c0:39:eb:11:de:ff:25:04:9b:f7:0a:84:
+        8c:27:67:22:15:62:fb:47:75:e4:18:bd:b9:10:94:eb:2a:af:
+        a8:8e
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAWOgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMFoXDTE5
-MDQxMTIxNDgwMFowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4gBKdUkGm56+lmV1ExnSJkO2i2c5
-PEAHbJd0Lwu4osraNLUtu8QXJ8dM7/QvLNlbRStnSFW3lQ3sZz7Xk/IrWxMBukNB
-BsIUE7b5y5J+YA4tzXVhJQ0ZsPWFl0eF1kgJHB0WFCFzXpl53XkndU/1JN2yrtvG
-n+E3VVyITZf+ln0CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0OBBYEFI890IxdNcwxWRJvxVbfGoQtiqxRMA0GCSqGSIb3DQEBBQUAA4GBALmj
-LKnfEwGLndyCilet131Bg/MorXvaJLQ7gvKAs9sLpOS/TicfWz/xicp2wugDhohZ
-X1EBr8zYY53PLt4QJUgmX5li3RR4rYJ75nyTSDdPrYqUDJg72emEqo/WaMLz0YBQ
-MP9e5iSOGqEMW8PJq9Z2+3eO7t1W12COSWVlDSD8
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNTMzNFoXDTE5
+MDQxMTIxNTMzNFowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwme06C3XW2GzKwHX0iGJcvj6aE24
+c1q9Db2FkImkKKWjfqkG2tjQcy66YzN/4QM+97AzqYftREW8Czi5SV+CjFnCUEJC
+xKlVk8rBNFo+QCO23F/fOuxrMmrHDTi3SZvzn0bQAyRuEtA6NmRe9vM4DHENecC9
+Kwt+O/nSPYT2N/kCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0OBBYEFNUYBOhcteN5bpwxsvaOT6PgFXcPMA0GCSqGSIb3DQEBBQUAA4GBAJTa
+sf9b+iDd/US2MkLzFSnxZFq5/jbTLs/JrSCv9cQwKIocJRjVtt3fM/NKkjfiyaNF
+FcvhBarLr7x0XIXgzNQJwc0RatylrbATu5UGSNycUMOuA22I3Ccf1X/UBeEY3cA5
+6xHe/yUEm/cKhIwnZyIVYvtHdeQYvbkQlOsqr6iO
 -----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDiAEp1SQabnr6WZXUTGdImQ7aLZzk8QAdsl3QvC7iiyto0tS27
-xBcnx0zv9C8s2VtFK2dIVbeVDexnPteT8itbEwG6Q0EGwhQTtvnLkn5gDi3NdWEl
-DRmw9YWXR4XWSAkcHRYUIXNemXndeSd1T/Uk3bKu28af4TdVXIhNl/6WfQIDAQAB
-AoGBAJ0eSqWDYV6rXCC+5EelOd50UOJVnwruELtEB/f1FCXJFS5zjxns15RGEIz5
-nBp3+eX6qNE3Fmw/w8x7efBW+iAF/1zHjAmBqfltHAUJzwTSpIOvNEbgITamw1Di
-Tx+uJ495meObhmQZFcC2XW6HCBYiUHs7R7J8Z2lj1UgeWFiZAkEA/jM7w3FrelLa
-h+cVB2u6RmAUNiO7gFd7dZRApu7bNZPdewtuNUOuJXl33LwsdCAx2A5N3/hGigar
-D5KTVb3kEwJBAOOZ8YsClbsNxEN1/rYFoY6euhGmW7bagtvAtGrDLXnefx465Rdt
-ja/84XgnspmyMlTc0NemZrZqrI1nHRJYTS8CQDwAAdI++jx0RAqh+6+1uNEVqo+g
-3YgMniKBrMT6ShmaXkPFzeyangdQZX9flyqN0tYJgk4kPxojOstBMK+jU6sCQQCL
-XqIVEGElqLls4d02Et6qGbIwyqDQqJ+G90rDMX8waDmJBmFwZipkAMMEM7LfAMpn
-QswzsXal7054TBL2P9ILAkA1tzoIfbgqmkyRYtVbCOOJaBOHqwcopLeAWGJKZJck
-kwkjXa9snb3BKGJ+fEgqot3YQdLuZHDBfDxUDG62PPqG
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMJntOgt11thsysB
+19IhiXL4+mhNuHNavQ29hZCJpCilo36pBtrY0HMuumMzf+EDPvewM6mH7URFvAs4
+uUlfgoxZwlBCQsSpVZPKwTRaPkAjttxf3zrsazJqxw04t0mb859G0AMkbhLQOjZk
+XvbzOAxxDXnAvSsLfjv50j2E9jf5AgMBAAECgYEAmDlGgctrZ2WwOsvdp++Uxg9J
+XKUG+mShxoGRdWUhwqY4yHQoJvNA/gAn+IeZ6aJ2CtLRET2bPytvnEXVaCu+dzRi
+mDZirmo0mVflyJRr814r6D70SM6G1ZuSPrEXimZqPE905jGVFGjNV6WzncsV5tu5
+MxsxL70m+KjO7xijSIECQQDi1XbtTbw1jLQw2c2NSU2Eyk71/LTB6/wc2QFxnG1o
+FryI/4sYiGd4cJJ0JIrN63aIVzFJaL6gDKyk2h5V96FpAkEA22bOqU4QyKfYnqHp
+uG0USxG8P030bMwV9hdhVy31hRvnMBZPouuwyoMBKkY1QfNBR4AJspaAu0mfQbH/
+XlCAEQJADuBE/mccsr5ZiuKd0mg+RzklWIiMKjOZwyKQL608l5j2IF3x91fqwUFQ
+uYE0ATEyAtsFBnVyGvj50Y3kc2rcEQJAYMwAzW1ltkFnLsWcigOF+oC+nudTuVRp
+NAOorH/YXHutCeguBmEZxJ77upzzDj+2Q0dX//SqovaeTqurUP8PIQJBAIrre9G4
+zBjamHyS2A/gvAWKvKyqalQWJ9wphdPpAxMPGOgrwX1G0+HsCD1HPq8ZVQbtnXxi
+pODCcwkedtbY/eE=
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/test.crt
+++ b/lib/hx509/data/test.crt
@@ -5,22 +5,22 @@ Certificate:
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 21:48:00 2009 GMT
-            Not After : Apr 11 21:48:00 2019 GMT
+            Not Before: Apr 13 21:53:34 2009 GMT
+            Not After : Apr 11 21:53:34 2019 GMT
        Subject: C=SE, CN=Test cert
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:e2:00:4a:75:49:06:9b:9e:be:96:65:75:13:19:
-                    d2:26:43:b6:8b:67:39:3c:40:07:6c:97:74:2f:0b:
-                    b8:a2:ca:da:34:b5:2d:bb:c4:17:27:c7:4c:ef:f4:
-                    2f:2c:d9:5b:45:2b:67:48:55:b7:95:0d:ec:67:3e:
-                    d7:93:f2:2b:5b:13:01:ba:43:41:06:c2:14:13:b6:
-                    f9:cb:92:7e:60:0e:2d:cd:75:61:25:0d:19:b0:f5:
-                    85:97:47:85:d6:48:09:1c:1d:16:14:21:73:5e:99:
-                    79:dd:79:27:75:4f:f5:24:dd:b2:ae:db:c6:9f:e1:
-                    37:55:5c:88:4d:97:fe:96:7d
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:c2:67:b4:e8:2d:d7:5b:61:b3:2b:01:d7:d2:21:
+                    89:72:f8:fa:68:4d:b8:73:5a:bd:0d:bd:85:90:89:
+                    a4:28:a5:a3:7e:a9:06:da:d8:d0:73:2e:ba:63:33:
+                    7f:e1:03:3e:f7:b0:33:a9:87:ed:44:45:bc:0b:38:
+                    b9:49:5f:82:8c:59:c2:50:42:42:c4:a9:55:93:ca:
+                    c1:34:5a:3e:40:23:b6:dc:5f:df:3a:ec:6b:32:6a:
+                    c7:0d:38:b7:49:9b:f3:9f:46:d0:03:24:6e:12:d0:
+                    3a:36:64:5e:f6:f3:38:0c:71:0d:79:c0:bd:2b:0b:
+                    7e:3b:f9:d2:3d:84:f6:37:f9
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,26 +28,26 @@ Certificate:
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation, Key Encipherment
            X509v3 Subject Key Identifier: 
-                8F:3D:D0:8C:5D:35:CC:31:59:12:6F:C5:56:DF:1A:84:2D:8A:AC:51
+                D5:18:04:E8:5C:B5:E3:79:6E:9C:31:B2:F6:8E:4F:A3:E0:15:77:0F
    Signature Algorithm: sha1WithRSAEncryption
-        b9:a3:2c:a9:df:13:01:8b:9d:dc:82:8a:57:ad:d7:7d:41:83:
-        f3:28:ad:7b:da:24:b4:3b:82:f2:80:b3:db:0b:a4:e4:bf:4e:
-        27:1f:5b:3f:f1:89:ca:76:c2:e8:03:86:88:59:5f:51:01:af:
-        cc:d8:63:9d:cf:2e:de:10:25:48:26:5f:99:62:dd:14:78:ad:
-        82:7b:e6:7c:93:48:37:4f:ad:8a:94:0c:98:3b:d9:e9:84:aa:
-        8f:d6:68:c2:f3:d1:80:50:30:ff:5e:e6:24:8e:1a:a1:0c:5b:
-        c3:c9:ab:d6:76:fb:77:8e:ee:dd:56:d7:60:8e:49:65:65:0d:
-        20:fc
+        94:da:b1:ff:5b:fa:20:dd:fd:44:b6:32:42:f3:15:29:f1:64:
+        5a:b9:fe:36:d3:2e:cf:c9:ad:20:af:f5:c4:30:28:8a:1c:25:
+        18:d5:b6:dd:df:33:f3:4a:92:37:e2:c9:a3:45:15:cb:e1:05:
+        aa:cb:af:bc:74:5c:85:e0:cc:d4:09:c1:cd:11:6a:dc:a5:ad:
+        b0:13:bb:95:06:48:dc:9c:50:c3:ae:03:6d:88:dc:27:1f:d5:
+        7f:d4:05:e1:18:dd:c0:39:eb:11:de:ff:25:04:9b:f7:0a:84:
+        8c:27:67:22:15:62:fb:47:75:e4:18:bd:b9:10:94:eb:2a:af:
+        a8:8e
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAWOgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMFoXDTE5
-MDQxMTIxNDgwMFowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4gBKdUkGm56+lmV1ExnSJkO2i2c5
-PEAHbJd0Lwu4osraNLUtu8QXJ8dM7/QvLNlbRStnSFW3lQ3sZz7Xk/IrWxMBukNB
-BsIUE7b5y5J+YA4tzXVhJQ0ZsPWFl0eF1kgJHB0WFCFzXpl53XkndU/1JN2yrtvG
-n+E3VVyITZf+ln0CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0OBBYEFI890IxdNcwxWRJvxVbfGoQtiqxRMA0GCSqGSIb3DQEBBQUAA4GBALmj
-LKnfEwGLndyCilet131Bg/MorXvaJLQ7gvKAs9sLpOS/TicfWz/xicp2wugDhohZ
-X1EBr8zYY53PLt4QJUgmX5li3RR4rYJ75nyTSDdPrYqUDJg72emEqo/WaMLz0YBQ
-MP9e5iSOGqEMW8PJq9Z2+3eO7t1W12COSWVlDSD8
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNTMzNFoXDTE5
+MDQxMTIxNTMzNFowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwme06C3XW2GzKwHX0iGJcvj6aE24
+c1q9Db2FkImkKKWjfqkG2tjQcy66YzN/4QM+97AzqYftREW8Czi5SV+CjFnCUEJC
+xKlVk8rBNFo+QCO23F/fOuxrMmrHDTi3SZvzn0bQAyRuEtA6NmRe9vM4DHENecC9
+Kwt+O/nSPYT2N/kCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0OBBYEFNUYBOhcteN5bpwxsvaOT6PgFXcPMA0GCSqGSIb3DQEBBQUAA4GBAJTa
+sf9b+iDd/US2MkLzFSnxZFq5/jbTLs/JrSCv9cQwKIocJRjVtt3fM/NKkjfiyaNF
+FcvhBarLr7x0XIXgzNQJwc0RatylrbATu5UGSNycUMOuA22I3Ccf1X/UBeEY3cA5
+6xHe/yUEm/cKhIwnZyIVYvtHdeQYvbkQlOsqr6iO
 -----END CERTIFICATE-----
--- a/lib/hx509/data/test.key
+++ b/lib/hx509/data/test.key
@@ -1,15 +1,16 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDiAEp1SQabnr6WZXUTGdImQ7aLZzk8QAdsl3QvC7iiyto0tS27
-xBcnx0zv9C8s2VtFK2dIVbeVDexnPteT8itbEwG6Q0EGwhQTtvnLkn5gDi3NdWEl
-DRmw9YWXR4XWSAkcHRYUIXNemXndeSd1T/Uk3bKu28af4TdVXIhNl/6WfQIDAQAB
-AoGBAJ0eSqWDYV6rXCC+5EelOd50UOJVnwruELtEB/f1FCXJFS5zjxns15RGEIz5
-nBp3+eX6qNE3Fmw/w8x7efBW+iAF/1zHjAmBqfltHAUJzwTSpIOvNEbgITamw1Di
-Tx+uJ495meObhmQZFcC2XW6HCBYiUHs7R7J8Z2lj1UgeWFiZAkEA/jM7w3FrelLa
-h+cVB2u6RmAUNiO7gFd7dZRApu7bNZPdewtuNUOuJXl33LwsdCAx2A5N3/hGigar
-D5KTVb3kEwJBAOOZ8YsClbsNxEN1/rYFoY6euhGmW7bagtvAtGrDLXnefx465Rdt
-ja/84XgnspmyMlTc0NemZrZqrI1nHRJYTS8CQDwAAdI++jx0RAqh+6+1uNEVqo+g
-3YgMniKBrMT6ShmaXkPFzeyangdQZX9flyqN0tYJgk4kPxojOstBMK+jU6sCQQCL
-XqIVEGElqLls4d02Et6qGbIwyqDQqJ+G90rDMX8waDmJBmFwZipkAMMEM7LfAMpn
-QswzsXal7054TBL2P9ILAkA1tzoIfbgqmkyRYtVbCOOJaBOHqwcopLeAWGJKZJck
-kwkjXa9snb3BKGJ+fEgqot3YQdLuZHDBfDxUDG62PPqG
-----END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMJntOgt11thsysB
+19IhiXL4+mhNuHNavQ29hZCJpCilo36pBtrY0HMuumMzf+EDPvewM6mH7URFvAs4
+uUlfgoxZwlBCQsSpVZPKwTRaPkAjttxf3zrsazJqxw04t0mb859G0AMkbhLQOjZk
+XvbzOAxxDXnAvSsLfjv50j2E9jf5AgMBAAECgYEAmDlGgctrZ2WwOsvdp++Uxg9J
+XKUG+mShxoGRdWUhwqY4yHQoJvNA/gAn+IeZ6aJ2CtLRET2bPytvnEXVaCu+dzRi
+mDZirmo0mVflyJRr814r6D70SM6G1ZuSPrEXimZqPE905jGVFGjNV6WzncsV5tu5
+MxsxL70m+KjO7xijSIECQQDi1XbtTbw1jLQw2c2NSU2Eyk71/LTB6/wc2QFxnG1o
+FryI/4sYiGd4cJJ0JIrN63aIVzFJaL6gDKyk2h5V96FpAkEA22bOqU4QyKfYnqHp
+uG0USxG8P030bMwV9hdhVy31hRvnMBZPouuwyoMBKkY1QfNBR4AJspaAu0mfQbH/
+XlCAEQJADuBE/mccsr5ZiuKd0mg+RzklWIiMKjOZwyKQL608l5j2IF3x91fqwUFQ
+uYE0ATEyAtsFBnVyGvj50Y3kc2rcEQJAYMwAzW1ltkFnLsWcigOF+oC+nudTuVRp
+NAOorH/YXHutCeguBmEZxJ77upzzDj+2Q0dX//SqovaeTqurUP8PIQJBAIrre9G4
+zBjamHyS2A/gvAWKvKyqalQWJ9wphdPpAxMPGOgrwX1G0+HsCD1HPq8ZVQbtnXxi
+pODCcwkedtbY/eE=
+-----END PRIVATE KEY-----
--- a/lib/hx509/data/test.p12
+++ b/lib/hx509/data/test.p12