regen

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25126 ec53bebd-3082-4978-b11e-865c3cabbd6b
2009-04-16 08:27:48 +00:00
parent 806551e98f
commit f73d077b5b
64 changed files with 944 additions and 741 deletions
--- a/lib/hx509/data/ca.crt
+++ b/lib/hx509/data/ca.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICbDCCAdWgAwIBAgIJAJrKrhkoWkfBMA0GCSqGSIb3DQEBBQUAMCoxGzAZBgNV
+MIICbDCCAdWgAwIBAgIJAJ5Pn5krKrp9MA0GCSqGSIb3DQEBBQUAMCoxGzAZBgNV
-BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDkwNDEzMjA0
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDkwNDEzMjE0
-MjUyWhcNMTkwNDExMjA0MjUyWjAqMRswGQYDVQQDDBJoeDUwOSBUZXN0IFJvb3Qg
+ODAwWhcNMTkwNDExMjE0ODAwWjAqMRswGQYDVQQDDBJoeDUwOSBUZXN0IFJvb3Qg
-Q0ExCzAJBgNVBAYTAlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmMfh3
+Q0ExCzAJBgNVBAYTAlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8H0kq
-hjb0WmvfadDqg+gybpInr973ORvh7I+bvbIfAEjnKqtVp69jktpFRxSC6qjiUrv/
+8tkisE700EnL4Ic3urE2wGETl+kt3bJXVlzLVsHhQaniITqtTCZfZeckk+2nzaPE
-MsYhGp69brO1KNDiAFvGzQRmnelO574272AndOp21oCrLyv2sLc2rwTDKEpC/e0N
+0MehisrOY68QfX+pgdwsiySKA9Ds2cwnfTyOFnECIyPHhZOHuKkOmUgrbjyFavCj
-lGgRUmjpgbBra1xDLajKtvhpKF+OxMx04tp9pwIDAQABo4GZMIGWMB0GA1UdDgQW
+nfOEx9F+OIy6aRxNIYdtTyiChrNMRzJZ9mjqOQIDAQABo4GZMIGWMB0GA1UdDgQW
-BBR7HAikk96mNPhY/ylalywHxhI6+zBaBgNVHSMEUzBRgBR7HAikk96mNPhY/yla
+BBRRPOSnMBSMVXSVHFhq8sYFaqfj8TBaBgNVHSMEUzBRgBRRPOSnMBSMVXSVHFhq
-lywHxhI6+6EupCwwKjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYD
+8sYFaqfj8aEupCwwKjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYD
-VQQGEwJTRYIJAJrKrhkoWkfBMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgHmMA0G
+VQQGEwJTRYIJAJ5Pn5krKrp9MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgHmMA0G
-CSqGSIb3DQEBBQUAA4GBAJgj5P04eGc8acVii4ttB/ByFnIK2wxori63atXQA1Hz
+CSqGSIb3DQEBBQUAA4GBAKJjleDlo0d/gxdi1S8cWJ78Wg2GCHbeq4qo4NU6DrYV
-MXYh+HZpjXVqO3eZqq0ckvLbmN6TMwWm89wPKDwYiwKD/MSru5WKPrMrur9IsW4o
+mDpnqUw+qGsJVEjBBuCOPLuuxqai82In+XSHN5MdC3UqtuBc5E2ogD5NdKoq9BTY
-evlIoJAR4vWSOTMXBAa9PdUTj7l9x1MRdj4y3E6XZbma6+L6D6h3ikZ5MZ4ibRTt
+Glq7rd/VkNXgkbjOGEDGlsrrBbsQVZcVGAd4L1uXCeTZTKZ96FSB07nUIvSRvHGd
 -----END CERTIFICATE-----
--- a/lib/hx509/data/ca.key
+++ b/lib/hx509/data/ca.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKYx+HeGNvRaa99p
+MIICXQIBAAKBgQC8H0kq8tkisE700EnL4Ic3urE2wGETl+kt3bJXVlzLVsHhQani
-0OqD6DJukiev3vc5G+Hsj5u9sh8ASOcqq1Wnr2OS2kVHFILqqOJSu/8yxiEanr1u
+ITqtTCZfZeckk+2nzaPE0MehisrOY68QfX+pgdwsiySKA9Ds2cwnfTyOFnECIyPH
-s7Uo0OIAW8bNBGad6U7nvjbvYCd06nbWgKsvK/awtzavBMMoSkL97Q2UaBFSaOmB
+hZOHuKkOmUgrbjyFavCjnfOEx9F+OIy6aRxNIYdtTyiChrNMRzJZ9mjqOQIDAQAB
-sGtrXEMtqMq2+GkoX47EzHTi2n2nAgMBAAECgYAUTB4QWu/zP+fUzVOakKmXHzHy
+AoGARt3CQluZUGf6Vl7gbdz3ExdRCr8N0sO3I4AQXrY53p+gCasiw/ygjgfRrL5G
-buRIRU1GdmHDn5NVfe9pbCiouWYOPy0xMNEsfARMP9Z+AHF6MYoZkJ+aDHYWMZpw
+hJD1RfFBcDL2APS30Wfb2upr3Fibq8StsQqg8Na4PF+Y9QpHkgc6MJotmNW37Usv
-eYVoEdz7KknT4uwcA41+ovTUg/stkapIAbh5zJKsc+4q5VB0MWMAmTrGLVxs6Lqx
+VivQLwZ+QuqHCLCZNz00MMnKDr8o6DZ8f9g929OslxinE8ECQQD1mjc3wfUvjZ9t
-KGfPbu0q4k+jitHKwQJBANADQt2fbqIZwrxjrI+QkZtvAUScBjvAvgxSUI7ZnvHl
+6F1LWvRJ+Oyuj4/uXJcx4RDITArPO8NlhesaIL8/A7RWQBOnHViQwZ7p35R9tS1j
-qAbPqQT520WYoElb3jTkR7UOH2/WREwYBUxSIZlWPo8CQQDMiRCJwMafqcYFEazk
+IILws8tbAkEAxBYczw5nx/cH01Lq9sMGb8KdrjBseIoyBts0s1JjCR6s4Zu7k3tN
-m84m9pd1YWYbun303uV8ZRyhddgJEeqGn6yWf59xBqhUtM6oFMmgqFqiTiG7LgQk
+qvYwhBwPd+Mo5c4w8+tKZe0n1YxWDjAY+wJADjQC6XiQA1X/WE3Nx2PVKMn6dgXb
-4ltpAkBLnRPeWgkuVazrLFRa75NubACK/yho6hxrgDSWaNcVWYUlzLDFBUpG1z9U
+Xv9/xuSrIcoz/dQI8sAR3oryRGSkczB1cn6h9o0b8Y56eeKWY1sn91+ObQJBALt6
-y1dP5LeIQjT9Q2caPhUW9DgQdEBTAkAe4ab8lX2nx7NdOpD3J0sV+O9fSqhnEV5J
+eOjvWQKziePe75AnP0wzwxb8bXmCh/pOM8EQEGhzz8+VWm7UAZpn8FMfkRqLMlsm
-JYpSoNWUzz0iCXF2iA8/3d8N6qppt67oE9NpjWG51cAkCcuYYhDZAkBWnAY9gH7D
+HV/ZozR43xEqME04Z2kCQQCtB/QPWKCXT0URQLydE7QY632kwmpvs+eQCIjdzm7R
-0DnRmFHJy1HrbyJDGdySQcr+4X91i+Amrtpxu9fLgJNQkfVXQmsfK4Z1+GDMK3kh
+oTeyxMNiHPY2rsRI/o69bxdoCs9O0MQ7Xqfc/+LlwmAJ
-AM4eQvOMVpUN
+-----END RSA PRIVATE KEY-----
 -----END PRIVATE KEY-----
--- a/lib/hx509/data/crl1.crl
+++ b/lib/hx509/data/crl1.crl
@@ -1,8 +1,8 @@
 -----BEGIN X509 CRL-----
 MIIBBDBvMA0GCSqGSIb3DQEBBQUAMCoxGzAZBgNVBAMMEmh4NTA5IFRlc3QgUm9v
-dCBDQTELMAkGA1UEBhMCU0UXDTA5MDQxMzIwNDI1NFoXDTE5MDIyMDIwNDI1NFow
+dCBDQTELMAkGA1UEBhMCU0UXDTA5MDQxMzIxNDgwMloXDTE5MDIyMDIxNDgwMlow
-FDASAgEDFw0wOTA0MTMyMDQyNTNaMA0GCSqGSIb3DQEBBQUAA4GBAEatDIJRZ1M8
+FDASAgEDFw0wOTA0MTMyMTQ4MDJaMA0GCSqGSIb3DQEBBQUAA4GBAIuLgzVXjnTp
-WB1trX8btsKlRwOyV3yh0XMflcKFpQjuklgdaLW3VFkGIEcr7plcEKuZPcOOPHOG
+kkBsjVIF8y2qXfrjZEd9QpMR3yJvxFbJG2IOi4yn59B1EJN2RU56R04SE/B2shLI
-KUxVkqzoQ4oAlKzul1oqdHQPaKvqAS22tYytMyns1Ojf69tGDyUumvSiPV/kTs+N
+Rfxq1CkJDobnQTDnJB+IzpRv8lINT3G+8fDLnFMAak2ellGJcIeR/u+2OfJDJsXz
-tGbM39Nd+U+kDQqJxTndgcd1933t0pYT
+keiKEBvmmeNMMkwREDZaLjs++j6BBksQ
 -----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: 6 (0x6)
+        Serial Number: 9 (0x9)
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 20:42:53 2009 GMT
+            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 20:42:53 2019 GMT
+            Not After : Apr 11 21:48:01 2019 GMT
        Subject: C=SE, CN=www.test.h5l.se
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+            RSA Public Key: (1024 bit)
-                Modulus:
+                Modulus (1024 bit):
-                    00:f8:f3:dc:92:08:27:32:98:a4:26:fa:a1:11:1b:
+                    00:e1:88:84:dd:9c:66:07:3a:f9:aa:05:42:4a:f2:
-                    a3:0e:98:d8:d4:8f:c8:b5:dd:ee:49:7a:72:49:1e:
+                    b3:e3:93:81:71:10:3d:cf:bb:1c:98:a5:73:66:0e:
-                    31:94:af:4e:e8:a2:ee:11:20:ca:8e:c6:dd:d2:0c:
+                    96:7c:59:12:d0:60:a9:c6:65:88:a8:cc:8d:14:3e:
-                    c2:60:86:72:c4:b4:0a:fc:74:c9:80:3e:bf:c9:b7:
+                    10:d4:49:8e:64:34:d2:52:ea:0f:03:68:ba:d4:d7:
-                    1f:bf:ee:9d:bd:5b:7d:d5:2a:74:fe:64:5a:3f:65:
+                    e7:8a:41:6f:0a:57:67:b8:e7:bb:1e:fa:47:f4:a0:
-                    17:9f:3a:37:21:b5:1b:4b:79:c9:8b:7b:17:c2:74:
+                    fe:84:1a:74:1d:8f:f9:51:cb:8b:96:23:8e:7d:85:
-                    a3:10:31:ab:73:3b:b3:76:95:dd:9f:c3:98:3d:e4:
+                    af:4d:de:4f:b0:0e:71:c9:11:79:93:bf:54:9a:d5:
-                    ff:0b:f9:7a:2d:3f:d5:36:f0:fd:0f:61:09:a7:39:
+                    77:48:38:33:4f:05:99:bd:48:61:af:ac:73:a7:fb:
-                    0a:ad:34:5b:95:b5:63:20:ad
+                    23:e0:54:6c:ca:4c:6c:d2:e7
                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: 
-                CE:01:38:D2:45:70:15:88:5F:CD:D8:41:12:DE:99:9B:1F:B0:51:F0
+                64:1E:F3:78:57:CC:98:D9:B8:A4:59:87:97:BD:7A:14:B3:E9:54:1D
    Signature Algorithm: sha1WithRSAEncryption
-        81:ce:82:e2:ef:28:3c:4d:dc:48:56:e7:c6:27:12:ba:bf:dd:
+        9c:69:61:7a:19:f4:da:a9:aa:c4:c3:5b:f2:80:e2:e4:62:97:
-        49:cd:2b:29:04:e2:8c:d0:9a:f7:9e:28:77:1d:27:4b:a7:b9:
+        35:92:d2:6b:1f:2a:b1:13:dd:90:80:46:7f:50:22:02:76:30:
-        f5:23:53:89:f3:06:df:33:4d:46:d8:d0:2b:3c:b9:b2:c8:34:
+        5c:92:73:97:bd:6c:8d:0f:31:96:b8:28:6b:c3:38:e7:44:90:
-        11:4c:88:8d:75:e3:fd:f9:dd:85:20:c0:b1:78:f2:a0:e5:bd:
+        27:2b:66:e7:99:3c:42:51:61:4b:6c:04:d0:10:b0:6d:c7:03:
-        23:55:77:98:ac:85:ca:ce:e2:2f:88:66:a9:26:b6:1c:ad:45:
+        0b:7a:52:f2:49:ca:ea:0f:c0:16:58:d3:b9:a6:e8:7e:9d:5a:
-        f9:28:01:05:9c:68:ea:48:42:af:d7:f3:b4:1e:f7:47:41:d6:
+        d0:bf:85:b1:e3:26:c7:39:a0:c7:00:f8:30:aa:68:e4:9f:56:
-        96:19:98:79:64:1c:2f:21:6f:1b:8b:3e:21:7d:bd:54:39:43:
+        22:0a:1f:c1:1e:73:5a:f0:88:9f:32:85:6f:37:d1:86:13:c7:
-        5e:b8
+        94:62
 -----BEGIN CERTIFICATE-----
-MIICADCCAWmgAwIBAgIBBjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
+MIICADCCAWmgAwIBAgIBCTANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1M1oXDTE5
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIwNDI1M1owJzELMAkGA1UEBhMCU0UxGDAWBgNVBAMMD3d3dy50ZXN0Lmg1
+MDQxMTIxNDgwMVowJzELMAkGA1UEBhMCU0UxGDAWBgNVBAMMD3d3dy50ZXN0Lmg1
-bC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA+PPckggnMpikJvqhERuj
+bC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4YiE3ZxmBzr5qgVCSvKz
-DpjY1I/Itd3uSXpySR4xlK9O6KLuESDKjsbd0gzCYIZyxLQK/HTJgD6/ybcfv+6d
+45OBcRA9z7scmKVzZg6WfFkS0GCpxmWIqMyNFD4Q1EmOZDTSUuoPA2i61NfnikFv
-vVt91Sp0/mRaP2UXnzo3IbUbS3nJi3sXwnSjEDGrczuzdpXdn8OYPeT/C/l6LT/V
+CldnuOe7HvpH9KD+hBp0HY/5UcuLliOOfYWvTd5PsA5xyRF5k79UmtV3SDgzTwWZ
-NvD9D2EJpzkKrTRblbVjIK0CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+vUhhr6xzp/sj4FRsykxs0ucCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0OBBYEFM4BONJFcBWIX83YQRLemZsfsFHwMA0GCSqGSIb3DQEBBQUA
+BeAwHQYDVR0OBBYEFGQe83hXzJjZuKRZh5e9ehSz6VQdMA0GCSqGSIb3DQEBBQUA
-A4GBAIHOguLvKDxN3EhW58YnErq/3UnNKykE4ozQmveeKHcdJ0unufUjU4nzBt8z
+A4GBAJxpYXoZ9NqpqsTDW/KA4uRilzWS0msfKrET3ZCARn9QIgJ2MFySc5e9bI0P
-TUbY0Cs8ubLINBFMiI114/353YUgwLF48qDlvSNVd5ishcrO4i+IZqkmthytRfko
+MZa4KGvDOOdEkCcrZueZPEJRYUtsBNAQsG3HAwt6UvJJyuoPwBZY07mm6H6dWtC/
-AQWcaOpIQq/X87Qe90dB1pYZmHlkHC8hbxuLPiF9vVQ5Q164
+hbHjJsc5oMcA+DCqaOSfViIKH8Eec1rwiJ8yhW830YYTx5Ri
 -----END CERTIFICATE-----
--- a/lib/hx509/data/https.key
+++ b/lib/hx509/data/https.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAPjz3JIIJzKYpCb6
+MIICXQIBAAKBgQDhiITdnGYHOvmqBUJK8rPjk4FxED3PuxyYpXNmDpZ8WRLQYKnG
-oREbow6Y2NSPyLXd7kl6ckkeMZSvTuii7hEgyo7G3dIMwmCGcsS0Cvx0yYA+v8m3
+ZYiozI0UPhDUSY5kNNJS6g8DaLrU1+eKQW8KV2e457se+kf0oP6EGnQdj/lRy4uW
-H7/unb1bfdUqdP5kWj9lF586NyG1G0t5yYt7F8J0oxAxq3M7s3aV3Z/DmD3k/wv5
+I459ha9N3k+wDnHJEXmTv1Sa1XdIODNPBZm9SGGvrHOn+yPgVGzKTGzS5wIDAQAB
-ei0/1Tbw/Q9hCac5Cq00W5W1YyCtAgMBAAECgYEAjWqZZSrUeV1UAgBk9j7oxSX2
+AoGBAIOAu6AQInmSzKJzQI086OEIUBBh3Piz7F+hESFv3hURRuQTiMqyxzVNV/F2
-Jej3brf+4CZ6PSa1q2xaOrQy3+/soGY/I060K/izwSE1DGua+wqqD3/CvVhiqUs3
+ow90+D67getwqGJffZi/bzVxI9G2ahYinXRrv7K9jHGts3Q1EclnBdfq6p/1+tds
-xENr2SatvZ3vVun0HM7YsycUcr2IH6DM2BpK5e3zuwAq7RjoBRyn2+Hy1Kb2j5zJ
+fHa8oLSuGIl1U5nSYd9kbNOAyxGyEElFFHQTkdXDOBWxTiCxAkEA+d7LwAFmO+af
-5Gl0/X0CBLGCYN01SYECQQD/CWjxdfbOHqM2+I90MJhcJumNI3TIW0ayVqEwnyMt
+zE8wNJNlSqVG9Q7DaWkNAOHHDwMN9ub2N8s3x3AWGe/873/DbchvySI1A0D7cz69
-4pF6pOPfv8yNpkd2NcN1vgOyInHUvK9UUg+84WtXMonJAkEA+eSRqgSxJSKT0g00
+bqQGQisUSQJBAOcQ4oMSs46bVJ8YlCnNEJBfsHIR/W4V55nvCKPLfwOMcxJnDFyP
-Svg23RV8eCmxdjsA/hgAKP5ytLZKOEFAjbA+CZuMhneAeDzWov5dfZpLotHapMlI
+/84pSNEQXwMFwvfeaubYv5HwGdAgX3zgTa8CQCQf/O8mhKRWZHYCYOLJCJTxLkAR
-0fLRxQJBAM//E6iBxaR7Fi+57f0buNbHIYjrFs5kqra9sj5eOymr82vr2LDd0uzf
+wVjFElc1TTUzaNpwa9qHK+pOnzNiyfvKSfPeTaMTqfxtca0ovfR4DFuWpNkCQQDf
-ZL7CwENhkdARCXcv32pMdutbiNiXrgkCQGzALShJnHIlxyDtwCk0NmQmmqGMu39R
+thZIJuQXTsY4Hpjce8DstuhjGI3Qdn68J5Sq2MvJSMLkb0alm3lkRc5NM1d52qsw
-lFAAT+mHOpIslsY+l4JSBd2WhSRr00wAZgRPII6t3GbCXx3Bv2AnBWUCQAQ4tWFG
+RnQjuniHN/oV6jHo+lXbAkAy1Q7INSj0kav9vQxZgQpLEEnW4olDY5uo6WnMN/Pz
-quJPsvm1ZL56VOA7Nzzv6yrQhdzRCoTEdWWW39T5E9X50JL1EjkdoopoXqij1NOi
+fzC7LPbwXsDf1ucIJheJZPQRxu1YHHPfSTiLOsKgb/f8
-hMXGe3fG9BMIuG4=
+-----END RSA PRIVATE KEY-----
 -----END PRIVATE KEY-----
--- a/lib/hx509/data/kdc.crt
+++ b/lib/hx509/data/kdc.crt
@@ -0,0 +1,59 @@
 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,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALsESEK3yU31thaV
+MIICWwIBAAKBgQCzSfYi5LvVteShZMEi3KrhN1eNm2/9n9FdwTApf2/x5NlShgZf
-ZAsMqZ7BNKXDubem0oU13WznHFWsxAA+pwsXVlPGUqfJUpda8XSoSyaHP4HFPa4R
+Lu/HOoSaldxvf6cXEy9lUwU8MkZEuO59YKlyOSGqRq05RAF+H+kPktzgptc0ZBm+
-OS8MfuGjFzVofWbxyEFJzwR5ykcytCm2xN4Wa/1evlMvpcN2ysP7M83pZNyEwhf9
+PTvXvwoPf/oGBHSUbXK+1ycSQmZM8qh8Dg43I7SWU78wRp3nq3ISho8iqwIDAQAB
-mHteVNmBMC5cMK4oJ4YqVxvTrsufAgMBAAECgYBUUjj2hAEqumewRQlHhh0QbFJ9
+AoGABjZ26AijFanC7XDPXITnCvze9NJBFDnYiHYsVBPNbkVu3nQ0flHjDzVQ6QZu
-jwM0j+4Ji+DbUlTPOEdjSNxuPsZ4nUn1RuuLPMDzdVH0/DQhIbqOuktLMFogQtmC
+aBK1WJBaoRk6Yjafxrvdz8xssrCun+L9Y4PoZxkpCFz0185k3Vv5MMxwQMMZDV91
-06IWn3IomoOs0wUQmLbkun5aFEXwRJwkIdp8Y86qSrlZRWg8CXF9Pj1NkJTxQhIs
+ylXtKZyf7d1XmJPhj9S6otz70VG6hPY25EkLqAeZwOl/yekCQQDpwJMBEDWEtenL
-usUz2QdGdQGkbev/2QJBAN+u9B+VWDsiNyDx3ru1HYBoSb1h81gT5IbVUJ4P0cp+
+xjVknzgwbHiST5NWzxc+ZO72U6O+VDE66vFcTxVUC5pDRYtEeRMnY4Gd67qQrX6S
-yO3B6egWdLMuQiAPpdcNGxommxR+P2JSf531YyB6h1sCQQDWCTFBhGXs0K5uuXn/
+lCa7AxlfAkEAxFpgP7h2d/L58Zlhc+HQOl8Juy6+nM8jjICNCOYYzwg0Gh7poXTp
-mPuFgpcXwpwf9NwZK1uhW1L9CnUKfCyiTBAB6DIDdXs6ntt+ohui9a7Ew/RB0ncp
+Q1VurcFzXdpR6oY1p/ouXMeYabcyyKZeNQJAPTvFRrIIUwuUg10Y/5L2FTlVHH7c
-8YQNAkAKYRLg2Ew0yjymobKFIT1SNQSe7gmdn6at/v3zp6ZDcCigp6vT4h7eJZpZ
+ChGV9TJbpwuiCWnku5pwP843uByR/K1rHjTZX6ghfE0UQnIwhhVpT/Qv4QJADeVP
-5H/8f5YvW3U8uTL1vABB8x37ZtQbAkEAsdO9WsPXsyPGaTQsylGeV9SiGBmWgW59
+dnL5f1ektKJkMS1D7T2YlLSkLLjEDUdzs7OFAfHUrhyN8C0z7N347TcJkRTIQ06o
-F2RQowUvNBFmIKn+o3Eys4LpWrpXAeNOVi31bDVXWR+9Zpqoau7AWQJBALbzRd4H
+MXEVIt/FO4YJhAWyGQJAdk9hFZ4AiqM6oJfIfCRz5GknS4gMY4Y6Pck2D5QAQhnt
-I0Dr0lsRMzQoQNNJiGj8q4Sv0vu19vZYkQKe9FzSy670GKa1Ud1okFeqjJFMyvTD
+U0ASSXngYPq9UJW1lyqJVPDqP3dR3kYTU6EdP8CKjw==
-d6vPv4l3dMiO38o=
+-----END RSA PRIVATE KEY-----
 -----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+2ZMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
+MIICDDCCAXWgAwIBAgIJAMJEvwnR1+2cMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
-BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjA0MjUzWhcNMTkw
+BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE0ODAyWhcNMTkw
-NDExMjA0MjUzWjA0MQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MREw
+NDExMjE0ODAyWjA0MQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MREw
-DwYDVQQDDAhuby1wcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvEtS
+DwYDVQQDDAhuby1wcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6fW3
-ZniMPYU7vhYo8a3796uB1WVsQbKfWzUCCkszmLuI5SHCGFVRAhTqB0PJlWVdfQoe
+th+tIlkuLd0ovmQqumtF4PZqwWp724REsdfVW4CMmnYm4WeI9isI+1KVgUFpLxKP
-/pY3LrGjEkzDeaW1I5ipcOsMkJYvvtcpjJkIJOoyRQWPF8cfNy0eETVrguNAQd3g
+KjrnYPmgiGRGpYTiRxzjkZHJfgZwtCQa4SV0V81iuhKBVwfIxT/l6GSioZ6Gue2q
-5Xzb59ATokfhcRXVL66MOOm6KkBWt1X9Zpw43pECAwEAAaM5MDcwCQYDVR0TBAIw
+WcHnhM/vJQtNUdBeUdEexJkx/w7Zsvk7fI7kZQECAwEAAaM5MDcwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0OBBYEFCJ+fNoTlqeJUQ5qyR91m8dhZ+oBMA0G
+ADALBgNVHQ8EBAMCBeAwHQYDVR0OBBYEFL8+ODIOT7HCsmqZgNXbHGgH0waAMA0G
-CSqGSIb3DQEBBQUAA4GBAASGJez+cKEK34j/L3Dt7HuWYzEaBoKAYGY+DKkj5yll
+CSqGSIb3DQEBBQUAA4GBAI9UWIUZIRCJGajoPxU45IbrwabILNZX4Ue1oYAowV9z
-SZtvWEAmYbs3n+c0Fkg0vVf/M9Q9rDPwmtAJ/zu5qO79pPxs3HDnvjKD9vh4oLc5
+2aniOySf3o6nPZsQCYJrCtyTy+1uS7HUiC2IdaHUJk2GWXx0PckwyDGhUyy3kKS3
-5oc90Qm2HaHAwJmbBXgDpGx8xpJ+aoMl7zZYvTcK5HFIJFkNjUmU5cESFUphg2HE
+spmXjLHq0/sb5PIyj9egHlxCfPlWy9psCQIyK2EkOcR6UjXi3H3SAHjPYlIEUeHb
 -----END CERTIFICATE-----
--- a/lib/hx509/data/no-proxy-test.key
+++ b/lib/hx509/data/no-proxy-test.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALxLUmZ4jD2FO74W
+MIICXQIBAAKBgQDp9be2H60iWS4t3Si+ZCq6a0Xg9mrBanvbhESx19VbgIyadibh
-KPGt+/ergdVlbEGyn1s1AgpLM5i7iOUhwhhVUQIU6gdDyZVlXX0KHv6WNy6xoxJM
+Z4j2Kwj7UpWBQWkvEo8qOudg+aCIZEalhOJHHOORkcl+BnC0JBrhJXRXzWK6EoFX
-w3mltSOYqXDrDJCWL77XKYyZCCTqMkUFjxfHHzctHhE1a4LjQEHd4OV82+fQE6JH
+B8jFP+XoZKKhnoa57apZweeEz+8lC01R0F5R0R7EmTH/Dtmy+Tt8juRlAQIDAQAB
-4XEV1S+ujDjpuipAVrdV/WacON6RAgMBAAECgYEAsgmKRSeweq8SmR584l+/AiSh
+AoGAf2xy6GCMPX7w5c3kWP3ZP7sZThMnxbwnRUHe4DW7YKC884uSVYW8VMbPl4I9
-o7O9k7UgZm4NmswWYlDYFMdBrh5ldVFvIyVeYqswpX0/ZzuDu9vss+3vWoNrbDh5
+Jy7nCNpE2y1Fw81xn5dt2sxrKGF6gPaJBKMQD/aeOtS/tTNmLbCdRo/Qo/I/w6MV
-YsPSiF0Wuq5a4hin+8XlETbBqMTgMSi5ApfKI8ATiRDLrWYdUZpDxqwcGqciTkve
+rf3qZvn6CmRX5CqZSV5u9BU8WYseCbruCr9dFD1wLroah7kCQQD3zO9oYGNySNHK
-sXgX1l9RX09iP9JUIx0CQQDkM6RMKUYhR0mbjMOT863H5BZZRpRt9cMOjxrDtruW
+sfTRiKI55WRpgFEKe2hd78Fdo6nBfC/yeSB+VadGmLePamMxT7fbB2Yz+PIKRJct
-CSn2PKkDPCi/f6+vZgyY/BM+M0ywpdOAJsy6AuOQrIMPAkEA0zsvNR5srV6DUN2E
+U2IXlp9vAkEA8bOKeNzo+eElVOAvMXZU3CWrcmOPK0fp7BrcJRDys9Pd9qb43szU
-AFMWw+lb8qe5MDvmPrcawzyzuhnTwCTXNQOBHVI6cC7JwF59gFwsMRvp41UmDOp1
+nGP7rfH5tT6MXerPSo8IMCzxuK62FWkKjwJActXLAMDidRzf9CIiBVRfcZsnvGiV
-A1gEXwJBAMUqmVn0j1NRdJehF5pNgGik+WpJQRWAsfdyTX2r9Ie9gzPtVVomME7E
+pdjo1dd88csdqSfHBIQzlbhV67ZsIo835qs91cgJCf7NFAsTUBL7O1k3CwJBAOe5
-09aIJXpI0Zd8W1aE8ChZXamZtWTaqKECQCq6eSUsn10+lh+gf5g1NpCwvtnKFcrt
+qliV8wcexBvLk3Nob5Ngyi6xJOHp4GtslQM0bHvb9EI1cwSofG4zrWfnRfBuN0UT
-AvlCvtYpjE2j9dKTYTknGVIeFRYmUMdqFccGXiYc+GX1DnpkXwErJ88CQF01ruzY
+igmBd+g4LsdROWDthCECQQChetAFhke+8s1Htb9WelaTHeqa02yXJhUcg9YeNSe4
-BvbcMbWiaYD365CKej4h7DdmLHuFjGm2CwyKpat2sA9f8d6cL8OojB/AqJOTye6G
+kXd7VTHOOOlxtSU3+uIq9wkeGl0sSIbQaLK3AqExSzK6
-w7FNZBkAanu77r0=
+-----END RSA PRIVATE KEY-----
 -----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 20:42:52 2009 GMT
+            Not Before: Apr 13 21:48:00 2009 GMT
-            Not After : Apr 11 20:42:52 2019 GMT
+            Not After : Apr 11 21:48:00 2019 GMT
        Subject: C=SE, CN=OCSP responder
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+            RSA Public Key: (1024 bit)
-                Modulus:
+                Modulus (1024 bit):
-                    00:a3:c3:2f:3b:23:31:19:eb:1a:23:d9:c9:a1:b3:
+                    00:cd:59:73:92:2f:01:61:d0:7d:25:c5:41:33:45:
-                    ba:ef:95:9e:8b:f2:ef:ea:39:80:bc:69:ef:82:3f:
+                    2f:99:0d:3c:04:82:c0:74:b5:7b:aa:d1:7c:78:e7:
-                    50:b1:81:62:41:2a:54:bb:2d:6e:8a:b0:8c:3b:fd:
+                    19:03:7e:22:d0:67:a9:e2:7e:33:6c:e3:fa:a0:22:
-                    2a:4f:6c:3d:ca:67:58:8b:21:f9:6b:b6:e6:f2:08:
+                    6d:1b:e2:f4:e7:d8:9e:bf:c1:77:d2:a6:f3:7e:3b:
-                    86:0a:48:c7:9c:74:17:68:02:3c:8d:7c:14:bd:2e:
+                    33:06:bb:c8:89:ba:33:5a:7d:53:98:ae:98:48:2b:
-                    4b:ea:14:d4:6d:8e:33:86:cc:61:e7:91:79:d2:d5:
+                    11:bf:b0:3b:47:21:1d:b9:0e:49:1b:fc:90:3f:e0:
-                    48:38:ab:ce:26:66:62:7f:82:1e:f7:9b:a9:9e:0c:
+                    94:42:40:dd:14:7a:57:96:27:02:26:1d:8f:2e:ce:
-                    09:42:6c:2f:44:c8:dc:9e:1c:dd:19:05:44:90:e4:
+                    5b:1b:62:26:cd:70:b7:d7:8f:6e:24:8b:a9:a8:6f:
-                    91:9d:f8:d6:18:6b:6a:cc:3b
+                    07:26:c4:d5:40:a2:8d:dd:13
                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: 
-                70:E4:60:E3:81:7A:A0:E5:64:B1:FE:9D:60:5F:10:ED:5B:B7:22:3B
+                4B:13:19:BC:43:E6:09:6F:BD:EF:B4:C0:92:D9:9C:52:86:A1:B7:B7
    Signature Algorithm: sha1WithRSAEncryption
-        37:ab:d1:a1:82:19:c3:11:38:e4:e6:9b:1c:55:6b:9f:0b:60:
+        84:f4:14:8a:8f:56:2c:30:4c:9d:47:19:91:a0:60:a1:5f:81:
-        94:0a:26:c9:20:7e:7d:9e:f5:8f:6a:31:66:4b:03:85:89:09:
+        12:c5:f9:5b:c2:41:5e:bc:34:43:6c:2d:ed:9f:2a:19:4e:62:
-        25:b6:d4:44:ed:11:c1:ef:0d:e9:3c:cc:05:5b:c2:c1:58:e5:
+        5f:3f:f7:c3:f6:88:8b:2f:a3:8e:cc:92:90:85:2c:5b:25:cb:
-        72:23:64:46:d2:f4:c5:e5:c4:70:c6:d7:23:06:01:1b:d9:6d:
+        09:c7:d2:83:2e:d3:3d:1b:3a:92:78:ad:24:02:66:2b:cf:cd:
-        1c:99:1c:19:fc:80:f2:3b:a3:07:da:da:35:82:44:ef:52:a2:
+        73:71:e1:2f:a0:c9:b1:2c:a0:66:03:e3:1d:80:f3:07:95:b2:
-        ed:95:30:83:c6:e5:24:ff:18:13:8c:37:5c:17:77:89:83:ec:
+        4d:c8:0a:59:44:75:07:ce:96:ff:f6:22:04:9f:66:96:a3:a1:
-        06:02:c6:09:bc:62:0d:76:db:91:78:0e:84:db:40:22:b6:e3:
+        8d:7a:a1:a6:ea:cd:28:19:57:9a:d8:b4:da:66:79:7f:c5:a4:
-        8a:46
+        17:0d
 -----BEGIN CERTIFICATE-----
 MIICHzCCAYigAwIBAgIBATANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMFoXDTE5
-MDQxMTIwNDI1MlowJjELMAkGA1UEBhMCU0UxFzAVBgNVBAMMDk9DU1AgcmVzcG9u
+MDQxMTIxNDgwMFowJjELMAkGA1UEBhMCU0UxFzAVBgNVBAMMDk9DU1AgcmVzcG9u
-ZGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCjwy87IzEZ6xoj2cmhs7rv
+ZGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNWXOSLwFh0H0lxUEzRS+Z
-lZ6L8u/qOYC8ae+CP1CxgWJBKlS7LW6KsIw7/SpPbD3KZ1iLIflrtubyCIYKSMec
+DTwEgsB0tXuq0Xx45xkDfiLQZ6nifjNs4/qgIm0b4vTn2J6/wXfSpvN+OzMGu8iJ
-dBdoAjyNfBS9LkvqFNRtjjOGzGHnkXnS1Ug4q84mZmJ/gh73m6meDAlCbC9EyNye
+ujNafVOYrphIKxG/sDtHIR25Dkkb/JA/4JRCQN0UeleWJwImHY8uzlsbYibNcLfX
-HN0ZBUSQ5JGd+NYYa2rMOwIDAQABo1kwVzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+j24ki6mobwcmxNVAoo3dEwIDAQABo1kwVzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAeBgNVHSUEFzAVBgkrBgEFBQcwAQUGCCsGAQUFBwMJMB0GA1UdDgQWBBRw5GDj
+4DAeBgNVHSUEFzAVBgkrBgEFBQcwAQUGCCsGAQUFBwMJMB0GA1UdDgQWBBRLExm8
-gXqg5WSx/p1gXxDtW7ciOzANBgkqhkiG9w0BAQUFAAOBgQA3q9GhghnDETjk5psc
+Q+YJb73vtMCS2ZxShqG3tzANBgkqhkiG9w0BAQUFAAOBgQCE9BSKj1YsMEydRxmR
-VWufC2CUCibJIH59nvWPajFmSwOFiQklttRE7RHB7w3pPMwFW8LBWOVyI2RG0vTF
+oGChX4ESxflbwkFevDRDbC3tnyoZTmJfP/fD9oiLL6OOzJKQhSxbJcsJx9KDLtM9
-5cRwxtcjBgEb2W0cmRwZ/IDyO6MH2to1gkTvUqLtlTCDxuUk/xgTjDdcF3eJg+wG
+GzqSeK0kAmYrz81zceEvoMmxLKBmA+MdgPMHlbJNyApZRHUHzpb/9iIEn2aWo6GN
-AsYJvGINdtuReA6E20AituOKRg==
+eqGm6s0oGVea2LTaZnl/xaQXDQ==
 -----END CERTIFICATE-----
--- a/lib/hx509/data/ocsp-responder.key
+++ b/lib/hx509/data/ocsp-responder.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKPDLzsjMRnrGiPZ
+MIICXQIBAAKBgQDNWXOSLwFh0H0lxUEzRS+ZDTwEgsB0tXuq0Xx45xkDfiLQZ6ni
-yaGzuu+Vnovy7+o5gLxp74I/ULGBYkEqVLstboqwjDv9Kk9sPcpnWIsh+Wu25vII
+fjNs4/qgIm0b4vTn2J6/wXfSpvN+OzMGu8iJujNafVOYrphIKxG/sDtHIR25Dkkb
-hgpIx5x0F2gCPI18FL0uS+oU1G2OM4bMYeeRedLVSDirziZmYn+CHvebqZ4MCUJs
+/JA/4JRCQN0UeleWJwImHY8uzlsbYibNcLfXj24ki6mobwcmxNVAoo3dEwIDAQAB
-L0TI3J4c3RkFRJDkkZ341hhrasw7AgMBAAECgYBPyn5s1gzKkB7AcREpVKU0rzX9
+AoGBAIp1fwyZLyhh6JA4IY9NXhunpckw1E2dNMZnu7LVt7L4MMcuroiuKUSJr6qb
-AnWbLkFnjEZCtA7hLiVtku6N9OjzcmohoIzI/fhtckVWJUueDBQiwbxtrmBzNsa8
+q8/6xsEw+VE4RO+/bDy3897dbQfjVuNBYxQ4rpVlG2SfpuNIuRXEYBj4bMTH44pf
-vgaBJqS7KtLZv2YwFV/WK+VI9D+t3KSV/Qm/azdpaKkVD6Uc//M4kRB5f65RL9oK
+44NUG1Bd81kJ5SRFS3d/BPX+jmz/uTy1mx4Gmy0viqf994XpAkEA5pXByoFFg6DP
-cxfn7kQVaHMUlxZdQQJBANmpxMVuwSANsTBE1R3rE7NxAkcJgVDkzzu+MTFBhbS3
+xLM3LgLpuPVy9fkg0qBIFRXRcXQDzwyqScwtGmhJB9PcN1Ju+mLOJgeLy3Nuqeod
-wEOmI3uRiRb4Mak8mlP0EXOwf8NaW2gteWdylcL1dZkCQQDAmxUCWYaaIOEWtDaW
+a6XfiDi4bwJBAOP7pDPRqTGiygvubEQebbwQtyYDrPOHOtBRX4JI7ymy3Ke5FLPu
-AIpYVt5YjOuUTpNTnGpMud9IhmBzNEDMaS1SEADKDwaOHY0Xp7jNrlh0cCvHa2xB
+8GvKF00B4wh1uaGhD2SFtjqeITfox3MNz50CQEblSJ4wvOTJrtf1mkOlVaMupFgI
-0QzzAkAsE3O0IyxaaEtkIdwiFdNEd/LlHaihD+RjDa16cvE3WipFyKPQxvTCwPmV
+bxUTftYszSaq2vjwFfN2uW9jHQExHIZN7B1D/8oli8/T//RyLPWKHH5PojUCQE4G
-cp8xtu+9xJTqoyZ1XxgBebOX6gqpAkBLPorHnzgBkKS+3OqSUWW6uz0j9PG3v7a4
+7BYIJd4lFv2qZkeSGoCJQAW0sFbQ66Isl4GhsKkW3EpTH/DNUF+z1PG4OZnFoPje
-rFuu29KKH80gVKKX+OL2sz/LsHEMJilPu3tsBxeRbZz8zE+/qq7XAkA431Gs3hka
+hMQkt0+smzXlZ43LJkkCQQCbiSeRyXQ9AsjIPJZjRspvBaiHllR79Ye2GSI60s0a
-7QPKNkJPZp8U6DRwkoeH5/gwcx2ugzf6QaqxgRaWCLgaiwWEd8uo97UmbROuu+wg
+mbWk5ZGIZTQQwm9ZjggX8KzSsaZt8Rk88yrGLx+eZeNm
-wEsncFwd3TNG
+-----END RSA PRIVATE KEY-----
 -----END PRIVATE KEY-----
--- a/lib/hx509/data/pkinit-ec.crt
+++ b/lib/hx509/data/pkinit-ec.crt
@@ -0,0 +1,51 @@
 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 PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0rL4tO/Yub2W7Go5
+MHcCAQEEIMJMVBJ2dFrIShCgDWsA8aewbFKgmVCGuxUjX1awRPoLoAoGCCqGSM49
-68zwGmCggVGFqWW26oWvTvn/FrmhRANCAASTwtiTORzwgAbivk/+N9tJPZqocXzk
+AwEHoUQDQgAEE6JDiprjkrpX5qj9IlGfJ9SQsa2zwseJpANCebwc9R/5WbRpN/F3
-7PG44ny/Hr5FzBIMrSxPa3uLpXD3NQjksle23tUdiEddfcaJWB7qxNux
+LVNrQc3hdugtBPNBcV7Y+IIA0kVU/T+6bA==
-----END PRIVATE KEY-----
+-----END EC PRIVATE KEY-----
--- a/lib/hx509/data/pkinit-proxy-chain.crt
+++ b/lib/hx509/data/pkinit-proxy-chain.crt
@@ -1,14 +1,70 @@
 -----BEGIN CERTIFICATE-----
-MIICMTCCAZqgAwIBAgIJAOFd/6I9Oly0MA0GCSqGSIb3DQEBBQUAMB4xCzAJBgNV
+MIICMTCCAZqgAwIBAgIJAOFd/6I9Oly2MA0GCSqGSIb3DQEBBQUAMB4xCzAJBgNV
-BAYTAlNFMQ8wDQYDVQQDDAZwa2luaXQwHhcNMDkwMjA3MTA1NTIwWhcNMTkwMjA1
+BAYTAlNFMQ8wDQYDVQQDDAZwa2luaXQwHhcNMDkwNDEzMjE0ODAxWhcNMTkwNDEx
-MTA1NTIwWjA1MQswCQYDVQQGEwJTRTEPMA0GA1UEAwwGcGtpbml0MRUwEwYDVQQD
+MjE0ODAxWjA1MQswCQYDVQQGEwJTRTEPMA0GA1UEAwwGcGtpbml0MRUwEwYDVQQD
-DAxwa2luaXQtcHJveHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANjqwCUs
+DAxwa2luaXQtcHJveHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxc2RMo
-EBXBX/suoqLkkBuvGCg+Eyr/RvVDUugZgNPGFk7TlVZxeC3skQ9glVkI6jghfkQP
+bcMKCFQHAwdVe0QwnnQenFZ7tabNpsSR87KqLfmNT1b+mREeOhhcjm12Z22D3tZo
-f4M5aS7DrDxARc+8VW/Z8ARakWsS9sV4gfjXj6vATS/fOJwIZMZPaCLyB3ymx8IM
+RgyYSnkzTstOngI7ZN3jMEr107lvgpaO3F5B1LBlP0pKrET5VrK/UL2f9obHeX1r
-uZyym8SH8TUviNLpW5cU/EJSUnuHl1ihTPQvAgMBAAGjYDBeMAkGA1UdEwQCMAAw
+1irf4GW895b96aPWyxio55v3Q/SWdHoNaHOtAgMBAAGjYDBeMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBQ0JrVVHCxVEne/mmlb0SfKXuC2+TAlBggr
+CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBQG8ttTe93FGllomRThw5DLqtV6CzAlBggr
 BgEFBQcBDgEB/wQWMBQCAQAwDwYIKwYBBQUHFQAEA2ZvbzANBgkqhkiG9w0BAQUF
-AAOBgQBjx+Tzk4M0V54GOKUxiC8pN3HU70h347nvDBtkd6AT1V+H/qmdznOZMiQA
+AAOBgQCVZsiDTI6klQ1KFUaD3IguHjIAd+FN0WYzRJLfTZzrSrgFi7OIswGSi68X
-8HS2IxzWHuUHHgg1NKeerTXqZA33zScg2LmsmTgJnyHK+6LiR8g4FmJwnGl98w1g
+lhKIIt+7KP33K2Yw80pj/r58OHf+IJH70xFfsKefxyeNDl3Spg3DZQoSaUG+UWv1
-gQPNTa9qSU0xyfLoYQjEfr9GcXx1t2n7tII+xqnTQH0ceXUYRg==
+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.crt
+++ b/lib/hx509/data/pkinit-proxy.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICMTCCAZqgAwIBAgIJAOFd/6I9Oly0MA0GCSqGSIb3DQEBBQUAMB4xCzAJBgNV
+MIICMTCCAZqgAwIBAgIJAOFd/6I9Oly2MA0GCSqGSIb3DQEBBQUAMB4xCzAJBgNV
-BAYTAlNFMQ8wDQYDVQQDDAZwa2luaXQwHhcNMDkwMjA3MTA1NTIwWhcNMTkwMjA1
+BAYTAlNFMQ8wDQYDVQQDDAZwa2luaXQwHhcNMDkwNDEzMjE0ODAxWhcNMTkwNDEx
-MTA1NTIwWjA1MQswCQYDVQQGEwJTRTEPMA0GA1UEAwwGcGtpbml0MRUwEwYDVQQD
+MjE0ODAxWjA1MQswCQYDVQQGEwJTRTEPMA0GA1UEAwwGcGtpbml0MRUwEwYDVQQD
-DAxwa2luaXQtcHJveHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANjqwCUs
+DAxwa2luaXQtcHJveHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxc2RMo
-EBXBX/suoqLkkBuvGCg+Eyr/RvVDUugZgNPGFk7TlVZxeC3skQ9glVkI6jghfkQP
+bcMKCFQHAwdVe0QwnnQenFZ7tabNpsSR87KqLfmNT1b+mREeOhhcjm12Z22D3tZo
-f4M5aS7DrDxARc+8VW/Z8ARakWsS9sV4gfjXj6vATS/fOJwIZMZPaCLyB3ymx8IM
+RgyYSnkzTstOngI7ZN3jMEr107lvgpaO3F5B1LBlP0pKrET5VrK/UL2f9obHeX1r
-uZyym8SH8TUviNLpW5cU/EJSUnuHl1ihTPQvAgMBAAGjYDBeMAkGA1UdEwQCMAAw
+1irf4GW895b96aPWyxio55v3Q/SWdHoNaHOtAgMBAAGjYDBeMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBQ0JrVVHCxVEne/mmlb0SfKXuC2+TAlBggr
+CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBQG8ttTe93FGllomRThw5DLqtV6CzAlBggr
 BgEFBQcBDgEB/wQWMBQCAQAwDwYIKwYBBQUHFQAEA2ZvbzANBgkqhkiG9w0BAQUF
-AAOBgQBjx+Tzk4M0V54GOKUxiC8pN3HU70h347nvDBtkd6AT1V+H/qmdznOZMiQA
+AAOBgQCVZsiDTI6klQ1KFUaD3IguHjIAd+FN0WYzRJLfTZzrSrgFi7OIswGSi68X
-8HS2IxzWHuUHHgg1NKeerTXqZA33zScg2LmsmTgJnyHK+6LiR8g4FmJwnGl98w1g
+lhKIIt+7KP33K2Yw80pj/r58OHf+IJH70xFfsKefxyeNDl3Spg3DZQoSaUG+UWv1
-gQPNTa9qSU0xyfLoYQjEfr9GcXx1t2n7tII+xqnTQH0ceXUYRg==
+lvBHJ+5c5XQcA1QLZU//GPbk/SF0rLgx/3wo7ZJnVJCgSLGLKA==
 -----END CERTIFICATE-----
--- a/lib/hx509/data/pkinit-proxy.key
+++ b/lib/hx509/data/pkinit-proxy.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAO9KW76Zu/U543+Z
+MIICWwIBAAKBgQC8XNkTKG3DCghUBwMHVXtEMJ50HpxWe7WmzabEkfOyqi35jU9W
-RXmIrkV+3/bLPlyNxFFZuWdSskUzGO2cl8eKeHhGebmcpfllSvN+vx2lWjIPWXb/
+/pkRHjoYXI5tdmdtg97WaEYMmEp5M07LTp4CO2Td4zBK9dO5b4KWjtxeQdSwZT9K
-1KL80bQuC2m4QJhQLhLmNPoz6jCqLhSWUOP4tNmkKTIic6drVE47+7B7YYyLIk5n
+SqxE+Vayv1C9n/aGx3l9a9Yq3+BlvPeW/emj1ssYqOeb90P0lnR6DWhzrQIDAQAB
-F4GqLivSeEnHu4fVoanifjc5ITcNAgMBAAECgYACyECM1MjErymgAC44nYg5MqJ0
+AoGAHt/BHOjFhPCCCPPVRUB3oeeuMS5LRcmlLqAKs7GQljpaqsrEtGeqwymHMDML
-AiT1eoh/0aVAOEvuVgvCJ4H0Rf3kmB0uNU4QukbG0gBy3ctQrbECmzLjukDN68Gm
+jVmY/lRdFBunT60ul8sXIS/TqhWS+IJFh+rg8CGPn2ODe1BNybovNtufG9Rea7nt
-5ll2IbODaJw/mAYVjgQVzDHjQn9mo9Cz0SHTvj/kY+/SGfoYwcJSijnzuX/KB5kU
+nx7gUrY6D9Rv9nj5boQgQnjv1hJZhf5iNZPB021+D15DuIECQQD1AAbnN+5g51dj
-3zct0oRhLaXfrRpuWQJBAPm1U69NiThH5MU3AXfUEiTbfopgCBTGegCJbtEjQUK4
+u29nEMcLOY7w0bZU+umEIwqztysDoIvXxwlIkxWVLaFnDBVBI3VYHmS+hJumJUpR
-+EtElHcf6fmCqSQ2WQoeoWh+B1qRj2EYVrXMsU7aOh8CQQD1UdWH0fkzkSVaOFwW
+9h4n8GxRAkEAxNHYDQhfPboGwj09e4Ti3DW/+91rSG/ts5ZRPfKtn7u0JKH19fyd
-OzdZGN0s+G7pFaJsE3TCUMbjhZ6Qj3QbCPKTRtoogm9cXEwhtZDw16XpYcjAKVnp
+cZgKOH4/gSPQ7VvPUwDEmHA8kA1gUkImnQJAP0pMfjqiqAHbP3ZSJwvcf3fVBz0F
-kcFTAkEA5qs2Tu4VIERpdDTHymXBDQMl9bWYQXjHIs/R6qfilTxBQWZsr05v2Ol2
+nxpabLoor5hn0j4NIibWrRrh/nGVOmuSqgsg6yye1eCn3NnRQy8TRzoCoQJAYx36
-TdlWjx6Ug+5H5MYp6MuO7gnUkL7OiQJBANQI8Fvdg9wrVzKcxhM9CYDL+dd1vz9d
+W7XXoNJKDQ+iIs4tIRDAeiprmLMlVcdhan0ICuUQN1KI9zQcZdRXcVPCz1omISKX
-QK7TPjb55H4hLsVaCIuZdzkOo18iJiiZagA009snOTL4HrDgzOMR5RsCQAlGvjRm
+Kgm897euCC10UHiX0QJAd85xJ55g3JtAV/bIKjFfCv3/X+cifG3Yv0qQas8Xju8p
-BU7fZhBbIA64JPfXBw3PC4WpbXsz/ONDnvNpDXmzYI3/noVDxdDVlTN3BCrnzbV1
+lGFhiqi3RF1TNRvxEyFyFxYeHoWZ5HtlnDSGL8H1gw==
-Z1exkYA8XBq93+g=
+-----END RSA PRIVATE KEY-----
 -----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,C040E2B0DDBD90700C1E5CCA62D3A296
+DEK-Info: AES-256-CBC,1D3412D4BC4B83A074369DD37A235A06
-krjlR3KKRoM7uetGFCkwPernQKA9bPZfFJROW/GUBN4nX9gryMFmo1JOBeXlZYQY
+gbigerGjK/y7uOByTAObxdROrhA1MWeab5yvAm0R2yMyYgQbUgfSO6oDKj57T3aI
-XDw/Py+nK3mJX5XpqFBPUzEpHEJw/pEzD+EaNCFcE7upK7np35Csbrszgal8ce2n
+HrnK6q7DPZPhjtH2LMhwrspdQzyrSUkcT7GzKhgyWWX8N+97T5m6iH/RAulL4EX/
-JIfErUwMoROgHKj75bWJ7DnV2At+LEMAp0M33VmRrrBR9NxrhoDbqtj3wwUV9djZ
+d+Wl6hm42bc/+/NPQhKDTz4OdylZIGkWpNtklLUNPnGOZBg+XFF/MkhhhFE7D6dh
-To8GZxCV9aHrR93Sw3dgOn3ZolN552pHk2Bv94UoKpuCDhzYSbQIIAcSI/Y4t9Fb
+Y4CnyrlogQe1ajgBmtI0JioxdBnrZbhKw5Xq/4u4I6RW2ieSDmxjd/FcGOhahncR
-8nF5tXuag4bJGIC1UkOSdv4U3KMZeMB9vXyF90GZFlSfznpnuhn4LHmNvMsuMBcO
+zBRJXHhXmeB8qqNwyI2PCRvshlXuIau4EsnlqUZ1e9NuK232YKMH3SR6G2wCFdpe
-tCqHxDFsPP9w7Zp56Deg4H7xhcLZocf3i8IZUPppj2XflFkuLr5Ae6laVWf4UDK2
+yjIUO8WKnea4HYoQgpUujbk0t5qx9vJBzZHn324/dfVJVlWSANnUYWKeHfiVnwI9
-ex24qtzMIlIu+0POvoheVHSin03n7JzbgZxkRBw4cshzqh7kUpfGqdTp0j5N6Oao
+1RgMicnMUzR4GvhUtFr3EOgAFI1TiptjQ85yyUWmO1ixl4K/CfmGw4Sp89areueY
-tfR3/jUYBde8d53Y4qyRv01s39Bh7WVI7na5CpA2aBJNTm2tfxT4KACMqV5vxPKI
+D9y/Ri1f6nREMZjSVnCHGGOnfNPPVIwHMr5nTagBrKY3pKG1TFIevXkGOGYPb2HG
-yRVtbz37D6K2FMVxLfawP36oJ7rDRdN8zsryV/KLI9pLjWwIcry9yCD6ILh137gQ
+wZ1H4YS/ObLQjAy2at8zViO+9lhE0a0IKFRZq2flgePBSW37n0kXhPn82jQgLyei
-XJnjWFwSHHhCdlePNLghGDC/8qZkavAtVhyChJnkZO/14BN18htrpLlZE9ds+eF2
+Of98rpclwHEF3UazXti0k/HmVZPr/4aIpFmP3qnUcLaDa1gjGxrRgBS5jJvY72Y2
-6Bv6JK8gZ/XlmWN3doHgOIt/z9WULANm0xn+AdvUnG50X8ZDMVEtgMKBp3tSLxlr
+Q+yWqqylGzr22C1M2uVcuJkr4LCYwjx3EC3SoxUTryyQWuRj32I3bv2ueWb6DLRb
-TLrzhYXsdfZIM7ury9CDHMHnCW4lim52UCR5PTEM6vpe8h4hqHb0PqdTuO5XhELd
+L0AYTYoTKkTB6kcBGwLasLCBcoPBg8qy6SoO3mFC+KGYHmkocTG1uyNUJjERqj4/
-imtz/p3X/qJFw90fi7Dm6jNl/7xW3HXjrwlEwwVu46fOEcdoHf5rpTXIKZtgmxdI
+/6iMuisYX+WQEWiBR+E/c1iXvzuaxtoAwNoZYfXR52T/ZNuykyYJBEgTHu01DZgN
 -----END RSA PRIVATE KEY-----
--- a/lib/hx509/data/pkinit.crt
+++ b/lib/hx509/data/pkinit.crt
@@ -0,0 +1,56 @@
 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,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANPQD/I8GN2muksj
+MIICXAIBAAKBgQCY8/mE3LpRW8+nBJE3AvnQC0BmpX8qL4kyrJTsAEJ2Vrk44YFN
-s0ravWJ8wNZvKeKnXbe4t5GP7zIxwiTNC91htpvNdSYykQpm8sU5/67S0XLR8wah
+BxbS8S2RZ4HUB00K7oCdzrO0BIYUXrZQ4uXglqMy4VaQnVnTX7gekciU4o8LIePa
-0nezysybuGlzYKHoDcW6CLfytWGIQz+nGn5ScNRbzQE3kiDBFTrrMcHA3DXAExRs
+QxYAMKrZ4MSPO2un2fxXbaVUq1/4SlSHNAZcRCWYmeK7YhDgrSUny1ilTwIDAQAB
-BCz4IVJV1XE1yPVySngVtoIlG0cNAgMBAAECgYAheFtMt9pmDBacEQQf6/jJO1Vt
+AoGAV2NtuJ90RG+0YLSXU1r76AXFsd/0m+G0/aLlI0Gyt3ItOXZ+LchTHgp2ApGk
-jRtdSX0xruqzAb+Weu5myk/5p5sne4vrgUoSDrqGF+gjRAT809hHUALmD28YJFmG
+98OEHS7PhVpICh5bjN/gQq6gr6K1g8EemheEn/M0ad77y9g/6xkuyCgjeW8khVQ/
-FjV2wwbEFzJ9SkbWyoT29ICGUVeKGjl1F+Cj3KhfUq70j3phz5ZQeNcm//F4j0rI
+KovidHqpwtmtMQhJJFOl3Rh1E0ULBeiVnYlOG6xIzxwWbUECQQDKUQFLwKjCxaew
-Cu23mj80uZOoJwYegQJBAOwhNgR91mT9DZkL1hp6ytJP7fGqPPlg/TwTgOBkLBWF
+hCDEClAYgX+aJ3hLrkrZte/RwZnlmvyZJrMy4I7hBlu3ushgZuln4l14u8LQDJyg
-FsbljhvlHIwbUtBr3uGl5s3C3xZdlY0gqwpuVgj0bCUCQQDlowGas2hSxi+G99PI
+3Zod+YxHAkEAwYnNOnKT/euosOVqKJuLnnZtW7+Lu8NBzlCwdaSzIiYZnsIF5C+n
-5jfAorIUkuR0G+rbNjSqGM1IrWj8SztL/93s3rz7OJff44cy9AiJ3psgBrlY/fg7
+zrX1v1p8TTjsu9cUKXgYtgknghbaBnyKuQJAEpPxrIUaehgwV9MqNxZDWJy7nOo2
-C4bJAkEAxagrOmlHrPNyjXkt+K5u1suXhyKUtb9tWvuMdskDaeQlI8sGQO1xDwrU
+76wnj2pXhUlj2mOrAl09Y1SfiiZNUcfDEqcgk7uDncyQDQ67a0IuHsaFjQJAHAZq
-MKkLQeGIqRaFfYhK5n7BDhM8K3TGjQJAUwPWtKJe+G2FCPnWqi3vwcgPMLjZtc/R
+U3ZX+8LuMH9n+e1cMFwRxeFcyJmjo86HXuG0ltNRjm2mEL7d2875gPYHXd9KWIDy
-22WBLGzC6Z8m8O4Rhav+An+TOg5/eQS7/4ORAqZi1fUYVD+b2VyVYQJAKbaxRuaR
+iHa9jU6SDAJnG91Y8QJBAIQHn9lEtJ+kLIWijyomdx0StLaaHYymqOiD/JiUhNrO
-68gNlypwKyRlM7b8l3KP6Pu998hEHmnqUMgeGZgBsU/yny3WJNsLZRb4xNFAxcnu
+gOj9xsaK17X0HlQlAyodG/UwdncPnMXOjwCILQT+F4=
-cpG/j+8w+zFyBg==
+-----END RSA PRIVATE KEY-----
 -----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-----
-MIICUDCCAbmgAwIBAgIJAP6hx2RbgHvXMA0GCSqGSIb3DQEBBQUAMDExCzAJBgNV
+MIICUDCCAbmgAwIBAgIJAP6hx2RbgHvYMA0GCSqGSIb3DQEBBQUAMDExCzAJBgNV
 BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQxDjAMBgNVBAMMBXByb3h5MB4XDTA5
-MDQxMzIwNDI1M1oXDTE5MDQxMTIwNDI1M1owQTELMAkGA1UEBhMCU0UxEjAQBgNV
+MDQxMzIxNDgwMloXDTE5MDQxMTIxNDgwMlowQTELMAkGA1UEBhMCU0UxEjAQBgNV
 BAMMCVRlc3QgY2VydDEOMAwGA1UEAwwFcHJveHkxDjAMBgNVBAMMBWNoaWxkMIGf
-MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkGrVDMP9ejgvA/iaNgOQAXLPZwMYF
+MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpSBN+FKVC2wAP3byRsbA1+GRUTfz9
-aq7bmo7sqmA/zwXpYjqzhm2Nrtv2CI7/1pey1/M+fJcmAqTJflUFV4yir+n7T7xF
+E3QOGzsYor7OT0sL+wuBfqgBsDpDWLZYWOLHlKODg5ktBLm8+vehOiRuMgxJB0MY
-AtM3KrI5Q8BqobV9FOTeJkx8DQEsWleoWmPjgWWvZgHofrimmI+LQE4/D3cBLhDe
+uNw86/JhQWp7bvFRttWVfZYReMwEjOTdK7x6Aa3ZvM5o/8Bo8NZq08/71X5cwBiE
-Hf1BIAS6YvUTDQIDAQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+1zMmCUtZpcVchwIDAQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HQ4EFgQU1OfZAsXToezJeqYKz+qn6nVsBzcwJQYIKwYBBQUHAQ4BAf8EFjAUAgEA
+HQ4EFgQUw5aS8IKx4q+/8nHq7O+YUjs+D8UwJQYIKwYBBQUHAQ4BAf8EFjAUAgEA
-MA8GCCsGAQUFBxUABANmb28wDQYJKoZIhvcNAQEFBQADgYEAJKuxT4zf9yvhBbBO
+MA8GCCsGAQUFBxUABANmb28wDQYJKoZIhvcNAQEFBQADgYEAscBp6MWOKv6BMY6N
-pAxBG+4Mtt1123MmIqNDsaCLXGaaVkl03Tj02L+3nhud7tGDaEgRfGPJktrfIU8i
+NTl9eMnnYVT2B9ynGK+FsMFBdnDeJBj826cMzfk7nx+J5OcHB8YhaYv7GqpFa1gz
-Tp5CIZZMElCfLahyGDv3HPXWaC7g+224+MRvcuaZukLYnbkXinc3QF3ytrojHKvk
+8TACxL6bgzgtVmfCPYAOSVEcNVAvMg5IuDd78fDaFZsfgnR9kF3T81/nUAYu1Ldh
-bTh9OLngnRi5iQepEG+xSuLYBys=
+iEdCHg9VXCrB9/EZOfK8zsnEzCA=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy-level-test.key
+++ b/lib/hx509/data/proxy-level-test.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOQatUMw/16OC8D+
+MIICXAIBAAKBgQCpSBN+FKVC2wAP3byRsbA1+GRUTfz9E3QOGzsYor7OT0sL+wuB
-Jo2A5ABcs9nAxgVqrtuajuyqYD/PBeliOrOGbY2u2/YIjv/Wl7LX8z58lyYCpMl+
+fqgBsDpDWLZYWOLHlKODg5ktBLm8+vehOiRuMgxJB0MYuNw86/JhQWp7bvFRttWV
-VQVXjKKv6ftPvEUC0zcqsjlDwGqhtX0U5N4mTHwNASxaV6haY+OBZa9mAeh+uKaY
+fZYReMwEjOTdK7x6Aa3ZvM5o/8Bo8NZq08/71X5cwBiE1zMmCUtZpcVchwIDAQAB
-j4tATj8PdwEuEN4d/UEgBLpi9RMNAgMBAAECgYBjts0wTzYDNqMqva9KwmJpSh0Q
+AoGAWp/Qd6X71y/A972AbwsOR8Zjh9J8hsu8TLT9TTILLg27In3Sag/xR34douJC
-/rVR3t4Lf9gk2yHyIuTZrigtHIG9owfi2MDyU/PCqaZa1YoZgqRYtNIj4K7ICAIy
+NEfZmHkVlJmGDljCSs6cdT7YMxsI7MAR24wzgg99x+0Of8V0lQD1I+cy5CUQdOoe
-MpY2Qu4l6HhRBHWTWqCVkE72UA868IB5eWOjqEJEN5IYoS69WQWc0pd6IfnA117p
+LtqK6tufDuNG1ppeFc3s5iaWPQzkCwb3ZY7JcGjEk+Zm+CECQQDaTv07uY8moFUL
-DMiffXayjMr1qurVnQJBAP51n0yRLlQ6CZHydY31PCYBxYgyZu61a/Gowa9CCbvI
+n/s4/QGvQIAfGJVdtj+deNq2B5rSQX0lFGqEOtq1RqptwUpqnT37ArSiE3sEYjv0
-U2nzEC81BXIH7jV1HZ9wejxS0aPNPuaR+HMAqjbju6sCQQDlfD0owd8i3dU1L2Bf
+x8+YYLfxAkEAxoIk9nkdmKH33O/6vPTG7MYKhD+D4id2VDXASlEv7X4wIXjlNhj5
-nvyxA2CdYB4Hgs48JRAtYmdspgyV9QdAGWGLyJ/v5qgyt2jLYyk5qqzldXPgMfrV
+cmAeDZ4GMrgeQTXwSZs0hYujrI9L5J0T9wJAT8XFa2mnEapM6W6QUobBctTS/Inz
-rnQnAkAgdJIv6uiU15423kz+IURduKYgPAWC9uLgvNyPZQXmzKNPBTCQRNv/8mEA
+KsdJ/7UF1rZ4sJQVstL/CUqoWM11wZ18H/FNkMewUflkXnm3Bv9ssHXHQQJAZKrN
-soJnvqnoncudb+VQ9VdSG8iaHavnAkAvs9amvT4b6k7iglmfJtZSGWig7hTv7MHg
+Odzz4FqLCxT8D+UGGD7aSHS5We/vNwdHK6j+aC7tE5xuiL+jiJgrxXYU6JWsah+D
-ALhPJtBm5lFhbpC2Q1BilS6h2KmH+VYgSRmNsivEeti+dsU0W9IrAkEA1r0trrk5
+aqB1wx+sci79KsNpwwJBALFqrd7N3t4D4Rh+VaR1qUSm8Lq/SCn4tYjucZpLb2bZ
-i8ujhwmhsxyNuazJroA05meHmDbwQhnjPds9M3WVoY9oTCzhihVQ+OUpFBMsu/U+
+0szSqKs2XO97rhJd7lvo0YhlQptsPTg0JPURMwivzAs=
-zO1mioIvx/R3lg==
+-----END RSA PRIVATE KEY-----
 -----END PRIVATE KEY-----
--- a/lib/hx509/data/proxy-test.crt
+++ b/lib/hx509/data/proxy-test.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICMDCCAZmgAwIBAgIJAMJEvwnR1+2YMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
+MIICMDCCAZmgAwIBAgIJAMJEvwnR1+2bMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
-BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjA0MjUzWhcNMTkw
+BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE0ODAxWhcNMTkw
-NDExMjA0MjUzWjAxMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MQ4w
+NDExMjE0ODAxWjAxMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MQ4w
-DAYDVQQDDAVwcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwOOSDzTw
+DAYDVQQDDAVwcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzD9rvFqU
-7Mcno66PrQ5j5fsfalj4XDfV7Qpcl8cdi0epxbnuUP2rYLXywOFZKMM9mSyxNJ/v
+UYec1cMnPavmb+4UBxxZ1ZCZly24yR30k5KERNmAeqNNI3rbxPhQGOF5x97Y/izm
-ylsRB0K5vhKzowlMNvpk4mJEw3+lrqJjk2kwfXubCljvAlL/nHEHNd3Df2ksNWKO
+anNZxvH+EK75xLsweAYBoJ4K/Hzx2A8CYAbuFrV9Zomx4AUe35o4WWEQwJMwIxRm
-wXLIq07soA8GgHd3/bl+BVo7K2iakQBj1TMCAwEAAaNgMF4wCQYDVR0TBAIwADAL
+8E1BmiL4C71NwK6fC+BIdWiFKgOuOrm+5N8CAwEAAaNgMF4wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0OBBYEFGUBFJqHzz7PeKmgs9O1XMlyeEEdMCUGCCsG
+BgNVHQ8EBAMCBeAwHQYDVR0OBBYEFD5WzyL5AGFFHSdahlmprI+OnUMlMCUGCCsG
 AQUFBwEOAQH/BBYwFAIBADAPBggrBgEFBQcVAAQDZm9vMA0GCSqGSIb3DQEBBQUA
-A4GBAFPGg4wNlv7J0jtPUJFBDPLWwSRqswJUDB1XJ6nhWmugKkaswaj3rEbInpSE
+A4GBAMhRGdqxHMzj625UCzMkAzrFLEnLJSXU1u3/RHlUQNyfjs5+UW49ImKBshCa
-R9Mk/36pVkxX5H8RJHq11WaYegcLUQ8c5eG/4UERpnPi2EAzTEo0kFJI6EMB4/2J
+3lNy4LQDh8MYjkA/mUphOqZjuHBsfkqlJPgLEhhAIns7vm9TJawY97cKO4gd40Ei
-zzttrEp3s9hIsnX1v+PXa7xxci30gMt4ONu1KWwQOhg1Mhde
+4SQoEcWyKEObqyVQmZ2269wwqfT5BMRqoZPaD/a5jvB1HRNE
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy-test.key
+++ b/lib/hx509/data/proxy-test.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMDjkg808OzHJ6Ou
+MIICWwIBAAKBgQDMP2u8WpRRh5zVwyc9q+Zv7hQHHFnVkJmXLbjJHfSTkoRE2YB6
-j60OY+X7H2pY+Fw31e0KXJfHHYtHqcW57lD9q2C18sDhWSjDPZkssTSf78pbEQdC
+o00jetvE+FAY4XnH3tj+LOZqc1nG8f4QrvnEuzB4BgGgngr8fPHYDwJgBu4WtX1m
-ub4Ss6MJTDb6ZOJiRMN/pa6iY5NpMH17mwpY7wJS/5xxBzXdw39pLDVijsFyyKtO
+ibHgBR7fmjhZYRDAkzAjFGbwTUGaIvgLvU3Arp8L4Eh1aIUqA646ub7k3wIDAQAB
-7KAPBoB3d/25fgVaOytompEAY9UzAgMBAAECgYBRd8yY36NiXjs/xtqoHQvUdtwt
+AoGAcbgJ+xgPpok0CEyc55hzN/S9j+v4FJFrAqJBVTDpgNS98juLbjzH8S4xeKys
-7qX3TR3toBK7iD3SNdJe0Mj3LCzWDAMbtBIURWIe7+FoeKSuswfeKTCKNxvnZIma
+o/2+OUtZU8OaEsDgxoTr6UwS4bgjUVxNJytUbkULNfuN8+k4ciyzVk9za7TT+1Q0
-muKNiMJG/zEZ5Ti/jC/ctkRVCj51F9WaJAqjBiar37/6zEYF7K1n3Ms/TKiIYLT0
+MXDyHDE7kE2WlIB8a/qkzpZ2p1JnzGvDCDTyEJH1wu+r7VECQQDy4SEXk3eem4oU
-87LfhRC9sD2utvXbAQJBAOdD6cshZ9QU9FMFwmPTz0xXuSB0cbIm0xajaqSKnPym
+AeYUShkyxLgUu/AjkM7pMsdJeUCcohhwhGolUmJfusoIyztwU5IRByXXJhWE53io
-3SpTbn2GznJjRTSfyBpA6jmKddcDhtVBvQ4tf9YpvkUCQQDVhOftSsy513gme5We
+6UXYl0w5AkEA10gKJV4XM8pGxKppTIgcH04zK8U8pzzgXIh2WqRiDbOX2zk038ss
-kvo6AO82cV42uysupbiEOtSBuZ5WtZveN23yAvPFL0jKFQD+6hMy59HByllU2IIH
+5g/0amcCGqMac6UcTlsq9Hkb1Vjp7L7p1wJASmXRyDIA41HLwwMt4issetOte5Ry
-QxkXAkEAoPcNEBx1NxFKqUqV7YOsgneAXA2QYS5SuCwP+uybreK6h05A1k/w+38K
+I8LYzrAiQYxl0VUJ3XWCOjp5Lc++0WDHrUm8JYEmAziEQPjSihMitQzraQJAcRk5
-2UDpNxS9skUkFf7XZzF1VBvpIXg2fQJBALkOrPkEKHY14uPvntjGaGuXXbzg+xgS
+q1P5II4+C4fzde9zxsaQf4hJSxriS/qtIwWFNemJ9/Pf4UqeNedf4p5nLpNNjD/L
-lrWiWk74sjAREcPzOTma7wafOmo/tiW3mJpXg/ZN54W/fDdGQ0RKClcCQQCEzGUB
+1SZ0NKeDhdwGWQgbVQJAcFMoL0PzBSWRwxhoOd6pu5+w/HrOYG1Y1v5Zf8pwtErx
-cc/Y+q6H57zWsPwYaAgLT/VNSovXIJRdM4itWTWPmzzlH9KTlXtOY9Gjnwn3Akem
+i2JYmlylQ7uc1s641us/bHz0UMUVOQQHnqKT4OMPQw==
-BXpEwqpddh8CxIwB
+-----END RSA PRIVATE KEY-----
 -----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/YPUMA0GCSqGSIb3DQEBBQUAMEMxCzAJBgNV
+MIICdDCCAd2gAwIBAgIJANtSso4F/YPVMA0GCSqGSIb3DQEBBQUAMEMxCzAJBgNV
 BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQxEDAOBgNVBAMMB3Byb3h5MTAxDjAM
-BgNVBAMMBWNoaWxkMB4XDTA5MDQxMzIwNDI1M1oXDTE5MDQxMTIwNDI1M1owUzEL
+BgNVBAMMBWNoaWxkMB4XDTA5MDQxMzIxNDgwMloXDTE5MDQxMTIxNDgwMlowUzEL
 MAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDEQMA4GA1UEAwwHcHJveHkx
 MDEOMAwGA1UEAwwFY2hpbGQxDjAMBgNVBAMMBWNoaWxkMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQC1n6WmN0FXm2br5znyabvYHTgK4ux0WyNuQuWPrXUpVV+y
+AQUAA4GNADCBiQKBgQDRY94DoMXpcQWDorXSjSv5phbgFhfFRA4gflBNlcI1sHMJ
-tqnW3IX2nxQCNiy8VJcGOD5jYRE58DrC19qBhA0SWFxYeYmP38rbqLIu71MbmsGy
+jYAusRylG44O+LqpxRkO16WAZl3aENLs/Y8BWx+yJ/NaokM1XhAE1EP6X/RIvfcF
-QehjyqBHb34R7+uuunlNiiPhr+ergVtFXuGI/NVv/fzZNLAYnP5CswlwEwwcVQID
+Cbhf7srgUhzBLcA0d9gCqaMO0fhWnd4c702GWG+HMKLdve/FZE3lS1DOj6YQ5wID
-AQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUcN/d5D5w
+AQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUsqNjmNmz
-ShTBxROnm42U5Nzsu6AwJQYIKwYBBQUHAQ4BAf8EFjAUAgEKMA8GCCsGAQUFBxUA
+g3dJD9IzRsaH3WuhEvcwJQYIKwYBBQUHAQ4BAf8EFjAUAgEKMA8GCCsGAQUFBxUA
-BANmb28wDQYJKoZIhvcNAQEFBQADgYEAEPvI05Tl68wluLnUuv5O5D2Tey7/41Oq
+BANmb28wDQYJKoZIhvcNAQEFBQADgYEAP58arK5WdV5h7pj56/LJlEnyx8xhiTUG
-NDSqe0Csm9ZCebRwqZynrGj40rFvz4pdL+o6nWBHlnylzCANMxzG9yvfd6HWOSbx
+Y49T9JULQOG4gsGyA1dhdxM2IZQpLboUR6NvWuiLJyC4LJPn+2EqjK0LrzXhG2VB
-jrMWnEj5P+/n3z/jnfIy43+kdfz2Y5gO5lX62Lj9PUWmnKfXEaiKShcjZ9z7uVdY
+1/kDMqgNmI5eikOV8KkwAkt5SrLqHQvmQ5rJPrHALhvkmL/Uh0TEwzgzeXF/IvjM
-pr/66HGCFnM=
+MUU7n22YsNY=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy10-child-child-test.key
+++ b/lib/hx509/data/proxy10-child-child-test.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALWfpaY3QVebZuvn
+MIICWwIBAAKBgQDRY94DoMXpcQWDorXSjSv5phbgFhfFRA4gflBNlcI1sHMJjYAu
-OfJpu9gdOAri7HRbI25C5Y+tdSlVX7K2qdbchfafFAI2LLxUlwY4PmNhETnwOsLX
+sRylG44O+LqpxRkO16WAZl3aENLs/Y8BWx+yJ/NaokM1XhAE1EP6X/RIvfcFCbhf
-2oGEDRJYXFh5iY/fytuosi7vUxuawbJB6GPKoEdvfhHv6666eU2KI+Gv56uBW0Ve
+7srgUhzBLcA0d9gCqaMO0fhWnd4c702GWG+HMKLdve/FZE3lS1DOj6YQ5wIDAQAB
-4Yj81W/9/Nk0sBic/kKzCXATDBxVAgMBAAECgYEArtV6kRGZreqjXa0dQ/RyZaxi
+AoGAc96ZutQ68MVUUdW2W/82+H1KZ1KScN0KHD0J3wUiZWdxITYmWrAzs8IdyHcn
-2V/uPGfLKIXvE6rnIJ3VXGSoA3QO5QPnL+XUlIpdQxh7PhEfkwVkm1FMPubN6N4I
+hE7HYQlAUl9TTBrHPdHKUuvEC2bZpUXFItXKUxAy+KwAl+ODhfm2H/M507/aA+jc
-TRM1YcdhCvbMisokU9EJJf0xbXexIw7KPF71k8R3P4ymXhxFlLXh7cdEDzTCBhDu
+1fBtpzEisVZV1Htp1A+YmSsbgEmXCV/I/pT6SS9FIflOs0ECQQD+ylFFSJzzr4xT
-oiTWt++oQXzcOKSsFFUCQQDlQfx0nZCZRCDB0kI08y1J+l+B2TczEC/r8Vee5is8
+c4G4Zb+EWrYYlrRq8Wru18LyqJxmlT5I1SxBRLgDmqJSGF8ibTtSAxt647Uw7Q1e
-LBhK+IxhDWJ5Q8asJ3VrpoK0YaScRgJH9X9/IvsjADNbAkEAys86Ko+cfLdPSpZO
+oYLFGTaxAkEA0mJeV88Qytm1ktQbikDRVqtcldDyONtQspXnjSBFV3jXY69jEsL8
-5MiCz/9jDa5RXThbdZ4n4PFgHdRMkV7Iv4/QouCY3NUI/jWwJLimMKJsfu9pjBqJ
+NZWTpD03lw7UNQdh0MieC7O9nr3YIxXFwJAduv9pOXwg/kS+Tx3dpbfHiqsxatJ
-qWhuDwJAX4YWFdUNSf9MEtZ0BbIJfdiX8Pe7+0fUX+AonSnUe/b3jE1x2IKGNHbc
+yISoEZTZZCN45JSSPrJo9onZja0WSFUhylLLlkrm/6PaxVxPmjSuccqD8QJAfoGI
-EiFC2L8BmP1SZFb7XlZZcHT35UaRHwJAb9QuZZOEnTxSy3TwEbUCdICE9OE+2iEe
+GWT5xACFnnTM2qV/O45vbebmwCmgrMJXKhVtnNudKOQdvvphA4BfBX9EvzDWuhPS
-RU+s+5r8/dW3Vp0mIoLBb15ay8HoUIv4EXeDo+Ob4a5Py8JCUBhWPwJANgSvGw6s
+bbOA1qPO74ehmPzKoQJAAN3YQmzAN24WzyDi3g86l5B9tf7jGHNtsmLTITG24O0o
-/ok+wgGxtolJAQswCPm6FQoL1s/r9zlDBdPa6U8k4q5wBFwWOVidVVK/KH2oJVZ2
+8opaBS6rqb9PaxCTHEBAMPy4vCkwQ1UUpWyi5rjvFA==
-asMn3h1UOyd8pQ==
+-----END RSA PRIVATE KEY-----
 -----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-----
-MIICVDCCAb2gAwIBAgIJAONwGxXRj9jOMA0GCSqGSIb3DQEBBQUAMDMxCzAJBgNV
+MIICVDCCAb2gAwIBAgIJAONwGxXRj9jPMA0GCSqGSIb3DQEBBQUAMDMxCzAJBgNV
 BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQxEDAOBgNVBAMMB3Byb3h5MTAwHhcN
-MDkwNDEzMjA0MjUzWhcNMTkwNDExMjA0MjUzWjBDMQswCQYDVQQGEwJTRTESMBAG
+MDkwNDEzMjE0ODAyWhcNMTkwNDExMjE0ODAyWjBDMQswCQYDVQQGEwJTRTESMBAG
 A1UEAwwJVGVzdCBjZXJ0MRAwDgYDVQQDDAdwcm94eTEwMQ4wDAYDVQQDDAVjaGls
-ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA8liV/jmhsA6RQStjhbeVf8MX
+ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuullDtJworBIXZLCB5nEvC8T
-WmMHUzVIvtSLu50g+hQwBWG0ZBJUuUTsSBHFpFJKHXS7hKPs5ZeC7NrtYZEd8F/6
+x9FvUt/C37TYjSHlpt4ScKl6ulH+9o9pmHylBlrGS3Yz/PLNl5NcJWglEd/XSDzR
-U6juEwYhIS60Fw0KFoUbVm/qSFvTJur+O5uYEtT3ls/BDEetRNDOxyPCBqmLZ1Ft
+87TM6TnU2GkIaoQCpg/gkf2EP24CRQQyHdKqj5px3ezYybzH+uiGuG6F01o4kPTz
-acCZnrhjI39ILAIlu6UCAwEAAaNgMF4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+5jNOtOL8l0iYedDzQncCAwEAAaNgMF4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0OBBYEFL0EkxvM9AMDSZM/3GNF2wQ0SOyZMCUGCCsGAQUFBwEOAQH/BBYw
+HQYDVR0OBBYEFC4u8d6XsLAukrR3kIqhR5ZrNH0HMCUGCCsGAQUFBwEOAQH/BBYw
-FAIBCjAPBggrBgEFBQcVAAQDZm9vMA0GCSqGSIb3DQEBBQUAA4GBAJwMPuG/Au15
+FAIBCjAPBggrBgEFBQcVAAQDZm9vMA0GCSqGSIb3DQEBBQUAA4GBAKMKN7CSoopg
-4HRh+JIdNUffikyZbdS47/C6UFm/YuHkjwzObk9rUPCRiNO+7emsKvXpjpm3r+qe
+RBm0Ybd8U0u49lXDyZnyOpuTI8OS6yBj9Ym/m9U+cJyvE6D9sVoBiFCW9nnR4eqB
-Yx4Qgejc27Gu6pbTc/RuOUM9a9an1zabtqR9Jd6Ln3NeEGUn7SMJu25GF6vJOE7P
+0SW3qiwe26FFAbliEjIk+N/+4mq0HC9YgquhoNtoTLltixCKom64UzaYkB1hdd1i
-cyRpnVpnRd00XXda6wt/jDORbIRm8dhi
+yipCRlPOYElZzf84QDWNEzRG6qVAU7hN
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy10-child-test.key
+++ b/lib/hx509/data/proxy10-child-test.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAPJYlf45obAOkUEr
+MIICXQIBAAKBgQC66WUO0nCisEhdksIHmcS8LxPH0W9S38LftNiNIeWm3hJwqXq6
-Y4W3lX/DF1pjB1M1SL7Ui7udIPoUMAVhtGQSVLlE7EgRxaRSSh10u4Sj7OWXguza
+Uf72j2mYfKUGWsZLdjP88s2Xk1wlaCUR39dIPNHztMzpOdTYaQhqhAKmD+CR/YQ/
-7WGRHfBf+lOo7hMGISEutBcNChaFG1Zv6khb0ybq/jubmBLU95bPwQxHrUTQzscj
+bgJFBDId0qqPmnHd7NjJvMf66Ia4boXTWjiQ9PPmM0604vyXSJh50PNCdwIDAQAB
-wgapi2dRbWnAmZ64YyN/SCwCJbulAgMBAAECgYEAqin7f9t1pYpFAc52fhCu31vc
+AoGBAIJ7YqApSpZYR/yC8k8KCqxwlPd+fp+1M76l6jMEQeTuzKK3vcSKb1pCna3k
-DPJV1V4nqx7Q0rZ8zjvYkB7PrCiW5tP3WI9qCHxjYBV0CamUkI13N9ptLcHYk27l
+/fNktV+CwiJIgjvZlI9Ml+xVflxtNSOZgFixxqgeGPZ1jUMm0xvr6WBt25d+zclb
-pKH3f2yUq4r/OkR+y+oawu+ZJ3FzQ1VN2vlDACHrJTmo5xgICSdzmXlLIJezvaC6
+HpW3E7DllVF0bTp7wK8hGI0Z0T8qGdjGmh9q13eOf/v3LBRRAkEA9N1JVvIHah05
-ZwDiCvzIjlZ2mkJkcw0CQQD+BghyHpK/I9JzYbgU7yba3RNSJjXljvAvpYeXNXHj
+FgMi6cOC0Qx4v1HOF4lV2Vai965dtkpmFyjFaCs698guBJyQ0dMA7qevseX8wiwM
-FYu9BHjnTMzxrEfV3/7ZtZGhpQ7jr7l5E8cdLxV1ztirAkEA9DtLIgDsCnY2Bw9W
+PZB8e8jCaQJBAMNpbCKqggEj8kSSlHQ0T+Fap7ihcci7hj5tyOKhAX9h5vFyF1tO
-xrLMDka2XzGZct/jkg4/9p9FQNbh/Blyz2Iojg8BHwbSAYMxLm2G1SRD0QMBfJFe
+acZ7AllZqrrx0GYhwq/s0V6lRsXC6/Djgd8CQFOQyZywkLM4Mek/PMUGgjiRxwuU
-6IRc7wJBALi/SoU1FyVMuFKST39qL6geAV9NywUZ4DXG/cZLaHjvwqHGDuiqQqPB
+AX+q0O+RT6CzkyvJDDpPIb/BMSiq2nmcbRgOqLzJ4X4W/UHPAoZoLvOXujECQE56
-2L0EHCXamAAoO5v8wbf9WmMvSzxTI+ECQGQFxIdwiTrfntDVX1yQ7TELlLT3wzhg
+eEMz1yI+HX4MoDJLEAmhLtqne9rx9Of9jz/1CXTvDKDLATZaN4DOxhK8QCT0GI3r
-qPqwC1IdeGdNmc99PJ/iO2myi2sBiBBGgmXZRVcVOxDmgj1Z69yeGNECQCCy5kWr
+4RRmN2+bUOD7d2Y2+GECQQCfiGuPvzBryDxdvfZs9kuvn7D4RgDmEskWEVdbhP9d
-LfUpc5kLru35n2w28KEWDxB77S5Pc34wADZBZTgmCO+oLNp0XVm8VaZWiqIJpfEl
+Y8LWrxPA4SZL3fFG7b0m3KPdsaAiwCRgvC5PAdhpsr6l
-Ck7YrRwSTMEWmm8=
+-----END RSA PRIVATE KEY-----
 -----END PRIVATE KEY-----
--- a/lib/hx509/data/proxy10-test.crt
+++ b/lib/hx509/data/proxy10-test.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICMjCCAZugAwIBAgIJAMJEvwnR1+2aMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
+MIICMjCCAZugAwIBAgIJAMJEvwnR1+2dMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
-BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjA0MjUzWhcNMTkw
+BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE0ODAyWhcNMTkw
-NDExMjA0MjUzWjAzMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MRAw
+NDExMjE0ODAyWjAzMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MRAw
-DgYDVQQDDAdwcm94eTEwMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5Ob/3
+DgYDVQQDDAdwcm94eTEwMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJdc5I
-2MTKRNK4ubVPXNLRRBl/GiqQ9udpT4n97dg64D2aAs5HM6KHtsxp9Aswu2DUbOvY
+Ynx3LIKW63t9dlbSVhPbLYx1vFg2k6eKG6q/3INLrtylxtp3mVxpYHVxT4EJMN5m
-cAv93ygxMA6FZ0MD1XXA8l6PYBmDbAsTXKc4rbyCRHA9YCjbdstNYRZ9NoubW/k1
+wr2CixY02vaqRSsnZmDUTSEfHInvtjjXxVYbIXyT34QWrM0pLD6Sgos0fJe3KMYD
-ACPJnnpXnyWCufm6xAkya/g3zzCw+d6tpJWHTQIDAQABo2AwXjAJBgNVHRMEAjAA
+ByiNMBh0IkpyTcqyeb8mCcRtClzUbcHr9NkzSwIDAQABo2AwXjAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUkHjcteTyhVCIm4fIMFIK/AYV8SgwJQYI
+MAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUGAKhYNPztzv9WZExtC6Oubgj0uMwJQYI
 KwYBBQUHAQ4BAf8EFjAUAgEKMA8GCCsGAQUFBxUABANmb28wDQYJKoZIhvcNAQEF
-BQADgYEAgcmmd0MRNnf7scQ9FM28MVpUVQ+ZRWEvgvEIDrSmaWVY3NFj7xhUZbIl
+BQADgYEAA+B+xr7ARPUG9xmKRQ2wrJnXAcEV6ndslXcvJS7pdkTcnGp6Yo5oNTQ8
-YNeVcOhvmjRILvptzg9gazmRNZLkm/1ZUSvt52RSP3ubqoa6qdcAsBhOjCsAbJtt
+GmqFE1PE/IE0Njpz6wTT3xISKKr5NLgtFcMpnGFoZ6AQ1jQgxynVlQOx/Tch+fMd
-X490FFGmpeOfAao+e7UhbLXPdAUo32LvyFtSkO3TXjp0a5x5vu4=
+aijOuz8t0LTpSndhAl8BlJ+poLN2sYMkvUhue/t7A0IrYIkKDsA=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/proxy10-test.key
+++ b/lib/hx509/data/proxy10-test.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALk5v/fYxMpE0ri5
+MIICXQIBAAKBgQDJdc5IYnx3LIKW63t9dlbSVhPbLYx1vFg2k6eKG6q/3INLrtyl
-tU9c0tFEGX8aKpD252lPif3t2DrgPZoCzkczooe2zGn0CzC7YNRs69hwC/3fKDEw
+xtp3mVxpYHVxT4EJMN5mwr2CixY02vaqRSsnZmDUTSEfHInvtjjXxVYbIXyT34QW
-DoVnQwPVdcDyXo9gGYNsCxNcpzitvIJEcD1gKNt2y01hFn02i5tb+TUAI8meelef
+rM0pLD6Sgos0fJe3KMYDByiNMBh0IkpyTcqyeb8mCcRtClzUbcHr9NkzSwIDAQAB
-JYK5+brECTJr+DfPMLD53q2klYdNAgMBAAECgYBkN4XRUNyw3+nvfrNF3GBIT4NI
+AoGAIyqdR6VpdKQgZ5fThqMRpMXB0ZCx5BtsippbtI//zl3/zUZI3edIW3g52Wst
-DN1JD/4HMbzkwkKDIH7UDH6Vca+XpGUXUq6XUFrEtKYqtf0XAB3b9zd0IHnV9n+o
+FQp7y87sA6Qa0J7W0YMna7GHRpnEc5pgFv8amiJhIM+uxcjQOByXLfmOO5i4g78R
-mwxkV8W2fzn5uSGoBEz7LZDE+AlwVj+UfsGB2hR3riJROL0/5Yh5BUKaTtfk1k5P
+1HGbT7VfEJNjDszVbFH49XQQGNgrlS3oFw+wtlBYB09s3gECQQD5plvCIsGwIzTC
-11Lcc18/8mPMyKMgYQJBAN6WVj/NJSQU9NqU3ddnIn0sC+N+8TN4ctU+vyA/ljOQ
+73JrAUTER5zDAGgEHNWLn1TJ2MGPBXBBXv4Hlj1TZJIM/EYsz0sulIpH2710wMOJ
-3TqeGR0k6moPM6eQ7Vf4Nz1ZNzrXeToUyTafUuq1NuUCQQDVB6pTdtReYfoGd2wd
+eQFvYUubAkEAzpWmwbD/RsVnmBeOgnEAFdJ7qIZPZ0CAlcntWbDwKnGqbJ8ZWhMo
-SQfb7ctFI+cz2u/MfBFlHjLmX4IqyOM/nM2rfvuytUURl605oanm2tEmTCT5HWKI
+etzaZhrOY3QiAas0bdSGPEiCAmW/CA9qEQJAeQtQMjDn+J8ZVesDbx6OWRzfxSzN
-12BJAkEAuxTqmydmfyQqBIm4x3IE1+Yse+JXAmbLRZY+d/FZ4i9w8fKtswQzDj+G
+QjE42RnH4pZWQyI/63JDeSo/Uc/RgLpQzCk2Kr+azHyev503MdCaAYcLQQJBAIQ1
-r+Esy5Jxg1u4AvnWB04vLHzO6Ty0TQJAJk0Ng5oezqVg9Z6tEorZ3eHgJRsya3FW
+dhFDizvpnhDSEpwcYWeV2xnRSwPTXfd+0W2zNSCUufLmJz1kQWXP7d2mjitL6W+T
-ofZAjmSilCbh2V1q9jn0BHx9NoE+3M3feDgnuvjml7MjBqMQ3zeR+QJAVo2zzjql
+9+vKNVZjOQD7yLQJ2WECQQC/ClIgX9Npa4cO/3ttODswubwY0mZU25otW0TKYu7z
-p15qAsqgsSTOgKII8hW58GaUN71vS2qv82c+AS+p3vzFKCyCiHZuYej6SZqP+TUr
+5g37JWUv1AwFzPmisWz7v+aJkJY7Tp1aGMZy8y+9r0hF
-VMvTov6kyrhehQ==
+-----END RSA PRIVATE KEY-----
 -----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 20:42:52 2009 GMT
+            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 20:42:52 2019 GMT
+            Not After : Apr 11 21:48:01 2019 GMT
        Subject: C=SE, CN=Revoke cert
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+            RSA Public Key: (1024 bit)
-                Modulus:
+                Modulus (1024 bit):
-                    00:d3:0c:e5:df:be:5f:59:40:dc:96:38:fd:7d:ac:
+                    00:b1:c4:3b:0a:bb:c6:09:cc:70:17:ad:40:fa:81:
-                    84:89:38:8a:4f:d3:60:c9:db:64:28:ee:9f:a0:fe:
+                    3f:a6:10:74:14:d7:72:e8:99:03:49:c4:bb:f2:0a:
-                    6f:c7:6e:9b:dc:68:b4:7c:56:fa:ed:fe:6b:01:6c:
+                    94:da:f5:42:7c:33:6a:f6:d4:fb:ce:64:cd:9b:08:
-                    a0:4d:cd:7b:b5:88:64:87:35:9b:70:57:01:b7:04:
+                    f5:76:4f:ee:24:7e:58:c4:b4:4a:e9:8f:6c:b2:8c:
-                    18:d8:ef:d2:06:38:f5:2b:aa:f9:7a:11:f9:95:27:
+                    82:42:06:3e:c6:a3:bc:fb:96:3f:7f:ce:cb:15:79:
-                    36:ce:8d:f2:3a:5c:d8:08:64:9d:d7:d4:9a:4f:ea:
+                    46:38:35:df:0c:2b:28:f3:1c:83:4f:0e:84:16:ea:
-                    39:45:b4:3b:c5:ae:4a:f6:ae:ca:5e:85:dc:72:e0:
+                    20:07:c6:bc:29:98:33:d8:a9:09:3b:18:33:4a:6e:
-                    43:68:01:2f:fd:6f:4a:e5:bc:62:c7:72:61:30:92:
+                    8e:6c:bd:86:f4:35:97:30:ae:fe:6f:2e:dd:c3:4b:
-                    57:12:85:4b:47:92:96:51:91
+                    a7:9a:d8:32:41:c9:e3:46:55
                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: 
-                B2:82:8E:8E:74:BE:30:A7:24:AC:84:C9:A6:35:6C:9E:56:56:CD:61
+                6E:3C:ED:E9:4B:20:CE:50:64:4E:30:0A:3D:33:35:13:0E:B5:7E:A0
    Signature Algorithm: sha1WithRSAEncryption
-        4c:2c:77:82:5f:79:77:66:77:39:20:44:48:ab:ed:19:db:73:
+        10:5a:65:89:e9:2b:3e:44:ad:8f:73:d3:f0:a1:e1:15:0e:c5:
-        c4:ba:0b:33:fa:70:e5:1c:df:4d:9a:40:99:05:2c:e0:6b:1a:
+        b9:27:5f:e7:9c:b4:73:10:ad:e9:9c:e3:7a:bd:f3:2a:bd:0c:
-        b0:fd:72:f0:36:da:c4:cd:b3:bb:19:8b:4e:9f:4f:2d:72:3f:
+        c9:d6:c3:39:41:f9:16:ce:eb:61:77:3a:9d:f7:a0:20:ef:89:
-        83:0e:9d:37:2c:2e:c9:67:fb:99:37:40:4b:ac:57:a7:72:42:
+        a5:50:3e:01:df:1a:86:80:3e:f2:5f:d2:b3:10:5e:1f:28:b6:
-        35:71:5b:4e:19:97:92:b4:36:71:53:c9:e1:3e:71:68:f3:18:
+        3f:d8:34:41:0c:bd:cb:fe:d9:63:46:4e:5a:23:d6:3c:83:eb:
-        5d:1a:ac:50:21:06:2c:a3:e6:10:2a:73:73:a5:60:49:c9:ff:
+        6d:22:25:bc:09:20:b8:1f:08:b9:f9:9a:a4:e5:1d:39:b4:79:
-        4b:f6:85:6a:b6:75:cf:f8:5f:43:04:eb:df:eb:5d:10:c1:42:
+        89:e5:c6:34:26:2b:9a:2e:cf:3d:66:d3:c8:ee:bf:f4:8e:03:
-        12:15
+        bf:d1
 -----BEGIN CERTIFICATE-----
 MIIB/DCCAWWgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIwNDI1MlowIzELMAkGA1UEBhMCU0UxFDASBgNVBAMMC1Jldm9rZSBjZXJ0
+MDQxMTIxNDgwMVowIzELMAkGA1UEBhMCU0UxFDASBgNVBAMMC1Jldm9rZSBjZXJ0
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTDOXfvl9ZQNyWOP19rISJOIpP
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxxDsKu8YJzHAXrUD6gT+mEHQU
-02DJ22Qo7p+g/m/HbpvcaLR8Vvrt/msBbKBNzXu1iGSHNZtwVwG3BBjY79IGOPUr
+13LomQNJxLvyCpTa9UJ8M2r21PvOZM2bCPV2T+4kfljEtErpj2yyjIJCBj7Go7z7
-qvl6EfmVJzbOjfI6XNgIZJ3X1JpP6jlFtDvFrkr2rspehdxy4ENoAS/9b0rlvGLH
+lj9/zssVeUY4Nd8MKyjzHINPDoQW6iAHxrwpmDPYqQk7GDNKbo5svYb0NZcwrv5v
-cmEwklcShUtHkpZRkQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
+Lt3DS6ea2DJByeNGVQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
-BgNVHQ4EFgQUsoKOjnS+MKckrITJpjVsnlZWzWEwDQYJKoZIhvcNAQEFBQADgYEA
+BgNVHQ4EFgQUbjzt6UsgzlBkTjAKPTM1Ew61fqAwDQYJKoZIhvcNAQEFBQADgYEA
-TCx3gl95d2Z3OSBESKvtGdtzxLoLM/pw5RzfTZpAmQUs4GsasP1y8DbaxM2zuxmL
+EFpliekrPkStj3PT8KHhFQ7FuSdf55y0cxCt6Zzjer3zKr0MydbDOUH5Fs7rYXc6
-Tp9PLXI/gw6dNywuyWf7mTdAS6xXp3JCNXFbThmXkrQ2cVPJ4T5xaPMYXRqsUCEG
+nfegIO+JpVA+Ad8ahoA+8l/SsxBeHyi2P9g0QQy9y/7ZY0ZOWiPWPIPrbSIlvAkg
-LKPmECpzc6VgScn/S/aFarZ1z/hfQwTr3+tdEMFCEhU=
+uB8IufmapOUdObR5ieXGNCYrmi7PPWbTyO6/9I4Dv9E=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/revoke.key
+++ b/lib/hx509/data/revoke.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANMM5d++X1lA3JY4
+MIICWwIBAAKBgQCxxDsKu8YJzHAXrUD6gT+mEHQU13LomQNJxLvyCpTa9UJ8M2r2
-/X2shIk4ik/TYMnbZCjun6D+b8dum9xotHxW+u3+awFsoE3Ne7WIZIc1m3BXAbcE
+1PvOZM2bCPV2T+4kfljEtErpj2yyjIJCBj7Go7z7lj9/zssVeUY4Nd8MKyjzHINP
-GNjv0gY49Suq+XoR+ZUnNs6N8jpc2AhkndfUmk/qOUW0O8WuSvauyl6F3HLgQ2gB
+DoQW6iAHxrwpmDPYqQk7GDNKbo5svYb0NZcwrv5vLt3DS6ea2DJByeNGVQIDAQAB
-L/1vSuW8YsdyYTCSVxKFS0eSllGRAgMBAAECgYArjGbGg07DaPnbWYkc7IMwmWUY
+An9mxQtdKTFUeNxU09S8/fvOBbUWV3gXAF7mRtZhF7z22NOW+iLckEUDDUPQXV2L
-0aIQJOAG/i4cF0RTX4Rzt3s+iOggQbYsxhBR3YugSrOLnskjJiDpdcP2x42LcS+R
+CKqkbmbjUVf9ru0oTBMCGJoxRYMF+UUPyCV/2EZFZAOJ5RfpCHAbOO7PfIZarj6K
-sjXAqhD4V03BfBl5jg9T2oh9y4d2SyP0UsVATvzHaPYhnqEK4rRExAm7wHVt1WdU
+D13HS4P8fxMQiSq3hqVU2GYW+i/n4QGTYIPVqRae8lKBAkEA4BL0YfKTpGsS5NA/
-G9pr0cTNr9dnd4axUQJBAO9mpeWTA4/1/yhxWju5+YegbucmNkrhFia6Zjw5b6MR
+dPGbljkthRfUqlan1d0BtomLhE77SPyhX25DhW9B6VTZu5D7klRjr3/Djo9qBKE9
-SInjgrEK2K9qJ2iFrX/hzztanDVOKw8UhYIWBM8iniUCQQDhrwdf+tz23Hx9h44R
+xrVYeQJBAMsYOIbSDPDvF1oKhyutj9/zkXskUXci/6a1diPrUXF2cPzyKv+VWpyd
-1k/yyge+xZAB/EgVMiNSWFY6iBCWuM7n+6gXO4NDtrdBYIaTtqTAWUeTyypG06rJ
+AB3yWaCLgkyeI5l3KJbiM/t7xa6FXb0CQQCmNOkZDjn9p36oQuAO+ngSAe+F3Ztd
-/7v9AkAcDtrIsldLixhRpB9gOqa9N5dn7fmVAxZ2iYgr7MthwEfRKWIK3+uPe5CM
+jlGIDRsMLxJR3dP+24VHqB5lh5U4YjvvKSex7u7Sas6/nBljvcZ48mLhAkEAiCX+
-1oYEI/IG0dLXCIdRaCVRnsUHhdYlAkBbDIolJshOr9Vpr26Zs6S9htRpGrtmkalj
+jvL1VfcSMnxoTTGXB8zitCiOrE08EOgJAN9Zw7Rg3lEB3kCjc+YUE/9JckTT3sUM
-I78sUYc4RfyrUhPnc5f1B4WFpAl6zr58iYseLua5sZV0zaBxrkLhAkEA4UtIiu7u
+nG6zOSL/MhGxXeNuCQJAW/6AqwhOHIDevBqiDWNTPnM0FkQMkDM9rdN4JWyARJ5b
-KS07l0dr8sU1FShNzjz+k+gQoCrfQOy0/kjva2jxkhZ67munq2lcpYOmsRf34m7B
+mNcdiUjyg/akjumwT4cma9PRKX3HW3S9293oJ9twhw==
-2uoNaQc0Bb3bFg==
+-----END RSA PRIVATE KEY-----
 -----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: 7 (0x7)
+        Serial Number: 10 (0xa)
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: CN=hx509 Test Root CA, C=SE
        Validity
-            Not Before: Apr 13 20:42:53 2009 GMT
+            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 20:42:53 2019 GMT
+            Not After : Apr 11 21:48:01 2019 GMT
        Subject: C=SE, CN=Sub CA
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+            RSA Public Key: (1024 bit)
-                Modulus:
+                Modulus (1024 bit):
-                    00:b6:3f:43:2b:f6:52:05:d9:ae:43:d5:4a:fa:1b:
+                    00:e3:6d:42:f0:72:93:2a:b5:ea:6b:f3:80:ac:50:
-                    a4:4d:13:72:80:2e:c8:6c:c6:2d:8e:f0:fc:7e:19:
+                    8f:ed:ae:bd:1c:76:3b:d7:50:61:d9:a1:32:2f:57:
-                    8e:44:ca:2a:b9:ba:c4:ff:f7:e2:79:75:22:38:13:
+                    01:7a:2d:9c:d4:c9:ab:91:ee:91:1b:cb:59:1d:6e:
-                    e1:24:2f:a0:d3:f3:2b:2b:7d:a1:45:2f:7b:3a:10:
+                    01:af:de:24:8d:00:26:15:31:52:be:11:16:a5:8a:
-                    d1:5a:ac:1e:5e:5f:17:c6:93:5f:83:30:33:20:6a:
+                    59:4b:9d:b8:49:a9:2a:ae:9a:56:6d:0f:9f:21:4b:
-                    71:1b:6a:16:43:00:2a:23:fa:ee:3e:71:45:1a:25:
+                    6a:11:61:e2:d8:72:b2:b7:da:2d:e6:36:b3:90:82:
-                    90:68:57:e8:7a:48:ac:62:b4:46:63:37:c4:e4:b7:
+                    4f:e3:24:36:96:0b:49:5c:48:6b:e2:f9:ff:40:24:
-                    3e:df:c0:75:e4:c2:26:50:d5:fd:9c:ca:f3:e9:b4:
+                    ea:d8:3e:da:a3:72:1a:82:ac:0d:1d:a6:a0:0f:54:
-                    0d:75:8c:8b:8c:d3:df:a8:4b
+                    e1:18:dc:e9:3e:11:c5:ae:9b
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Subject Key Identifier: 
-                8F:59:F3:CC:CE:26:7C:B9:19:91:34:E4:6B:84:4B:BC:B2:A0:08:5C
+                10:89:0B:17:61:CE:7E:63:8C:11:68:8F:FF:D5:C0:39:13:2C:BF:C3
            X509v3 Authority Key Identifier: 
-                keyid:7B:1C:08:A4:93:DE:A6:34:F8:58:FF:29:5A:97:2C:07:C6:12:3A:FB
+                keyid:51:3C:E4:A7:30:14:8C:55:74:95:1C:58:6A:F2:C6:05:6A:A7:E3:F1
                DirName:/CN=hx509 Test Root CA/C=SE
-                serial:9A:CA:AE:19:28:5A:47:C1
+                serial:9E:4F:9F:99:2B:2A:BA:7D
            X509v3 Basic Constraints: 
                CA:TRUE
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation, Key Encipherment, Certificate Sign, CRL Sign
    Signature Algorithm: sha1WithRSAEncryption
-        0e:88:f4:2b:8d:41:1c:1c:22:da:95:12:a7:94:d9:64:57:54:
+        5b:fa:55:63:b4:03:5c:a0:24:33:da:b3:01:05:87:2f:7c:27:
-        2f:f6:60:c7:a9:40:10:06:e8:8a:3c:b9:df:a2:61:c6:84:62:
+        32:85:43:df:b5:18:3f:85:4d:cc:31:d7:10:28:08:f3:40:9d:
-        ac:50:01:e8:f3:06:93:d5:a3:51:42:9e:5e:34:33:7e:44:d9:
+        c1:af:29:32:0b:bd:f1:18:e5:d3:f7:21:df:40:9e:07:ae:5f:
-        2c:16:47:63:9e:74:30:3a:4a:15:62:0f:46:26:27:8c:cc:47:
+        e4:b2:09:e4:a8:ec:35:f5:d3:a0:59:3a:ab:a2:6f:1c:ce:74:
-        71:34:0d:de:d0:58:d4:c1:b7:b6:b3:fc:8f:0e:04:2d:db:35:
+        01:55:74:45:83:08:cd:05:56:cd:a5:63:21:d4:fc:18:47:17:
-        f0:57:3a:d5:2a:cd:34:fb:20:17:9c:58:51:3c:fb:43:ef:2e:
+        f9:fb:8b:1c:71:2d:be:6e:53:a1:92:0c:f4:f4:54:49:77:38:
-        7b:f3:02:99:fd:cf:45:25:f3:a6:e9:e8:7a:94:f1:ba:07:9c:
+        88:68:18:28:dd:3b:7c:b7:ed:34:74:1b:34:af:2d:25:f9:ca:
-        90:c7
+        d2:bc
 -----BEGIN CERTIFICATE-----
-MIICWDCCAcGgAwIBAgIBBzANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
+MIICWDCCAcGgAwIBAgIBCjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1M1oXDTE5
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIwNDI1M1owHjELMAkGA1UEBhMCU0UxDzANBgNVBAMMBlN1YiBDQTCBnzAN
+MDQxMTIxNDgwMVowHjELMAkGA1UEBhMCU0UxDzANBgNVBAMMBlN1YiBDQTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtj9DK/ZSBdmuQ9VK+hukTRNygC7IbMYt
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA421C8HKTKrXqa/OArFCP7a69HHY711Bh
-jvD8fhmORMoqubrE//fieXUiOBPhJC+g0/MrK32hRS97OhDRWqweXl8XxpNfgzAz
+2aEyL1cBei2c1Mmrke6RG8tZHW4Br94kjQAmFTFSvhEWpYpZS524SakqrppWbQ+f
-IGpxG2oWQwAqI/ruPnFFGiWQaFfoekisYrRGYzfE5Lc+38B15MImUNX9nMrz6bQN
+IUtqEWHi2HKyt9ot5jazkIJP4yQ2lgtJXEhr4vn/QCTq2D7ao3IagqwNHaagD1Th
-dYyLjNPfqEsCAwEAAaOBmTCBljAdBgNVHQ4EFgQUj1nzzM4mfLkZkTTka4RLvLKg
+GNzpPhHFrpsCAwEAAaOBmTCBljAdBgNVHQ4EFgQUEIkLF2HOfmOMEWiP/9XAORMs
-CFwwWgYDVR0jBFMwUYAUexwIpJPepjT4WP8pWpcsB8YSOvuhLqQsMCoxGzAZBgNV
+v8MwWgYDVR0jBFMwUYAUUTzkpzAUjFV0lRxYavLGBWqn4/GhLqQsMCoxGzAZBgNV
-BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0WCCQCayq4ZKFpHwTAM
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0WCCQCeT5+ZKyq6fTAM
-BgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB5jANBgkqhkiG9w0BAQUFAAOBgQAOiPQr
+BgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB5jANBgkqhkiG9w0BAQUFAAOBgQBb+lVj
-jUEcHCLalRKnlNlkV1Qv9mDHqUAQBuiKPLnfomHGhGKsUAHo8waT1aNRQp5eNDN+
+tANcoCQz2rMBBYcvfCcyhUPftRg/hU3MMdcQKAjzQJ3BrykyC73xGOXT9yHfQJ4H
-RNksFkdjnnQwOkoVYg9GJieMzEdxNA3e0FjUwbe2s/yPDgQt2zXwVzrVKs00+yAX
+rl/ksgnkqOw19dOgWTqrom8cznQBVXRFgwjNBVbNpWMh1PwYRxf5+4sccS2+blOh
-nFhRPPtD7y578wKZ/c9FJfOm6eh6lPG6B5yQxw==
+kgz09FRJdziIaBgo3Tt8t+00dBs0ry0l+crSvA==
 -----END CERTIFICATE-----
--- a/lib/hx509/data/sub-ca.key
+++ b/lib/hx509/data/sub-ca.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALY/Qyv2UgXZrkPV
+MIICXAIBAAKBgQDjbULwcpMqtepr84CsUI/trr0cdjvXUGHZoTIvVwF6LZzUyauR
-SvobpE0TcoAuyGzGLY7w/H4ZjkTKKrm6xP/34nl1IjgT4SQvoNPzKyt9oUUvezoQ
+7pEby1kdbgGv3iSNACYVMVK+ERalillLnbhJqSqumlZtD58hS2oRYeLYcrK32i3m
-0VqsHl5fF8aTX4MwMyBqcRtqFkMAKiP67j5xRRolkGhX6HpIrGK0RmM3xOS3Pt/A
+NrOQgk/jJDaWC0lcSGvi+f9AJOrYPtqjchqCrA0dpqAPVOEY3Ok+EcWumwIDAQAB
-deTCJlDV/ZzK8+m0DXWMi4zT36hLAgMBAAECgYEAhfgbOMXppcNPBy5T32dScBZL
+AoGAcDAw6j4K3PHaTyBSpC4loeEmBslIYcGUU3ASOooX/3ZKvCkzyow95tEcB8mB
-pU6+prdH5jvgYBIJMygqID3bcw6VvRMOBIsYhbE9WJD4uw+u7VzqCNU0EKNV7muG
+aYkSzL97Cc9H+tyhKE4kGIoYIse1D1ANUTKxdbzf62QQbSVgmKutBHEOrRoB2/97
-4MH5f/tw0Pv15DCRwwHFquVaK5saMJHHTQKiUCXHSjvTG3Gvnw5NwbIl4RQ/+q1n
+sE7APe6tyvOVqZleCjb/8NgzbzsZtH6mQmSQZj/SsQvmDSECQQD/CF7b8oZ5VYGJ
-Riyy8JL0J4VV7Bhz3QECQQDki68Y+96Wop9vc9ZYBtyL0NAJwZOHfvfxPklLqAgZ
+GZUn5iDiT1RfIezZjE+gvttxinxv2HipzJ1s8ySTWBCqRB1AhuSHX6zOP3GV6cg9
-jw9uECCwRGIznnuFrN23B4xrltvQN+RPFDbUIp7pYsvjAkEAzCPKOz+rHsn/VvI3
+UVUd6pnRAkEA5EoWHohhMskL6pdOl4HTqyvCmLheY3y9wn6KRdFj624gyI2hyqYn
-WQWEydWlrJ7C8j7NX89dUN4lc5o40OVzZCjDe0+0vt5ZzPa6T91BQYJOT8cyV3+1
+iIyNDcfdu4YtLi4pH6+szvqmb3TvQk3wqwJAJh3XJ6JozMulz5reOxdfBNP8dTd5
-IVOueQJAVQw2CJIR7vRtaEgvB2rmP5FhGYBTqiRxl/CZzfGlsf0uvMJ7p5yK/rKH
+0c3xvMGpxJ+BF6pP5njpcnYomkkIPJpvkMxYbY80IaND07ccMWXthcohcQJBAN9u
-PONrTmUcuBzXh9CEwXjAPojzod4GCQJBAMQhps1iEJDWVqM8uHypVrlssW62YmrI
+G0P62pan6n/JYuQp7o6jH6v1FnxshBStYIuAqjir6m4fIHCEOkEMvqj0KnH0mpeO
-eB2TZ/6oUKdPB0N9EG6s05QIMoonq3PHoZ3V4DqGbaMsqWtz4Z0Rf1ECQQCSoq08
+GjWm7I0PCIIhgmH0gk0CQAamGhuYqbpoAJDWep/F/x3AXz6FqqBN1o+5N77d6XcJ
-7rF56RErF8p8H1bM2UoIesPZvbe5Cop5KBWY5efWxKlIANdCrl1G42UScdzYf8+p
+RIU9tIRgcyecm0CFEtHcjzlQ1V4f2GXuoTkZn7o0ZjE=
-Aj6codFd46RRTmbQ
+-----END RSA PRIVATE KEY-----
 -----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: 8 (0x8)
+        Serial Number: 11 (0xb)
        Signature Algorithm: sha1WithRSAEncryption
        Issuer: C=SE, CN=Sub CA
        Validity
-            Not Before: Apr 13 20:42:53 2009 GMT
+            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 20:42:53 2019 GMT
+            Not After : Apr 11 21:48:01 2019 GMT
        Subject: C=SE, CN=Test sub cert
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+            RSA Public Key: (1024 bit)
-                Modulus:
+                Modulus (1024 bit):
-                    00:f6:d8:4a:e9:a3:4f:37:8a:fa:8a:ea:f8:48:05:
+                    00:ab:c3:df:fd:78:b0:14:50:bf:50:a4:83:b4:cc:
-                    2e:1f:58:e8:60:0b:80:54:8e:8c:7e:79:06:48:0f:
+                    45:bc:0e:94:e7:1c:50:d3:08:54:e8:55:2f:ee:f9:
-                    1b:9f:d2:45:42:2e:1f:6b:ff:c3:a2:23:58:0a:3d:
+                    b5:0a:d7:d5:2d:a8:c0:6f:6a:d7:9b:b5:86:fc:58:
-                    82:25:26:5a:a0:69:ca:d2:46:df:36:fe:07:a0:a6:
+                    c9:26:af:c5:f4:ca:85:b7:02:d0:d6:e1:ae:40:1c:
-                    ef:ae:48:73:c1:c2:fb:c5:89:b0:f8:ae:4d:5a:19:
+                    3b:f5:6a:52:77:28:69:d1:9d:2e:55:9a:9d:d1:f6:
-                    46:c6:9f:0c:de:22:fd:43:ae:eb:d2:00:6c:30:c2:
+                    02:09:c8:b8:b7:cf:91:27:1d:7d:7f:43:1c:8c:26:
-                    67:83:2a:87:25:cf:22:e6:8f:c2:f3:70:6d:74:38:
+                    da:25:40:a2:01:17:30:b9:63:bf:7f:16:17:27:7d:
-                    1e:a8:cc:5a:c4:4b:b8:e5:98:bb:67:0d:c7:c6:55:
+                    0f:d2:be:a9:5c:4a:ef:9b:69:96:47:57:2c:c2:7b:
-                    2e:16:6a:ca:e0:f6:a1:d2:b9
+                    96:e6:f6:5e:52:0c:7f:6e:b9
                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:D8:B2:78:92:7A:B4:DA:B4:82:EE:28:CD:A3:4E:AE:AF:B3:7C:FA
+                D1:60:4E:5F:2C:FE:F4:DE:29:DB:F2:5E:BC:2C:B2:DF:73:58:84:42
    Signature Algorithm: sha1WithRSAEncryption
-        6f:aa:bc:02:1f:49:dc:9b:06:3a:98:5b:a1:be:6f:32:7f:02:
+        65:4b:14:a0:36:3d:41:8c:2b:e0:b8:f8:b6:d8:50:43:3c:31:
-        19:0f:e6:b4:5d:2c:f8:d1:a1:f5:9a:ba:b8:61:79:05:26:01:
+        97:17:71:15:93:ef:8a:bb:6d:73:40:9f:37:db:51:56:68:9f:
-        72:46:30:14:1f:85:a7:1d:11:c5:b8:59:ff:23:1f:2e:1d:9c:
+        ce:88:ea:89:0e:f0:31:c0:11:f8:85:43:54:76:3e:41:7e:46:
-        c8:99:12:8d:6e:f7:19:ac:53:47:d1:34:85:d3:03:ea:04:50:
+        99:1b:05:8a:ce:79:05:65:b2:bf:4c:c4:12:ac:dd:34:69:c6:
-        7b:b6:04:b9:73:cd:3e:e5:b4:10:c1:bb:f9:a7:70:92:96:d5:
+        f7:31:02:db:8f:a3:ed:ac:4d:fc:a8:b1:ca:be:5e:65:2e:12:
-        95:f3:31:8b:0a:fb:8d:63:82:9e:c6:4c:2a:b5:56:f5:0b:24:
+        91:8b:c3:b1:05:b9:2a:b6:04:30:f9:57:cd:01:0d:db:a9:b1:
-        c8:26:52:c8:83:78:42:b6:9d:34:74:bc:7e:c1:72:98:8d:01:
+        cc:3b:2a:0a:53:9c:2f:3a:0c:a3:36:d5:7b:5e:8a:cb:be:75:
-        b6:a9
+        70:af
 -----BEGIN CERTIFICATE-----
-MIIB8jCCAVugAwIBAgIBCDANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJTRTEP
+MIIB8jCCAVugAwIBAgIBCzANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJTRTEP
-MA0GA1UEAwwGU3ViIENBMB4XDTA5MDQxMzIwNDI1M1oXDTE5MDQxMTIwNDI1M1ow
+MA0GA1UEAwwGU3ViIENBMB4XDTA5MDQxMzIxNDgwMVoXDTE5MDQxMTIxNDgwMVow
 JTELMAkGA1UEBhMCU0UxFjAUBgNVBAMMDVRlc3Qgc3ViIGNlcnQwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAPbYSumjTzeK+orq+EgFLh9Y6GALgFSOjH55BkgP
+hvcNAQEBBQADgY0AMIGJAoGBAKvD3/14sBRQv1Ckg7TMRbwOlOccUNMIVOhVL+75
-G5/SRUIuH2v/w6IjWAo9giUmWqBpytJG3zb+B6Cm765Ic8HC+8WJsPiuTVoZRsaf
+tQrX1S2owG9q15u1hvxYySavxfTKhbcC0NbhrkAcO/VqUncoadGdLlWandH2AgnI
-DN4i/UOu69IAbDDCZ4MqhyXPIuaPwvNwbXQ4HqjMWsRLuOWYu2cNx8ZVLhZqyuD2
+uLfPkScdfX9DHIwm2iVAogEXMLljv38WFyd9D9K+qVxK75tplkdXLMJ7lub2XlIM
-odK5AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTR
+f265AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTR
-2LJ4knq02rSC7ijNo06ur7N8+jANBgkqhkiG9w0BAQUFAAOBgQBvqrwCH0ncmwY6
+YE5fLP703inb8l68LLLfc1iEQjANBgkqhkiG9w0BAQUFAAOBgQBlSxSgNj1BjCvg
-mFuhvm8yfwIZD+a0XSz40aH1mrq4YXkFJgFyRjAUH4WnHRHFuFn/Ix8uHZzImRKN
+uPi22FBDPDGXF3EVk++Ku21zQJ8321FWaJ/OiOqJDvAxwBH4hUNUdj5BfkaZGwWK
-bvcZrFNH0TSF0wPqBFB7tgS5c80+5bQQwbv5p3CSltWV8zGLCvuNY4KexkwqtVb1
+znkFZbK/TMQSrN00acb3MQLbj6PtrE38qLHKvl5lLhKRi8OxBbkqtgQw+VfNAQ3b
-CyTIJlLIg3hCtp00dLx+wXKYjQG2qQ==
+qbHMOyoKU5wvOgyjNtV7XorLvnVwrw==
 -----END CERTIFICATE-----
--- a/lib/hx509/data/sub-cert.key
+++ b/lib/hx509/data/sub-cert.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAPbYSumjTzeK+orq
+MIICXQIBAAKBgQCrw9/9eLAUUL9QpIO0zEW8DpTnHFDTCFToVS/u+bUK19UtqMBv
-+EgFLh9Y6GALgFSOjH55BkgPG5/SRUIuH2v/w6IjWAo9giUmWqBpytJG3zb+B6Cm
+atebtYb8WMkmr8X0yoW3AtDW4a5AHDv1alJ3KGnRnS5Vmp3R9gIJyLi3z5EnHX1/
-765Ic8HC+8WJsPiuTVoZRsafDN4i/UOu69IAbDDCZ4MqhyXPIuaPwvNwbXQ4HqjM
+QxyMJtolQKIBFzC5Y79/FhcnfQ/SvqlcSu+baZZHVyzCe5bm9l5SDH9uuQIDAQAB
-WsRLuOWYu2cNx8ZVLhZqyuD2odK5AgMBAAECgYBCHfkiz31ecTlekEVkdQ6/kr7b
+AoGAeN4T74SOuyz7A19RAte/to64P00Qnv+85+SSH2L9/8xTSZb3GzAe2oZJn6dG
-SvlarLvw/FW0Y2eQzW+DpHsCIIW0HidsxsDfVoCbyvpqjFUpk61TWKOGWR231+fe
+nP+RmCkvINJNbPhQKvLzSkXwEpvCd7hU+v5uAd906Wu8af7a1W9JaJH2mSbWhRhL
-mcn1oDltdYl1apU/iyhsrctZuBVJW9pe7hos4MvU1ZrZJzyF8jnMy1RpQD7A0WQf
+/aa5gRY8buNy4IH0uGiv1Yti7GHTBLMsZGxZPKLL5gpz80UCQQDgeyq0wu0EhvX1
-9QEZ7Itjg9zy+OTpAQJBAP3/fVfYHsF3YB5CAo/Xm2rSek74ylj1UGzPh0GNMkRQ
+JlgK2uhc9p6toZ12XwjAH3ikEYtKOEr7kzlEBnPMqUWU/5hrh8sLtoq/Rhy8lrYj
-XX5BJu4lamL9AGzTFr2bdC8ilkiOQ3AWIhdrWaO8rVECQQD4yl6hFRcHEiclePum
+e4YmiSOXAkEAw+Hdee6ie2IJRolpOsiiZ5GqjxLYILBIzS0xnIIgpJGU4g42fTT3
-wDYGmRlgiEGPJ0mNgtOQpGPK3PQXQfDhDNdN26RF9kVysqWINWxjynzVUvzh73TO
+rJ54nanAs6ebwqV5mgVelRvGMrYpN0IKLwJBAKLhm9Y3TgWn69Wqsd2Gg23Y4MA5
-EdTpAkBK26iiYiS2Witu33+Hy0CX3A6GBdcFHs+kMgmn7Sg6cAEN+7+wgkB3ih88
+8WhPgqjs7PuXY0tCV139sGKkj+ejt0Jqx2zWxkTEeh5ZwEYy0Qwj9+4EOhcCQD2l
-832JRi6Y0bW/DoabmzpS8qWJl0rxAkAwETlTOfXnAdTaYpOMVhqaD75dbjXsaJTH
+Sn9CI65y1vp06kIOvFWd2TB3vL7k27R+oZtgtIc2LcXKtUlILx4LLWho8PVZLULf
-aH1jtr8pFKN8UtstQAPhIQyOD9S/IlDlDh1Q8nBH7u644EDbB4rxAkEAyNPbKke9
+stpPEEoa2JBDFcuHJA8CQQCc/rbxp/yofG9hxFTVZvB3+USQPN7vMijkd5ppwpkq
-rxu01y2/mUVugo5c8puy3o2Wi6+b8x3wotYketv3lUKDtXjJQap3CGcLe16cZ25O
+hyaHDANZsPEG39Gw6roX0z1lWVkVYl7cT2AlsCwOaFJ
-5YoBKDXPhDxiBA==
+-----END RSA PRIVATE KEY-----
 -----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 20:42:52 2009 GMT
+            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 20:42:52 2019 GMT
+            Not After : Apr 11 21:48:01 2019 GMT
        Subject: C=SE, CN=Test cert DigitalSignature
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+            RSA Public Key: (1024 bit)
-                Modulus:
+                Modulus (1024 bit):
-                    00:be:25:45:1e:2c:d1:1d:66:56:4c:89:d8:4c:d2:
+                    00:9c:d9:70:8b:a1:4d:1e:7e:7c:f8:12:d5:42:05:
-                    3d:6e:d8:00:65:c2:62:aa:ea:4b:aa:9a:05:62:4f:
+                    78:48:c1:37:4e:85:5a:0a:be:6c:b3:51:67:c1:50:
-                    6f:05:33:91:16:fe:be:f2:03:1a:b8:52:8d:00:2a:
+                    b0:7f:36:80:bc:f0:65:4b:90:d1:2e:28:f1:ef:f5:
-                    2a:ae:23:c3:71:97:57:9b:e2:e3:f3:79:06:c8:40:
+                    67:a2:13:61:75:44:63:ac:61:7a:54:ea:85:0b:4a:
-                    0f:d8:0f:33:51:29:3e:57:0c:56:ac:24:1f:c5:ea:
+                    b1:d4:06:b8:77:5c:ff:86:e7:38:b1:92:46:c6:5a:
-                    89:a2:40:06:8f:08:a1:94:c4:8a:b3:61:83:75:b9:
+                    70:d8:f4:40:42:ab:13:83:cb:5d:5c:d2:b9:1d:c4:
-                    90:c0:98:a0:8b:e3:7c:5f:3b:bd:90:09:08:84:c2:
+                    cc:7a:b8:c7:04:a3:34:b8:3c:df:5e:c0:03:59:c8:
-                    0b:ef:dd:ce:ae:1b:09:68:67:e3:37:de:dc:26:f2:
+                    0a:e2:17:bf:7a:fa:e0:cd:d5:b3:5f:ab:3d:f4:43:
-                    d8:08:84:6e:50:6c:60:f8:d5
+                    46:cf:03:8f:2f:4e:1f:7b:cd
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,26 +28,26 @@ Certificate:
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation
            X509v3 Subject Key Identifier: 
-                96:3E:E0:8F:15:67:78:9C:02:02:1B:44:DA:60:9C:35:E7:0E:B2:21
+                19:E8:0F:9C:D3:12:84:25:16:2D:1A:21:53:39:C1:71:0D:33:25:2F
    Signature Algorithm: sha1WithRSAEncryption
-        11:8c:d0:50:59:1a:d5:38:ab:2d:58:25:d6:68:c3:f0:71:70:
+        a2:8b:92:24:0b:e4:47:cb:1e:40:3c:cc:31:ef:4e:76:cf:1a:
-        be:60:3b:7c:1a:ca:51:a1:5c:a5:29:1f:3f:04:08:ed:03:26:
+        29:8c:8b:a6:ba:87:19:80:4f:a6:26:21:b2:ae:41:ca:ae:2a:
-        08:01:33:60:fb:22:c9:5c:e8:02:a0:e6:de:cf:55:14:b6:25:
+        fe:1a:0f:f8:70:30:17:a2:41:7d:d3:62:36:8f:72:3c:50:d2:
-        48:bd:8f:f8:c1:15:d8:28:d6:f6:19:eb:0d:c5:ad:52:d8:6f:
+        b7:1e:22:ee:95:0c:20:14:26:47:99:50:97:a6:e1:da:c5:88:
-        a9:8a:c7:30:a6:b6:ce:da:19:6b:0f:df:2a:84:d8:b9:cf:14:
+        cc:f7:5d:77:f7:73:ab:c4:f7:50:06:11:44:4d:31:26:b5:80:
-        9e:81:bd:49:a7:3f:65:84:6e:76:91:f8:ef:e2:54:46:f9:48:
+        70:67:aa:0c:d8:d0:b0:b0:b5:10:a6:3a:3b:cf:ef:bb:de:6e:
-        8a:50:c9:af:d4:77:2c:87:85:f6:31:bc:d0:e8:41:0b:a1:99:
+        12:d4:cb:38:86:16:f1:b2:47:3a:29:c4:07:6c:cf:ef:6b:d5:
-        58:e8
+        40:f8
 -----BEGIN CERTIFICATE-----
 MIICCzCCAXSgAwIBAgIBBTANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIwNDI1MlowMjELMAkGA1UEBhMCU0UxIzAhBgNVBAMMGlRlc3QgY2VydCBE
+MDQxMTIxNDgwMVowMjELMAkGA1UEBhMCU0UxIzAhBgNVBAMMGlRlc3QgY2VydCBE
-aWdpdGFsU2lnbmF0dXJlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+JUUe
+aWdpdGFsU2lnbmF0dXJlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCc2XCL
-LNEdZlZMidhM0j1u2ABlwmKq6kuqmgViT28FM5EW/r7yAxq4Uo0AKiquI8Nxl1eb
+oU0efnz4EtVCBXhIwTdOhVoKvmyzUWfBULB/NoC88GVLkNEuKPHv9WeiE2F1RGOs
-4uPzeQbIQA/YDzNRKT5XDFasJB/F6omiQAaPCKGUxIqzYYN1uZDAmKCL43xfO72Q
+YXpU6oULSrHUBrh3XP+G5zixkkbGWnDY9EBCqxODy11c0rkdxMx6uMcEozS4PN9e
-CQiEwgvv3c6uGwloZ+M33twm8tgIhG5QbGD41QIDAQABozkwNzAJBgNVHRMEAjAA
+wANZyAriF796+uDN1bNfqz30Q0bPA48vTh97zQIDAQABozkwNzAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQUlj7gjxVneJwCAhtE2mCcNecOsiEwDQYJ
+MAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQUGegPnNMShCUWLRohUznBcQ0zJS8wDQYJ
-KoZIhvcNAQEFBQADgYEAEYzQUFka1TirLVgl1mjD8HFwvmA7fBrKUaFcpSkfPwQI
+KoZIhvcNAQEFBQADgYEAoouSJAvkR8seQDzMMe9Ods8aKYyLprqHGYBPpiYhsq5B
-7QMmCAEzYPsiyVzoAqDm3s9VFLYlSL2P+MEV2CjW9hnrDcWtUthvqYrHMKa2ztoZ
+yq4q/hoP+HAwF6JBfdNiNo9yPFDStx4i7pUMIBQmR5lQl6bh2sWIzPddd/dzq8T3
-aw/fKoTYuc8UnoG9Sac/ZYRudpH47+JURvlIilDJr9R3LIeF9jG80OhBC6GZWOg=
+UAYRRE0xJrWAcGeqDNjQsLC1EKY6O8/vu95uEtTLOIYW8bJHOinEB2zP72vVQPg=
 -----END CERTIFICATE-----
--- a/lib/hx509/data/test-ds-only.key
+++ b/lib/hx509/data/test-ds-only.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAL4lRR4s0R1mVkyJ
+MIICXAIBAAKBgQCc2XCLoU0efnz4EtVCBXhIwTdOhVoKvmyzUWfBULB/NoC88GVL
-2EzSPW7YAGXCYqrqS6qaBWJPbwUzkRb+vvIDGrhSjQAqKq4jw3GXV5vi4/N5BshA
+kNEuKPHv9WeiE2F1RGOsYXpU6oULSrHUBrh3XP+G5zixkkbGWnDY9EBCqxODy11c
-D9gPM1EpPlcMVqwkH8XqiaJABo8IoZTEirNhg3W5kMCYoIvjfF87vZAJCITCC+/d
+0rkdxMx6uMcEozS4PN9ewANZyAriF796+uDN1bNfqz30Q0bPA48vTh97zQIDAQAB
-zq4bCWhn4zfe3Cby2AiEblBsYPjVAgMBAAECgYADavQVGMUhfCds9MVYjCbiiSto
+AoGAScGuPNrTCv3sAjPI+MzdrUi+mzv2BYtaTlB/e9ZXyNp2W2KoH4qv8wbqDi7W
-qNfRLqjxhhc2ryrVsxmWijmwa/HdAk7ag+eEfcwTjJ7chHWIeNJwYwZl4dAQS3hi
+Vs7KS3ynak5EWl4VxiOPz+aBI1OfpCVKzuDR8IkSQ0rE0ufMOG54QP0SG7mp3dPX
-0pWiCZXgNU+y/VtEH0Hn3LEdOWFX9exICr9M90GTO1OxEASDforZoZS+UHo/m/do
+bsXvyeqO1EOVj5H4oqJKkydDRQpkm8RszaNJ+o+sEWlgAIECQQDNxs8O0iYc6xRg
-DsBdDLWf+6o1jJymwQJBAOIsIFraYhx5H73Y19ktee4mOaoC78NXTK8c8PBdZeMI
+XDOIE9l/B4Fi/YXl9Pcs0xq2Cwk22NvzSQyYo+mHt2GK2xGYkyPV/dTXAbe0RaVa
-wILxo6qniCzq5n0G1TQnzMQvAiT3yRfdPTojehZqZ40CQQDXONUfyKZXpIVRp5kO
+YcbZhFUdAkEAwyGYBbs5JAtKWVp4bJZ95pepeBGPeZ/X4UbqTiZe9gPXrr3ax/qE
-/wJM5LqX7XyqOAnoEEmQ71OEdo5xwBqAzp7oEclknGgQ6yatC5D3FYYLE9o43Xri
+eVezTCOD1ZUEacpTHWWrp0fBZXixMdtycQJBAJpGCQqFh0l6/UXZGlFVAGT6TYjX
-ToBpAkEA1rxMj9YOFriNgYNzFFjQDmMulpMpL08gmJYi0CPtC4yQswJXgTyE1xjD
+pcFnzMBwbMA6uefC4fQdujHeAcFcPOcLor+O4PkYWq/ve7jN1lBSqfB+BAkCQHde
-c2tcW6N6D74ODClSPR0p95wdW1D1NQJBAL5qMu2W+czq62VOEfYZmnBroccPP8/e
+6b0317DxJz6aVek39zVFumq1c2wYGNy7oULFvnoJx7wicOC9pKUGvazqXRAf5V9C
-Gq2t01ie1daJigeL/ibeJ+uM6RDR7KSjWCmb5RsmeNzOKLFNCw60g5kCQDRwavaE
+Yq4tMGFZSDpnJx80/EECQCdJqAA4kpOI/tN4dT6si+EeXYXZPHALGy39x/eTRT0N
-tW+lj1QsZpB2xwJe9eYnIJdMDDg0xD1nvwCcBfRz70dRTvr+LmtEWv/Nsz4VzB3j
+gZfB2IB0AvmpRUyr/d+XOewD/u7Rf7dnNdFQPrKq+sE=
-ZwE42YJ8Wd+F+5g=
+-----END RSA PRIVATE KEY-----
 -----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 20:42:52 2009 GMT
+            Not Before: Apr 13 21:48:01 2009 GMT
-            Not After : Apr 11 20:42:52 2019 GMT
+            Not After : Apr 11 21:48:01 2019 GMT
        Subject: C=SE, CN=Test cert KeyEncipherment
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+            RSA Public Key: (1024 bit)
-                Modulus:
+                Modulus (1024 bit):
-                    00:c1:96:54:d4:4c:78:64:1a:aa:52:59:a7:11:1f:
+                    00:e4:33:6d:d1:fb:6f:01:fa:6b:47:fb:3d:e7:6c:
-                    8b:e9:b8:10:6a:3a:be:f2:bb:00:0c:cf:82:e8:b8:
+                    42:e6:14:ea:cb:ff:b4:2a:93:61:fc:ac:bb:ee:d0:
-                    e6:64:5f:7a:d4:38:f0:08:62:ee:b2:6c:75:34:f5:
+                    e2:44:a6:a7:d6:a4:ce:dd:5c:a1:4d:27:5b:66:50:
-                    a1:7f:6d:25:dd:ca:82:0f:c3:42:d6:5b:eb:11:de:
+                    34:c1:b6:13:79:9d:d6:63:7e:c9:d6:02:ae:40:9e:
-                    8b:bd:e6:e8:19:23:ae:11:38:84:a5:7e:4f:16:15:
+                    74:a8:12:9a:2e:ff:29:03:e4:11:a4:f4:ed:97:55:
-                    59:4d:9b:0a:4e:a4:88:fe:4e:39:9d:53:d4:25:c2:
+                    85:39:9c:c0:53:f6:86:89:e7:a8:cb:8b:d9:0b:36:
-                    36:3a:28:f0:6c:af:55:e6:ae:f3:17:99:1a:7a:0a:
+                    cf:d2:b7:c6:69:83:e7:d0:f8:ed:30:1f:c4:e9:94:
-                    50:01:b0:5d:67:84:bb:9a:84:5e:57:a6:d6:c6:f3:
+                    b5:0b:82:5a:2b:d9:47:42:7e:1f:55:9f:d9:28:89:
-                    fb:ab:0e:6f:f6:53:e3:c7:71
+                    26:a3:9e:ef:0d:05:63:d8:f9
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,26 +28,26 @@ Certificate:
            X509v3 Key Usage: 
                Non Repudiation, Key Encipherment
            X509v3 Subject Key Identifier: 
-                1F:51:89:F6:4F:E4:B2:06:F1:FA:6F:E1:6A:37:6C:BD:5B:AE:63:FF
+                F8:68:AD:D6:DE:5F:4D:14:B8:A0:FA:79:3B:45:57:1E:55:BA:BF:F9
    Signature Algorithm: sha1WithRSAEncryption
-        2d:14:90:ec:ab:5c:ce:4e:29:09:e1:d1:59:8b:89:c5:73:7f:
+        9a:42:8b:67:03:2e:fa:b0:fc:df:ab:da:65:88:85:86:26:f7:
-        a2:ab:04:44:90:b2:c2:3c:b1:7a:31:62:e5:e9:43:71:c4:30:
+        ed:a2:38:c1:40:0b:41:80:a8:42:23:c6:cb:9c:c5:8a:e3:c7:
-        aa:b7:df:ee:4c:5f:5e:10:b5:6a:7c:80:a6:fb:76:4c:d4:12:
+        92:07:c9:23:3c:b6:f5:76:cf:59:3a:dd:57:e3:64:11:c8:62:
-        ba:72:32:ce:0c:ee:19:20:7d:9e:5a:4f:f7:e6:9b:ce:ab:38:
+        45:99:e3:d6:bc:ef:03:fd:a2:aa:1b:6d:fb:fa:db:7b:01:56:
-        4a:b7:45:49:df:dc:d9:1f:ae:c8:32:61:55:b2:39:23:49:dc:
+        71:b7:35:ad:7e:5d:b0:3a:ad:8b:00:74:39:f9:d1:32:77:45:
-        10:59:24:5a:82:37:8e:25:39:aa:64:4c:0c:2c:74:7e:3b:d0:
+        ec:4d:5b:d2:99:2e:bb:2c:d1:a4:51:f9:aa:60:c3:f0:d7:07:
-        cf:88:63:3d:4c:aa:b0:c8:22:87:36:e5:b4:b3:3a:1d:bc:ff:
+        65:4b:54:bf:d1:d2:9b:b5:f7:f1:89:73:f5:67:00:70:9a:da:
-        86:86
+        ee:b3
 -----BEGIN CERTIFICATE-----
 MIICCjCCAXOgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
-MDQxMTIwNDI1MlowMTELMAkGA1UEBhMCU0UxIjAgBgNVBAMMGVRlc3QgY2VydCBL
+MDQxMTIxNDgwMVowMTELMAkGA1UEBhMCU0UxIjAgBgNVBAMMGVRlc3QgY2VydCBL
-ZXlFbmNpcGhlcm1lbnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGWVNRM
+ZXlFbmNpcGhlcm1lbnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOQzbdH7
-eGQaqlJZpxEfi+m4EGo6vvK7AAzPgui45mRfetQ48Ahi7rJsdTT1oX9tJd3Kgg/D
+bwH6a0f7PedsQuYU6sv/tCqTYfysu+7Q4kSmp9akzt1coU0nW2ZQNMG2E3md1mN+
-QtZb6xHei73m6BkjrhE4hKV+TxYVWU2bCk6kiP5OOZ1T1CXCNjoo8GyvVeau8xeZ
+ydYCrkCedKgSmi7/KQPkEaT07ZdVhTmcwFP2honnqMuL2Qs2z9K3xmmD59D47TAf
-GnoKUAGwXWeEu5qEXlem1sbz+6sOb/ZT48dxAgMBAAGjOTA3MAkGA1UdEwQCMAAw
+xOmUtQuCWivZR0J+H1Wf2SiJJqOe7w0FY9j5AgMBAAGjOTA3MAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgVgMB0GA1UdDgQWBBQfUYn2T+SyBvH6b+FqN2y9W65j/zANBgkq
+CwYDVR0PBAQDAgVgMB0GA1UdDgQWBBT4aK3W3l9NFLig+nk7RVceVbq/+TANBgkq
-hkiG9w0BAQUFAAOBgQAtFJDsq1zOTikJ4dFZi4nFc3+iqwREkLLCPLF6MWLl6UNx
+hkiG9w0BAQUFAAOBgQCaQotnAy76sPzfq9pliIWGJvftojjBQAtBgKhCI8bLnMWK
-xDCqt9/uTF9eELVqfICm+3ZM1BK6cjLODO4ZIH2eWk/35pvOqzhKt0VJ39zZH67I
+48eSB8kjPLb1ds9ZOt1X42QRyGJFmePWvO8D/aKqG237+tt7AVZxtzWtfl2wOq2L
-MmFVsjkjSdwQWSRagjeOJTmqZEwMLHR+O9DPiGM9TKqwyCKHNuW0szodvP+Ghg==
+AHQ5+dEyd0XsTVvSmS67LNGkUfmqYMPw1wdlS1S/0dKbtffxiXP1ZwBwmtrusw==
 -----END CERTIFICATE-----
--- a/lib/hx509/data/test-ke-only.key
+++ b/lib/hx509/data/test-ke-only.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMGWVNRMeGQaqlJZ
+MIICXQIBAAKBgQDkM23R+28B+mtH+z3nbELmFOrL/7Qqk2H8rLvu0OJEpqfWpM7d
-pxEfi+m4EGo6vvK7AAzPgui45mRfetQ48Ahi7rJsdTT1oX9tJd3Kgg/DQtZb6xHe
+XKFNJ1tmUDTBthN5ndZjfsnWAq5AnnSoEpou/ykD5BGk9O2XVYU5nMBT9oaJ56jL
-i73m6BkjrhE4hKV+TxYVWU2bCk6kiP5OOZ1T1CXCNjoo8GyvVeau8xeZGnoKUAGw
+i9kLNs/St8Zpg+fQ+O0wH8TplLULglor2UdCfh9Vn9koiSajnu8NBWPY+QIDAQAB
-XWeEu5qEXlem1sbz+6sOb/ZT48dxAgMBAAECgYEAjBV8zSOI+udQ2MaHXpy1YisP
+AoGAH0L0XnnFYU3++GNwvY1VNNPUvpGPCu4Z1FWNgU/YT3NNNthpBmY0Kq+jk8aV
-tc9M3djz8FE5Ka6jCX8OIwQQrgDpObPCHNCiTNNu00/3TfC+LN/W+tdPx9uPl17v
+E5xv2o9G2WZ7G/hOCsgqTwQNXvSK27rZdIs6YB3MqcZIB0PJWOe7LYkMM3sVxqhU
-Id61MfkaBXs0kxvZ9kbrOqmQRkNxf/5tTXqiGjhkGkNiWrh/3bkIAf0kttOXr4tr
+7Z10eNfqkMvR1CLsDmHTw3iSmJ5mblwjFUJJpxt5jQV3o4kCQQD7mni/lInowbEz
-x014jz6d2TmZKQo37QECQQDpW/wBj2x+W/+CUa7KW5ujJsFch+I94HGSX19Q5rCQ
+er0lAOIdiZLc78r6GZmrELbQ2gMwq87citbvG4A8/0g6px84S9XY+Bwe6qrL39V/
-dknO5B4WSmnf283LHyvB6eIwVZEf5JZMnZoxSGkYgLk3AkEA1F6ECevN/zGgpsEQ
+gLVQ0FzjAkEA6DBEm1vgHiqMiVqfg2Mg/J0GEQzpaM8ceuMogJHIhFVR/xamy2sx
-vA5MkOwTX9fSIFxdjvJtzWqzr6NmE42aW/m/BD9fDXSJ4X0Pi4JIdrWTgihjTouN
+48QYxNC5W6JBVQ45fMjQDJOyUV55fn6VcwJAIGvWVXGRl9GlwOl3CBamDIJWz2uC
-u2G4lwJBALAIGGCg7WmgQmzu6xhw5EW9bW08f7jHf0S4NvGTI6vF30V3JQ8RkS4x
+71lvKND9jcoaESKChH7LlYIoszN+Hji82CdFhjDqhr1churv+v8d3i0LWwJBAKx+
-49qOp/Z+VIa7dV8Gky42UONOSSEXsR8CQE53qcPcq92J4bkbhuplQiceAz6biNlK
+r3l72BSRJ7cjTD4f9vG09jzUitMCivYArKZXp9AoUrJf8apOCNJdbMlLB2m8MS0v
-J4uEyctnjILuFe5NmOY5DjosjBt1nuiBA/hhKBMsnhcugxrnd3Pv9HsCQDlWe6jx
+VCYQSgAN+fvZZAlFoWECQQDVWY70F0M5gAfsRznp5TR+wUdAgC7jNnfi5AGr6I45
-39GmCk1jcdtMrLmyCtpLmOKu3svDLbQpeTnP1v1cKuxrQ2qzpfKMrRW7OpjItEES
+295Np9IgYWb3baxgy1xC05NdUZQSzfdaFWACw3iqx6U5
-M4lClsp9joWPE+I=
+-----END RSA PRIVATE KEY-----
 -----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,653392358DFA0BEAE1F54FCE26789C8D
+DEK-Info: AES-256-CBC,5BC583A0C8AD38408305F4E9978B50B8
-wKDLgkKhmdR91+rJP16XEJBYZw/QIXpe72X1eu0N4527GF0WU99m1eBnssOs2/LP
+QJMnvFA80I0R9Ipj+Hcq34Dy6fHv47gxoxBvIO7Z6PsT6Nj9AItzRgVwTaAzIV5A
-m4m0P9bJzzN7ZI4q2jVgmdlPel312Sa1WyDRvTi9G7NDdrn3j4Z+YaVICaZqb98J
+XtEtUhT8WUD7mQbmOvJ0m0cQWJtY46JDJWGKhmLPOmqTlXd6UK4g7zh9x6G1O9vq
-fWqYuUZUamj8xc9Q0ihN/cBVRs0Y435qGu/fALXy/EbjKBwQMCwNjybz2FUAaSp/
+xDFjmP/i4v2+MLExLJ850txFWSSLBzFbpkDB7r7nozrMupgWqqdotjbEEwTkTDRE
-t+pbNmZTaFf+7cHox9ccBO0tRcOnSTB2x42m8sVJQDWs6nn2YFsFKmToqdsNi9Jx
+xNRlb7XsgAeYuHN7Pe+iSDDJNZfH0sxpAeMnGpQBuGpS5MgToIPfysBj9VHcvhwy
-GZmcCR3D9gABM8sSIuw4O89cSAoPZlMIfitJA3nrp/ufShqR9VTT9sYKlgyXbDQO
+qaygJJxNy3pLS+FrdxD8bomzC4ECSKwsGG8uZBccp2l+VXwZikXdxY+pJYXbpZQN
-SS6H+kk9GQVQAZgF5y3dloVrlE2HQSG8IQa8oWur+IpghnwIWhD5VFAWeZFyVONd
+Ww0dMfRfw/f/6+sadkAiU1Xtml+U8HNlJVpyeZcdMPLstnEbf881bVDwWbqqZ6zG
-gMAN/GrrQ+5aiCl2mQKie/9dmxPIJ7Ae3JD/JAdjeRUF+oIwThk4dOowy4Y120fA
+qz/ikmI5S4XnJf2LskujZHLcqdhzy5yRGqm37L60BK3P6d3OHfKJmJfvYYkpzti9
-KTn1DsSL6nTCBjwVi8YMTvnLkJWqkOZyP6wCIicg8AOM2IA4+U6FlR0DPrwAgbXo
+NkggO9Sje7vRNaOy9ZgkifoiFkTQjjQ3eEIXfVlMQkENHRNv71ojJ44ZJVu6ihhr
-k9MzXwCKXLx0BrIWL4ZUTmN+3GY5FJzWlzH8YdDy2XWh7kh2lHzSu/dEHJFYBZyS
+AL7hxnlHOiwY/lF3u7Y5su9x6fpRUpcJeTqb+2b6fdtEIenb0QFYSO4c73858VQy
-5Mp9U0vALImVAsA356QIeEL2or7ePXQiXmeAeRVo/rH86M8MQsQl9sPvbVwjbkQF
+K5zrihXCrx3ptJMPiyy8jGA9DGs7RQYi64CVaf4TgHBKaJOl7xBlNJSfgjOv8vDB
-xUTiPfuuQ2cxiXf3wH0+X4B5z/yO1GtZdwDp5t/MDoZXdWHK0dcOKc1kWTdyxvFQ
+9Ta+OFCeSGr/W6ACtUkAVj8mXplCt5htAmBK1yt0g5W5ucTwoOgTe3Crfectf6aQ
-Fmtgao+slMw0gKUUbNS/pwN8wDmfvBL+MmIOUGCGpv8kPgP9oGgpvszkxmph4RME
+MKCeIrseM1lE65mLOFTJiEjX0KSKa08P7HhceHq5lyzNgaJu0Mq8krlJFpsE/d5q
-x1d3XAQxODLm97riduUnZqwcmrYI/C3Hf0GGhvYCJJ50erIeZXmpQ9SskqAKXFoD
+ifEH5iZvZyFBfYm9BIb7YHDlQtwn0wNcGeQ4mXS2AS/Uy7GGyanzwrF/nKjcvefI
 -----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.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 20:42:52 2009 GMT
+            Not Before: Apr 13 21:48:00 2009 GMT
-            Not After : Apr 11 20:42:52 2019 GMT
+            Not After : Apr 11 21:48:00 2019 GMT
        Subject: C=SE, CN=Test cert
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+            RSA Public Key: (1024 bit)
-                Modulus:
+                Modulus (1024 bit):
-                    00:ee:87:ab:4c:f9:56:cb:c2:ef:c4:ed:bd:f9:96:
+                    00:e2:00:4a:75:49:06:9b:9e:be:96:65:75:13:19:
-                    9f:a0:28:71:f0:75:5e:78:3c:59:cb:7b:6e:7c:95:
+                    d2:26:43:b6:8b:67:39:3c:40:07:6c:97:74:2f:0b:
-                    7c:26:63:3c:39:a8:b9:5a:94:6d:83:f5:5c:1c:a0:
+                    b8:a2:ca:da:34:b5:2d:bb:c4:17:27:c7:4c:ef:f4:
-                    f0:c3:70:11:bb:d0:55:fe:22:38:82:81:bf:8a:6a:
+                    2f:2c:d9:5b:45:2b:67:48:55:b7:95:0d:ec:67:3e:
-                    5f:88:64:b9:fa:c0:83:a2:7e:d7:cd:eb:ed:e8:67:
+                    d7:93:f2:2b:5b:13:01:ba:43:41:06:c2:14:13:b6:
-                    01:c0:3c:7e:63:f5:fb:2a:9c:7e:3f:97:82:04:a0:
+                    f9:cb:92:7e:60:0e:2d:cd:75:61:25:0d:19:b0:f5:
-                    c2:87:72:03:70:cf:c0:42:ef:02:86:5b:ca:a4:c9:
+                    85:97:47:85:d6:48:09:1c:1d:16:14:21:73:5e:99:
-                    ff:20:4d:ce:ff:b6:29:67:a1:6a:90:9b:45:8c:62:
+                    79:dd:79:27:75:4f:f5:24:dd:b2:ae:db:c6:9f:e1:
-                    b6:6c:f9:97:cc:3c:e9:4e:73
+                    37:55:5c:88:4d:97:fe:96:7d
                Exponent: 65537 (0x10001)
        X509v3 extensions:
            X509v3 Basic Constraints: 
@@ -28,42 +28,41 @@ Certificate:
            X509v3 Key Usage: 
                Digital Signature, Non Repudiation, Key Encipherment
            X509v3 Subject Key Identifier: 
-                74:2D:BF:08:22:CF:62:9F:65:EC:45:EA:E6:4D:83:2D:CD:96:E0:ED
+                8F:3D:D0:8C:5D:35:CC:31:59:12:6F:C5:56:DF:1A:84:2D:8A:AC:51
    Signature Algorithm: sha1WithRSAEncryption
-        53:ee:1d:a1:b1:7a:43:14:33:a7:3b:ab:bb:76:5d:18:6c:6b:
+        b9:a3:2c:a9:df:13:01:8b:9d:dc:82:8a:57:ad:d7:7d:41:83:
-        e7:6d:4a:a0:31:f9:82:36:5d:3c:76:5f:c7:e4:a9:9c:26:e0:
+        f3:28:ad:7b:da:24:b4:3b:82:f2:80:b3:db:0b:a4:e4:bf:4e:
-        08:e9:c1:f7:d1:38:90:2c:e3:fa:00:63:b9:c8:d6:ef:c4:a7:
+        27:1f:5b:3f:f1:89:ca:76:c2:e8:03:86:88:59:5f:51:01:af:
-        3d:14:1d:b8:17:a8:87:3d:74:4b:a9:84:55:f6:62:d8:43:fa:
+        cc:d8:63:9d:cf:2e:de:10:25:48:26:5f:99:62:dd:14:78:ad:
-        55:c3:a9:03:60:6a:b3:dd:23:0c:ea:f3:e9:91:a2:19:d5:73:
+        82:7b:e6:7c:93:48:37:4f:ad:8a:94:0c:98:3b:d9:e9:84:aa:
-        1a:cb:80:e5:98:53:53:9b:4d:14:8d:70:a0:90:37:ea:d9:04:
+        8f:d6:68:c2:f3:d1:80:50:30:ff:5e:e6:24:8e:1a:a1:0c:5b:
-        20:0c:e4:58:74:71:cb:1c:0e:b4:42:27:88:d5:97:2c:f6:3a:
+        c3:c9:ab:d6:76:fb:77:8e:ee:dd:56:d7:60:8e:49:65:65:0d:
-        2f:61
+        20:fc
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAWOgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMFoXDTE5
-MDQxMTIwNDI1MlowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
+MDQxMTIxNDgwMFowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7oerTPlWy8LvxO29+ZafoChx8HVe
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4gBKdUkGm56+lmV1ExnSJkO2i2c5
-eDxZy3tufJV8JmM8Oai5WpRtg/VcHKDww3ARu9BV/iI4goG/impfiGS5+sCDon7X
+PEAHbJd0Lwu4osraNLUtu8QXJ8dM7/QvLNlbRStnSFW3lQ3sZz7Xk/IrWxMBukNB
-zevt6GcBwDx+Y/X7Kpx+P5eCBKDCh3IDcM/AQu8ChlvKpMn/IE3O/7YpZ6FqkJtF
+BsIUE7b5y5J+YA4tzXVhJQ0ZsPWFl0eF1kgJHB0WFCFzXpl53XkndU/1JN2yrtvG
-jGK2bPmXzDzpTnMCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+n+E3VVyITZf+ln0CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0OBBYEFHQtvwgiz2KfZexF6uZNgy3NluDtMA0GCSqGSIb3DQEBBQUAA4GBAFPu
+VR0OBBYEFI890IxdNcwxWRJvxVbfGoQtiqxRMA0GCSqGSIb3DQEBBQUAA4GBALmj
-HaGxekMUM6c7q7t2XRhsa+dtSqAx+YI2XTx2X8fkqZwm4AjpwffROJAs4/oAY7nI
+LKnfEwGLndyCilet131Bg/MorXvaJLQ7gvKAs9sLpOS/TicfWz/xicp2wugDhohZ
-1u/Epz0UHbgXqIc9dEuphFX2YthD+lXDqQNgarPdIwzq8+mRohnVcxrLgOWYU1Ob
+X1EBr8zYY53PLt4QJUgmX5li3RR4rYJ75nyTSDdPrYqUDJg72emEqo/WaMLz0YBQ
-TRSNcKCQN+rZBCAM5Fh0ccscDrRCJ4jVlyz2Oi9h
+MP9e5iSOGqEMW8PJq9Z2+3eO7t1W12COSWVlDSD8
 -----END CERTIFICATE-----
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAO6Hq0z5VsvC78Tt
+MIICXQIBAAKBgQDiAEp1SQabnr6WZXUTGdImQ7aLZzk8QAdsl3QvC7iiyto0tS27
-vfmWn6AocfB1Xng8Wct7bnyVfCZjPDmouVqUbYP1XByg8MNwEbvQVf4iOIKBv4pq
+xBcnx0zv9C8s2VtFK2dIVbeVDexnPteT8itbEwG6Q0EGwhQTtvnLkn5gDi3NdWEl
-X4hkufrAg6J+183r7ehnAcA8fmP1+yqcfj+XggSgwodyA3DPwELvAoZbyqTJ/yBN
+DRmw9YWXR4XWSAkcHRYUIXNemXndeSd1T/Uk3bKu28af4TdVXIhNl/6WfQIDAQAB
-zv+2KWehapCbRYxitmz5l8w86U5zAgMBAAECgYEAr9zpKGxhWQPVga0DNwSdlhib
+AoGBAJ0eSqWDYV6rXCC+5EelOd50UOJVnwruELtEB/f1FCXJFS5zjxns15RGEIz5
-wPzX9PASCFtt337bNPZPTfefCTCL+hGpoxXpzT5QZNe6vw79+QKudN/upYIWN2TJ
+nBp3+eX6qNE3Fmw/w8x7efBW+iAF/1zHjAmBqfltHAUJzwTSpIOvNEbgITamw1Di
-JgBNzFbJi2BqvVeokXpAHdwE5eq4b6GS+S7a7hqI/iAQMahasYb9hwm4VO6u8agn
+Tx+uJ495meObhmQZFcC2XW6HCBYiUHs7R7J8Z2lj1UgeWFiZAkEA/jM7w3FrelLa
-BnJDA5/FvMDkffmc5xECQQD8NIn67E4faznMWJmlB5I3V5jcU72JmUskYmu5ifRn
+h+cVB2u6RmAUNiO7gFd7dZRApu7bNZPdewtuNUOuJXl33LwsdCAx2A5N3/hGigar
-e/DjSFzSU9/+rMWO0q8lA8V6pTcC25h8PJcbtleYoVmZAkEA8h50b3Lz8k7Suhlk
+D5KTVb3kEwJBAOOZ8YsClbsNxEN1/rYFoY6euhGmW7bagtvAtGrDLXnefx465Rdt
-i7lWJqoYlk/pwarPD0tiINYc/wj5BA8ikSkGUrWq6nnW9YahL8o8qoU6Yz1P6o7L
+ja/84XgnspmyMlTc0NemZrZqrI1nHRJYTS8CQDwAAdI++jx0RAqh+6+1uNEVqo+g
-hmvn6wJAeu0Ev8fDwC6cKkyY/sX074KDoAg03sdXx7Es/m8OMA5J+A3CKEX3bIM7
+3YgMniKBrMT6ShmaXkPFzeyangdQZX9flyqN0tYJgk4kPxojOstBMK+jU6sCQQCL
-e4SXF3yCGWhDquHrrco+gKRch6lFKQJAVicwF1g4JciWg1H1zSIt3aQ5C4N0Ek3N
+XqIVEGElqLls4d02Et6qGbIwyqDQqJ+G90rDMX8waDmJBmFwZipkAMMEM7LfAMpn
-UAvq5vRJbRasRR19l1mZvmSWZMjmDIfTY0X7QFIX7Kgsf7JACZzr8QJAEuP4zLJU
+QswzsXal7054TBL2P9ILAkA1tzoIfbgqmkyRYtVbCOOJaBOHqwcopLeAWGJKZJck
-Kaa6ixGp0R9quVDkSVW8mcHAc6q0cMWwpz1vCTj6HOwnONQ8q3e94XZ3V9QLjFl2
+kwkjXa9snb3BKGJ+fEgqot3YQdLuZHDBfDxUDG62PPqG
-8YmEDeVv5nOa7g==
+-----END RSA PRIVATE KEY-----
 -----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 20:42:52 2009 GMT
+            Not Before: Apr 13 21:48:00 2009 GMT
-            Not After : Apr 11 20:42:52 2019 GMT
+            Not After : Apr 11 21:48:00 2019 GMT
        Subject: C=SE, CN=Test cert
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+            RSA Public Key: (1024 bit)
-                Modulus:
+                Modulus (1024 bit):
-                    00:ee:87:ab:4c:f9:56:cb:c2:ef:c4:ed:bd:f9:96:
+                    00:e2:00:4a:75:49:06:9b:9e:be:96:65:75:13:19:
-                    9f:a0:28:71:f0:75:5e:78:3c:59:cb:7b:6e:7c:95:
+                    d2:26:43:b6:8b:67:39:3c:40:07:6c:97:74:2f:0b:
-                    7c:26:63:3c:39:a8:b9:5a:94:6d:83:f5:5c:1c:a0:
+                    b8:a2:ca:da:34:b5:2d:bb:c4:17:27:c7:4c:ef:f4:
-                    f0:c3:70:11:bb:d0:55:fe:22:38:82:81:bf:8a:6a:
+                    2f:2c:d9:5b:45:2b:67:48:55:b7:95:0d:ec:67:3e:
-                    5f:88:64:b9:fa:c0:83:a2:7e:d7:cd:eb:ed:e8:67:
+                    d7:93:f2:2b:5b:13:01:ba:43:41:06:c2:14:13:b6:
-                    01:c0:3c:7e:63:f5:fb:2a:9c:7e:3f:97:82:04:a0:
+                    f9:cb:92:7e:60:0e:2d:cd:75:61:25:0d:19:b0:f5:
-                    c2:87:72:03:70:cf:c0:42:ef:02:86:5b:ca:a4:c9:
+                    85:97:47:85:d6:48:09:1c:1d:16:14:21:73:5e:99:
-                    ff:20:4d:ce:ff:b6:29:67:a1:6a:90:9b:45:8c:62:
+                    79:dd:79:27:75:4f:f5:24:dd:b2:ae:db:c6:9f:e1:
-                    b6:6c:f9:97:cc:3c:e9:4e:73
+                    37:55:5c:88:4d:97:fe:96:7d
                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: 
-                74:2D:BF:08:22:CF:62:9F:65:EC:45:EA:E6:4D:83:2D:CD:96:E0:ED
+                8F:3D:D0:8C:5D:35:CC:31:59:12:6F:C5:56:DF:1A:84:2D:8A:AC:51
    Signature Algorithm: sha1WithRSAEncryption
-        53:ee:1d:a1:b1:7a:43:14:33:a7:3b:ab:bb:76:5d:18:6c:6b:
+        b9:a3:2c:a9:df:13:01:8b:9d:dc:82:8a:57:ad:d7:7d:41:83:
-        e7:6d:4a:a0:31:f9:82:36:5d:3c:76:5f:c7:e4:a9:9c:26:e0:
+        f3:28:ad:7b:da:24:b4:3b:82:f2:80:b3:db:0b:a4:e4:bf:4e:
-        08:e9:c1:f7:d1:38:90:2c:e3:fa:00:63:b9:c8:d6:ef:c4:a7:
+        27:1f:5b:3f:f1:89:ca:76:c2:e8:03:86:88:59:5f:51:01:af:
-        3d:14:1d:b8:17:a8:87:3d:74:4b:a9:84:55:f6:62:d8:43:fa:
+        cc:d8:63:9d:cf:2e:de:10:25:48:26:5f:99:62:dd:14:78:ad:
-        55:c3:a9:03:60:6a:b3:dd:23:0c:ea:f3:e9:91:a2:19:d5:73:
+        82:7b:e6:7c:93:48:37:4f:ad:8a:94:0c:98:3b:d9:e9:84:aa:
-        1a:cb:80:e5:98:53:53:9b:4d:14:8d:70:a0:90:37:ea:d9:04:
+        8f:d6:68:c2:f3:d1:80:50:30:ff:5e:e6:24:8e:1a:a1:0c:5b:
-        20:0c:e4:58:74:71:cb:1c:0e:b4:42:27:88:d5:97:2c:f6:3a:
+        c3:c9:ab:d6:76:fb:77:8e:ee:dd:56:d7:60:8e:49:65:65:0d:
-        2f:61
+        20:fc
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAWOgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMFoXDTE5
-MDQxMTIwNDI1MlowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
+MDQxMTIxNDgwMFowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7oerTPlWy8LvxO29+ZafoChx8HVe
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4gBKdUkGm56+lmV1ExnSJkO2i2c5
-eDxZy3tufJV8JmM8Oai5WpRtg/VcHKDww3ARu9BV/iI4goG/impfiGS5+sCDon7X
+PEAHbJd0Lwu4osraNLUtu8QXJ8dM7/QvLNlbRStnSFW3lQ3sZz7Xk/IrWxMBukNB
-zevt6GcBwDx+Y/X7Kpx+P5eCBKDCh3IDcM/AQu8ChlvKpMn/IE3O/7YpZ6FqkJtF
+BsIUE7b5y5J+YA4tzXVhJQ0ZsPWFl0eF1kgJHB0WFCFzXpl53XkndU/1JN2yrtvG
-jGK2bPmXzDzpTnMCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+n+E3VVyITZf+ln0CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0OBBYEFHQtvwgiz2KfZexF6uZNgy3NluDtMA0GCSqGSIb3DQEBBQUAA4GBAFPu
+VR0OBBYEFI890IxdNcwxWRJvxVbfGoQtiqxRMA0GCSqGSIb3DQEBBQUAA4GBALmj
-HaGxekMUM6c7q7t2XRhsa+dtSqAx+YI2XTx2X8fkqZwm4AjpwffROJAs4/oAY7nI
+LKnfEwGLndyCilet131Bg/MorXvaJLQ7gvKAs9sLpOS/TicfWz/xicp2wugDhohZ
-1u/Epz0UHbgXqIc9dEuphFX2YthD+lXDqQNgarPdIwzq8+mRohnVcxrLgOWYU1Ob
+X1EBr8zYY53PLt4QJUgmX5li3RR4rYJ75nyTSDdPrYqUDJg72emEqo/WaMLz0YBQ
-TRSNcKCQN+rZBCAM5Fh0ccscDrRCJ4jVlyz2Oi9h
+MP9e5iSOGqEMW8PJq9Z2+3eO7t1W12COSWVlDSD8
 -----END CERTIFICATE-----
--- a/lib/hx509/data/test.key
+++ b/lib/hx509/data/test.key
@@ -1,16 +1,15 @@
-----BEGIN PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAO6Hq0z5VsvC78Tt
+MIICXQIBAAKBgQDiAEp1SQabnr6WZXUTGdImQ7aLZzk8QAdsl3QvC7iiyto0tS27
-vfmWn6AocfB1Xng8Wct7bnyVfCZjPDmouVqUbYP1XByg8MNwEbvQVf4iOIKBv4pq
+xBcnx0zv9C8s2VtFK2dIVbeVDexnPteT8itbEwG6Q0EGwhQTtvnLkn5gDi3NdWEl
-X4hkufrAg6J+183r7ehnAcA8fmP1+yqcfj+XggSgwodyA3DPwELvAoZbyqTJ/yBN
+DRmw9YWXR4XWSAkcHRYUIXNemXndeSd1T/Uk3bKu28af4TdVXIhNl/6WfQIDAQAB
-zv+2KWehapCbRYxitmz5l8w86U5zAgMBAAECgYEAr9zpKGxhWQPVga0DNwSdlhib
+AoGBAJ0eSqWDYV6rXCC+5EelOd50UOJVnwruELtEB/f1FCXJFS5zjxns15RGEIz5
-wPzX9PASCFtt337bNPZPTfefCTCL+hGpoxXpzT5QZNe6vw79+QKudN/upYIWN2TJ
+nBp3+eX6qNE3Fmw/w8x7efBW+iAF/1zHjAmBqfltHAUJzwTSpIOvNEbgITamw1Di
-JgBNzFbJi2BqvVeokXpAHdwE5eq4b6GS+S7a7hqI/iAQMahasYb9hwm4VO6u8agn
+Tx+uJ495meObhmQZFcC2XW6HCBYiUHs7R7J8Z2lj1UgeWFiZAkEA/jM7w3FrelLa
-BnJDA5/FvMDkffmc5xECQQD8NIn67E4faznMWJmlB5I3V5jcU72JmUskYmu5ifRn
+h+cVB2u6RmAUNiO7gFd7dZRApu7bNZPdewtuNUOuJXl33LwsdCAx2A5N3/hGigar
-e/DjSFzSU9/+rMWO0q8lA8V6pTcC25h8PJcbtleYoVmZAkEA8h50b3Lz8k7Suhlk
+D5KTVb3kEwJBAOOZ8YsClbsNxEN1/rYFoY6euhGmW7bagtvAtGrDLXnefx465Rdt
-i7lWJqoYlk/pwarPD0tiINYc/wj5BA8ikSkGUrWq6nnW9YahL8o8qoU6Yz1P6o7L
+ja/84XgnspmyMlTc0NemZrZqrI1nHRJYTS8CQDwAAdI++jx0RAqh+6+1uNEVqo+g
-hmvn6wJAeu0Ev8fDwC6cKkyY/sX074KDoAg03sdXx7Es/m8OMA5J+A3CKEX3bIM7
+3YgMniKBrMT6ShmaXkPFzeyangdQZX9flyqN0tYJgk4kPxojOstBMK+jU6sCQQCL
-e4SXF3yCGWhDquHrrco+gKRch6lFKQJAVicwF1g4JciWg1H1zSIt3aQ5C4N0Ek3N
+XqIVEGElqLls4d02Et6qGbIwyqDQqJ+G90rDMX8waDmJBmFwZipkAMMEM7LfAMpn
-UAvq5vRJbRasRR19l1mZvmSWZMjmDIfTY0X7QFIX7Kgsf7JACZzr8QJAEuP4zLJU
+QswzsXal7054TBL2P9ILAkA1tzoIfbgqmkyRYtVbCOOJaBOHqwcopLeAWGJKZJck
-Kaa6ixGp0R9quVDkSVW8mcHAc6q0cMWwpz1vCTj6HOwnONQ8q3e94XZ3V9QLjFl2
+kwkjXa9snb3BKGJ+fEgqot3YQdLuZHDBfDxUDG62PPqG
-8YmEDeVv5nOa7g==
+-----END RSA PRIVATE KEY-----
 -----END PRIVATE KEY-----
--- a/lib/hx509/data/test.p12
+++ b/lib/hx509/data/test.p12