From f73d077b5bd7596588059e21011188c653dc6a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 16 Apr 2009 08:27:48 +0000
Subject: [PATCH] regen

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25126 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hx509/data/ca.crt                         |  26 ++---
 lib/hx509/data/ca.key                         |  31 +++---
 lib/hx509/data/crl1.crl                       |  10 +-
 lib/hx509/data/crl1.der                       | Bin 264 -> 264 bytes
 lib/hx509/data/https.crt                      |  68 ++++++-------
 lib/hx509/data/https.key                      |  31 +++---
 lib/hx509/data/kdc.crt                        |  59 +++++++++++
 lib/hx509/data/kdc.key                        |  31 +++---
 lib/hx509/data/no-proxy-test.crt              |  22 ++--
 lib/hx509/data/no-proxy-test.key              |  31 +++---
 lib/hx509/data/ocsp-req1.der                  | Bin 105 -> 105 bytes
 lib/hx509/data/ocsp-req2.der                  | Bin 105 -> 105 bytes
 lib/hx509/data/ocsp-resp1-ca.der              | Bin 999 -> 999 bytes
 lib/hx509/data/ocsp-resp1-keyhash.der         | Bin 900 -> 900 bytes
 lib/hx509/data/ocsp-resp1-ocsp-no-cert.der    | Bin 363 -> 363 bytes
 lib/hx509/data/ocsp-resp1-ocsp.der            | Bin 918 -> 918 bytes
 lib/hx509/data/ocsp-resp2.der                 | Bin 935 -> 935 bytes
 lib/hx509/data/ocsp-responder.crt             |  66 ++++++------
 lib/hx509/data/ocsp-responder.key             |  31 +++---
 lib/hx509/data/pkinit-ec.crt                  |  51 ++++++++++
 lib/hx509/data/pkinit-ec.key                  |  10 +-
 lib/hx509/data/pkinit-proxy-chain.crt         |  78 ++++++++++++--
 lib/hx509/data/pkinit-proxy.crt               |  22 ++--
 lib/hx509/data/pkinit-proxy.key               |  31 +++---
 lib/hx509/data/pkinit-pw.key                  |  28 +++---
 lib/hx509/data/pkinit.crt                     |  56 +++++++++++
 lib/hx509/data/pkinit.key                     |  31 +++---
 lib/hx509/data/proxy-level-test.crt           |  22 ++--
 lib/hx509/data/proxy-level-test.key           |  31 +++---
 lib/hx509/data/proxy-test.crt                 |  22 ++--
 lib/hx509/data/proxy-test.key                 |  31 +++---
 lib/hx509/data/proxy10-child-child-test.crt   |  22 ++--
 lib/hx509/data/proxy10-child-child-test.key   |  31 +++---
 lib/hx509/data/proxy10-child-test.crt         |  22 ++--
 lib/hx509/data/proxy10-child-test.key         |  31 +++---
 lib/hx509/data/proxy10-test.crt               |  22 ++--
 lib/hx509/data/proxy10-test.key               |  31 +++---
 lib/hx509/data/revoke.crt                     |  64 ++++++------
 lib/hx509/data/revoke.key                     |  31 +++---
 lib/hx509/data/sub-ca.crt                     |  76 +++++++-------
 lib/hx509/data/sub-ca.key                     |  31 +++---
 lib/hx509/data/sub-cert.crt                   |  66 ++++++------
 lib/hx509/data/sub-cert.key                   |  31 +++---
 lib/hx509/data/sub-cert.p12                   | Bin 3008 -> 3008 bytes
 lib/hx509/data/test-ds-only.crt               |  64 ++++++------
 lib/hx509/data/test-ds-only.key               |  31 +++---
 lib/hx509/data/test-enveloped-aes-128         | Bin 3160 -> 3160 bytes
 lib/hx509/data/test-enveloped-aes-256         | Bin 3160 -> 3160 bytes
 lib/hx509/data/test-enveloped-des             | Bin 3140 -> 3140 bytes
 lib/hx509/data/test-enveloped-des-ede3        | Bin 3143 -> 3143 bytes
 lib/hx509/data/test-enveloped-rc2-128         | Bin 3148 -> 3148 bytes
 lib/hx509/data/test-enveloped-rc2-40          | Bin 3149 -> 3149 bytes
 lib/hx509/data/test-enveloped-rc2-64          | Bin 3148 -> 3148 bytes
 lib/hx509/data/test-ke-only.crt               |  64 ++++++------
 lib/hx509/data/test-ke-only.key               |  31 +++---
 lib/hx509/data/test-nopw.p12                  | Bin 2221 -> 2222 bytes
 lib/hx509/data/test-pw.key                    |  28 +++---
 lib/hx509/data/test-signed-data               | Bin 3899 -> 3838 bytes
 lib/hx509/data/test-signed-data-noattr        | Bin 3656 -> 3656 bytes
 .../data/test-signed-data-noattr-nocerts      | Bin 3142 -> 3142 bytes
 lib/hx509/data/test.combined.crt              |  95 +++++++++---------
 lib/hx509/data/test.crt                       |  64 ++++++------
 lib/hx509/data/test.key                       |  31 +++---
 lib/hx509/data/test.p12                       | Bin 2320 -> 2320 bytes
 64 files changed, 944 insertions(+), 741 deletions(-)

diff --git a/lib/hx509/data/ca.crt b/lib/hx509/data/ca.crt
index 38995a089..70b6009aa 100644
--- a/lib/hx509/data/ca.crt
+++ b/lib/hx509/data/ca.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICbDCCAdWgAwIBAgIJAJrKrhkoWkfBMA0GCSqGSIb3DQEBBQUAMCoxGzAZBgNV
-BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDkwNDEzMjA0
-MjUyWhcNMTkwNDExMjA0MjUyWjAqMRswGQYDVQQDDBJoeDUwOSBUZXN0IFJvb3Qg
-Q0ExCzAJBgNVBAYTAlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmMfh3
-hjb0WmvfadDqg+gybpInr973ORvh7I+bvbIfAEjnKqtVp69jktpFRxSC6qjiUrv/
-MsYhGp69brO1KNDiAFvGzQRmnelO574272AndOp21oCrLyv2sLc2rwTDKEpC/e0N
-lGgRUmjpgbBra1xDLajKtvhpKF+OxMx04tp9pwIDAQABo4GZMIGWMB0GA1UdDgQW
-BBR7HAikk96mNPhY/ylalywHxhI6+zBaBgNVHSMEUzBRgBR7HAikk96mNPhY/yla
-lywHxhI6+6EupCwwKjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYD
-VQQGEwJTRYIJAJrKrhkoWkfBMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgHmMA0G
-CSqGSIb3DQEBBQUAA4GBAJgj5P04eGc8acVii4ttB/ByFnIK2wxori63atXQA1Hz
-MXYh+HZpjXVqO3eZqq0ckvLbmN6TMwWm89wPKDwYiwKD/MSru5WKPrMrur9IsW4o
-evlIoJAR4vWSOTMXBAa9PdUTj7l9x1MRdj4y3E6XZbma6+L6D6h3ikZ5MZ4ibRTt
+MIICbDCCAdWgAwIBAgIJAJ5Pn5krKrp9MA0GCSqGSIb3DQEBBQUAMCoxGzAZBgNV
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDkwNDEzMjE0
+ODAwWhcNMTkwNDExMjE0ODAwWjAqMRswGQYDVQQDDBJoeDUwOSBUZXN0IFJvb3Qg
+Q0ExCzAJBgNVBAYTAlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8H0kq
+8tkisE700EnL4Ic3urE2wGETl+kt3bJXVlzLVsHhQaniITqtTCZfZeckk+2nzaPE
+0MehisrOY68QfX+pgdwsiySKA9Ds2cwnfTyOFnECIyPHhZOHuKkOmUgrbjyFavCj
+nfOEx9F+OIy6aRxNIYdtTyiChrNMRzJZ9mjqOQIDAQABo4GZMIGWMB0GA1UdDgQW
+BBRRPOSnMBSMVXSVHFhq8sYFaqfj8TBaBgNVHSMEUzBRgBRRPOSnMBSMVXSVHFhq
+8sYFaqfj8aEupCwwKjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYD
+VQQGEwJTRYIJAJ5Pn5krKrp9MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgHmMA0G
+CSqGSIb3DQEBBQUAA4GBAKJjleDlo0d/gxdi1S8cWJ78Wg2GCHbeq4qo4NU6DrYV
+mDpnqUw+qGsJVEjBBuCOPLuuxqai82In+XSHN5MdC3UqtuBc5E2ogD5NdKoq9BTY
+Glq7rd/VkNXgkbjOGEDGlsrrBbsQVZcVGAd4L1uXCeTZTKZ96FSB07nUIvSRvHGd
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/ca.key b/lib/hx509/data/ca.key
index b11b6a63c..3f13ef1a4 100644
--- a/lib/hx509/data/ca.key
+++ b/lib/hx509/data/ca.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKYx+HeGNvRaa99p
-0OqD6DJukiev3vc5G+Hsj5u9sh8ASOcqq1Wnr2OS2kVHFILqqOJSu/8yxiEanr1u
-s7Uo0OIAW8bNBGad6U7nvjbvYCd06nbWgKsvK/awtzavBMMoSkL97Q2UaBFSaOmB
-sGtrXEMtqMq2+GkoX47EzHTi2n2nAgMBAAECgYAUTB4QWu/zP+fUzVOakKmXHzHy
-buRIRU1GdmHDn5NVfe9pbCiouWYOPy0xMNEsfARMP9Z+AHF6MYoZkJ+aDHYWMZpw
-eYVoEdz7KknT4uwcA41+ovTUg/stkapIAbh5zJKsc+4q5VB0MWMAmTrGLVxs6Lqx
-KGfPbu0q4k+jitHKwQJBANADQt2fbqIZwrxjrI+QkZtvAUScBjvAvgxSUI7ZnvHl
-qAbPqQT520WYoElb3jTkR7UOH2/WREwYBUxSIZlWPo8CQQDMiRCJwMafqcYFEazk
-m84m9pd1YWYbun303uV8ZRyhddgJEeqGn6yWf59xBqhUtM6oFMmgqFqiTiG7LgQk
-4ltpAkBLnRPeWgkuVazrLFRa75NubACK/yho6hxrgDSWaNcVWYUlzLDFBUpG1z9U
-y1dP5LeIQjT9Q2caPhUW9DgQdEBTAkAe4ab8lX2nx7NdOpD3J0sV+O9fSqhnEV5J
-JYpSoNWUzz0iCXF2iA8/3d8N6qppt67oE9NpjWG51cAkCcuYYhDZAkBWnAY9gH7D
-0DnRmFHJy1HrbyJDGdySQcr+4X91i+Amrtpxu9fLgJNQkfVXQmsfK4Z1+GDMK3kh
-AM4eQvOMVpUN
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC8H0kq8tkisE700EnL4Ic3urE2wGETl+kt3bJXVlzLVsHhQani
+ITqtTCZfZeckk+2nzaPE0MehisrOY68QfX+pgdwsiySKA9Ds2cwnfTyOFnECIyPH
+hZOHuKkOmUgrbjyFavCjnfOEx9F+OIy6aRxNIYdtTyiChrNMRzJZ9mjqOQIDAQAB
+AoGARt3CQluZUGf6Vl7gbdz3ExdRCr8N0sO3I4AQXrY53p+gCasiw/ygjgfRrL5G
+hJD1RfFBcDL2APS30Wfb2upr3Fibq8StsQqg8Na4PF+Y9QpHkgc6MJotmNW37Usv
+VivQLwZ+QuqHCLCZNz00MMnKDr8o6DZ8f9g929OslxinE8ECQQD1mjc3wfUvjZ9t
+6F1LWvRJ+Oyuj4/uXJcx4RDITArPO8NlhesaIL8/A7RWQBOnHViQwZ7p35R9tS1j
+IILws8tbAkEAxBYczw5nx/cH01Lq9sMGb8KdrjBseIoyBts0s1JjCR6s4Zu7k3tN
+qvYwhBwPd+Mo5c4w8+tKZe0n1YxWDjAY+wJADjQC6XiQA1X/WE3Nx2PVKMn6dgXb
+Xv9/xuSrIcoz/dQI8sAR3oryRGSkczB1cn6h9o0b8Y56eeKWY1sn91+ObQJBALt6
+eOjvWQKziePe75AnP0wzwxb8bXmCh/pOM8EQEGhzz8+VWm7UAZpn8FMfkRqLMlsm
+HV/ZozR43xEqME04Z2kCQQCtB/QPWKCXT0URQLydE7QY632kwmpvs+eQCIjdzm7R
+oTeyxMNiHPY2rsRI/o69bxdoCs9O0MQ7Xqfc/+LlwmAJ
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/crl1.crl b/lib/hx509/data/crl1.crl
index c6b146d79..698bb821e 100644
--- a/lib/hx509/data/crl1.crl
+++ b/lib/hx509/data/crl1.crl
@@ -1,8 +1,8 @@
 -----BEGIN X509 CRL-----
 MIIBBDBvMA0GCSqGSIb3DQEBBQUAMCoxGzAZBgNVBAMMEmh4NTA5IFRlc3QgUm9v
-dCBDQTELMAkGA1UEBhMCU0UXDTA5MDQxMzIwNDI1NFoXDTE5MDIyMDIwNDI1NFow
-FDASAgEDFw0wOTA0MTMyMDQyNTNaMA0GCSqGSIb3DQEBBQUAA4GBAEatDIJRZ1M8
-WB1trX8btsKlRwOyV3yh0XMflcKFpQjuklgdaLW3VFkGIEcr7plcEKuZPcOOPHOG
-KUxVkqzoQ4oAlKzul1oqdHQPaKvqAS22tYytMyns1Ojf69tGDyUumvSiPV/kTs+N
-tGbM39Nd+U+kDQqJxTndgcd1933t0pYT
+dCBDQTELMAkGA1UEBhMCU0UXDTA5MDQxMzIxNDgwMloXDTE5MDIyMDIxNDgwMlow
+FDASAgEDFw0wOTA0MTMyMTQ4MDJaMA0GCSqGSIb3DQEBBQUAA4GBAIuLgzVXjnTp
+kkBsjVIF8y2qXfrjZEd9QpMR3yJvxFbJG2IOi4yn59B1EJN2RU56R04SE/B2shLI
+Rfxq1CkJDobnQTDnJB+IzpRv8lINT3G+8fDLnFMAak2ellGJcIeR/u+2OfJDJsXz
+keiKEBvmmeNMMkwREDZaLjs++j6BBksQ
 -----END X509 CRL-----
diff --git a/lib/hx509/data/crl1.der b/lib/hx509/data/crl1.der
index e58b93485b20040f9e6c8ef5d1a6f6c4951ede56..fc9751acdbe27986fd880dee2ac9d105fb6b50de 100644
GIT binary patch
delta 198
zcmeBR>R_7SRc~lwVPF&`&TD9CU}R)q1mPNp7zi;jGK=#XSQ?lZ8pA|+**LY@JlekV
zGBUEVGB7tbGIV!0n}+w5yqx5a(;LM4S$9?Jug59wwN8@-?<?gW2|FpB#Mj-k{P~4a
zfyrgAepT*%Lc$-)HVK_@{gZV?lasIQxxJ&oa~1iHb5rs^1@Zb9?)&)R^qgRZEZ=$4
s0y_)ZC;ofC&GM78+R@JwUvvpbKb!g3$H+%ez${A7+U}QKBb&DX0C}%To&W#<

delta 198
zcmeBR>R_7SRc~NoWNH#6&TD9CU}R)q1mPNp7zi;jGK=#XSQ?lZ8iPfRqYQZ2IJMe5
z+P?ELGP1HVFgG?bxUJ=B3QP~SiIB}*TQ9xs&{B8iP2n{QFBZ#BJ=D6C<K3hP*^I5*
zLn7G}+_m4$j1gEp)An$mO>vv1Pw1pIFPys=?5C`GH$6(Lq=Y|X^(#i*ZCiWR8f(6}
x^5XvM+iv`-db7SPvW<V@cfNN^+L`;8V}JTD;pOT)YI(Quc<J}rx0j{~0|4^3O$z`3

diff --git a/lib/hx509/data/https.crt b/lib/hx509/data/https.crt
index c3e66db9e..878652ff6 100644
--- 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 After : Apr 11 20:42:53 2019 GMT
+            Not Before: Apr 13 21:48:01 2009 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)
-                Modulus:
-                    00:f8:f3:dc:92:08:27:32:98:a4:26:fa:a1:11:1b:
-                    a3:0e:98:d8:d4:8f:c8:b5:dd:ee:49:7a:72:49:1e:
-                    31:94:af:4e:e8:a2:ee:11:20:ca:8e:c6:dd:d2:0c:
-                    c2:60:86:72:c4:b4:0a:fc:74:c9:80:3e:bf:c9:b7:
-                    1f:bf:ee:9d:bd:5b:7d:d5:2a:74:fe:64:5a:3f:65:
-                    17:9f:3a:37:21:b5:1b:4b:79:c9:8b:7b:17:c2:74:
-                    a3:10:31:ab:73:3b:b3:76:95:dd:9f:c3:98:3d:e4:
-                    ff:0b:f9:7a:2d:3f:d5:36:f0:fd:0f:61:09:a7:39:
-                    0a:ad:34:5b:95:b5:63:20:ad
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:e1:88:84:dd:9c:66:07:3a:f9:aa:05:42:4a:f2:
+                    b3:e3:93:81:71:10:3d:cf:bb:1c:98:a5:73:66:0e:
+                    96:7c:59:12:d0:60:a9:c6:65:88:a8:cc:8d:14:3e:
+                    10:d4:49:8e:64:34:d2:52:ea:0f:03:68:ba:d4:d7:
+                    e7:8a:41:6f:0a:57:67:b8:e7:bb:1e:fa:47:f4:a0:
+                    fe:84:1a:74:1d:8f:f9:51:cb:8b:96:23:8e:7d:85:
+                    af:4d:de:4f:b0:0e:71:c9:11:79:93:bf:54:9a:d5:
+                    77:48:38:33:4f:05:99:bd:48:61:af:ac:73:a7:fb:
+                    23:e0:54:6c:ca:4c:6c:d2:e7
                 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:
-        49:cd:2b:29:04:e2:8c:d0:9a:f7:9e:28:77:1d:27:4b:a7:b9:
-        f5:23:53:89:f3:06:df:33:4d:46:d8:d0:2b:3c:b9:b2:c8:34:
-        11:4c:88:8d:75:e3:fd:f9:dd:85:20:c0:b1:78:f2:a0:e5:bd:
-        23:55:77:98:ac:85:ca:ce:e2:2f:88:66:a9:26:b6:1c:ad:45:
-        f9:28:01:05:9c:68:ea:48:42:af:d7:f3:b4:1e:f7:47:41:d6:
-        96:19:98:79:64:1c:2f:21:6f:1b:8b:3e:21:7d:bd:54:39:43:
-        5e:b8
+        9c:69:61:7a:19:f4:da:a9:aa:c4:c3:5b:f2:80:e2:e4:62:97:
+        35:92:d2:6b:1f:2a:b1:13:dd:90:80:46:7f:50:22:02:76:30:
+        5c:92:73:97:bd:6c:8d:0f:31:96:b8:28:6b:c3:38:e7:44:90:
+        27:2b:66:e7:99:3c:42:51:61:4b:6c:04:d0:10:b0:6d:c7:03:
+        0b:7a:52:f2:49:ca:ea:0f:c0:16:58:d3:b9:a6:e8:7e:9d:5a:
+        d0:bf:85:b1:e3:26:c7:39:a0:c7:00:f8:30:aa:68:e4:9f:56:
+        22:0a:1f:c1:1e:73:5a:f0:88:9f:32:85:6f:37:d1:86:13:c7:
+        94:62
 -----BEGIN CERTIFICATE-----
-MIICADCCAWmgAwIBAgIBBjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1M1oXDTE5
-MDQxMTIwNDI1M1owJzELMAkGA1UEBhMCU0UxGDAWBgNVBAMMD3d3dy50ZXN0Lmg1
-bC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA+PPckggnMpikJvqhERuj
-DpjY1I/Itd3uSXpySR4xlK9O6KLuESDKjsbd0gzCYIZyxLQK/HTJgD6/ybcfv+6d
-vVt91Sp0/mRaP2UXnzo3IbUbS3nJi3sXwnSjEDGrczuzdpXdn8OYPeT/C/l6LT/V
-NvD9D2EJpzkKrTRblbVjIK0CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0OBBYEFM4BONJFcBWIX83YQRLemZsfsFHwMA0GCSqGSIb3DQEBBQUA
-A4GBAIHOguLvKDxN3EhW58YnErq/3UnNKykE4ozQmveeKHcdJ0unufUjU4nzBt8z
-TUbY0Cs8ubLINBFMiI114/353YUgwLF48qDlvSNVd5ishcrO4i+IZqkmthytRfko
-AQWcaOpIQq/X87Qe90dB1pYZmHlkHC8hbxuLPiF9vVQ5Q164
+MIICADCCAWmgAwIBAgIBCTANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
+MDQxMTIxNDgwMVowJzELMAkGA1UEBhMCU0UxGDAWBgNVBAMMD3d3dy50ZXN0Lmg1
+bC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4YiE3ZxmBzr5qgVCSvKz
+45OBcRA9z7scmKVzZg6WfFkS0GCpxmWIqMyNFD4Q1EmOZDTSUuoPA2i61NfnikFv
+CldnuOe7HvpH9KD+hBp0HY/5UcuLliOOfYWvTd5PsA5xyRF5k79UmtV3SDgzTwWZ
+vUhhr6xzp/sj4FRsykxs0ucCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0OBBYEFGQe83hXzJjZuKRZh5e9ehSz6VQdMA0GCSqGSIb3DQEBBQUA
+A4GBAJxpYXoZ9NqpqsTDW/KA4uRilzWS0msfKrET3ZCARn9QIgJ2MFySc5e9bI0P
+MZa4KGvDOOdEkCcrZueZPEJRYUtsBNAQsG3HAwt6UvJJyuoPwBZY07mm6H6dWtC/
+hbHjJsc5oMcA+DCqaOSfViIKH8Eec1rwiJ8yhW830YYTx5Ri
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/https.key b/lib/hx509/data/https.key
index f31f1be04..2c9359a74 100644
--- a/lib/hx509/data/https.key
+++ b/lib/hx509/data/https.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAPjz3JIIJzKYpCb6
-oREbow6Y2NSPyLXd7kl6ckkeMZSvTuii7hEgyo7G3dIMwmCGcsS0Cvx0yYA+v8m3
-H7/unb1bfdUqdP5kWj9lF586NyG1G0t5yYt7F8J0oxAxq3M7s3aV3Z/DmD3k/wv5
-ei0/1Tbw/Q9hCac5Cq00W5W1YyCtAgMBAAECgYEAjWqZZSrUeV1UAgBk9j7oxSX2
-Jej3brf+4CZ6PSa1q2xaOrQy3+/soGY/I060K/izwSE1DGua+wqqD3/CvVhiqUs3
-xENr2SatvZ3vVun0HM7YsycUcr2IH6DM2BpK5e3zuwAq7RjoBRyn2+Hy1Kb2j5zJ
-5Gl0/X0CBLGCYN01SYECQQD/CWjxdfbOHqM2+I90MJhcJumNI3TIW0ayVqEwnyMt
-4pF6pOPfv8yNpkd2NcN1vgOyInHUvK9UUg+84WtXMonJAkEA+eSRqgSxJSKT0g00
-Svg23RV8eCmxdjsA/hgAKP5ytLZKOEFAjbA+CZuMhneAeDzWov5dfZpLotHapMlI
-0fLRxQJBAM//E6iBxaR7Fi+57f0buNbHIYjrFs5kqra9sj5eOymr82vr2LDd0uzf
-ZL7CwENhkdARCXcv32pMdutbiNiXrgkCQGzALShJnHIlxyDtwCk0NmQmmqGMu39R
-lFAAT+mHOpIslsY+l4JSBd2WhSRr00wAZgRPII6t3GbCXx3Bv2AnBWUCQAQ4tWFG
-quJPsvm1ZL56VOA7Nzzv6yrQhdzRCoTEdWWW39T5E9X50JL1EjkdoopoXqij1NOi
-hMXGe3fG9BMIuG4=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDhiITdnGYHOvmqBUJK8rPjk4FxED3PuxyYpXNmDpZ8WRLQYKnG
+ZYiozI0UPhDUSY5kNNJS6g8DaLrU1+eKQW8KV2e457se+kf0oP6EGnQdj/lRy4uW
+I459ha9N3k+wDnHJEXmTv1Sa1XdIODNPBZm9SGGvrHOn+yPgVGzKTGzS5wIDAQAB
+AoGBAIOAu6AQInmSzKJzQI086OEIUBBh3Piz7F+hESFv3hURRuQTiMqyxzVNV/F2
+ow90+D67getwqGJffZi/bzVxI9G2ahYinXRrv7K9jHGts3Q1EclnBdfq6p/1+tds
+fHa8oLSuGIl1U5nSYd9kbNOAyxGyEElFFHQTkdXDOBWxTiCxAkEA+d7LwAFmO+af
+zE8wNJNlSqVG9Q7DaWkNAOHHDwMN9ub2N8s3x3AWGe/873/DbchvySI1A0D7cz69
+bqQGQisUSQJBAOcQ4oMSs46bVJ8YlCnNEJBfsHIR/W4V55nvCKPLfwOMcxJnDFyP
+/84pSNEQXwMFwvfeaubYv5HwGdAgX3zgTa8CQCQf/O8mhKRWZHYCYOLJCJTxLkAR
+wVjFElc1TTUzaNpwa9qHK+pOnzNiyfvKSfPeTaMTqfxtca0ovfR4DFuWpNkCQQDf
+thZIJuQXTsY4Hpjce8DstuhjGI3Qdn68J5Sq2MvJSMLkb0alm3lkRc5NM1d52qsw
+RnQjuniHN/oV6jHo+lXbAkAy1Q7INSj0kav9vQxZgQpLEEnW4olDY5uo6WnMN/Pz
+fzC7LPbwXsDf1ucIJheJZPQRxu1YHHPfSTiLOsKgb/f8
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/kdc.crt b/lib/hx509/data/kdc.crt
index e69de29bb..64ce12a75 100644
--- 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-----
diff --git a/lib/hx509/data/kdc.key b/lib/hx509/data/kdc.key
index 363d9f653..750897200 100644
--- a/lib/hx509/data/kdc.key
+++ b/lib/hx509/data/kdc.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALsESEK3yU31thaV
-ZAsMqZ7BNKXDubem0oU13WznHFWsxAA+pwsXVlPGUqfJUpda8XSoSyaHP4HFPa4R
-OS8MfuGjFzVofWbxyEFJzwR5ykcytCm2xN4Wa/1evlMvpcN2ysP7M83pZNyEwhf9
-mHteVNmBMC5cMK4oJ4YqVxvTrsufAgMBAAECgYBUUjj2hAEqumewRQlHhh0QbFJ9
-jwM0j+4Ji+DbUlTPOEdjSNxuPsZ4nUn1RuuLPMDzdVH0/DQhIbqOuktLMFogQtmC
-06IWn3IomoOs0wUQmLbkun5aFEXwRJwkIdp8Y86qSrlZRWg8CXF9Pj1NkJTxQhIs
-usUz2QdGdQGkbev/2QJBAN+u9B+VWDsiNyDx3ru1HYBoSb1h81gT5IbVUJ4P0cp+
-yO3B6egWdLMuQiAPpdcNGxommxR+P2JSf531YyB6h1sCQQDWCTFBhGXs0K5uuXn/
-mPuFgpcXwpwf9NwZK1uhW1L9CnUKfCyiTBAB6DIDdXs6ntt+ohui9a7Ew/RB0ncp
-8YQNAkAKYRLg2Ew0yjymobKFIT1SNQSe7gmdn6at/v3zp6ZDcCigp6vT4h7eJZpZ
-5H/8f5YvW3U8uTL1vABB8x37ZtQbAkEAsdO9WsPXsyPGaTQsylGeV9SiGBmWgW59
-F2RQowUvNBFmIKn+o3Eys4LpWrpXAeNOVi31bDVXWR+9Zpqoau7AWQJBALbzRd4H
-I0Dr0lsRMzQoQNNJiGj8q4Sv0vu19vZYkQKe9FzSy670GKa1Ud1okFeqjJFMyvTD
-d6vPv4l3dMiO38o=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQCzSfYi5LvVteShZMEi3KrhN1eNm2/9n9FdwTApf2/x5NlShgZf
+Lu/HOoSaldxvf6cXEy9lUwU8MkZEuO59YKlyOSGqRq05RAF+H+kPktzgptc0ZBm+
+PTvXvwoPf/oGBHSUbXK+1ycSQmZM8qh8Dg43I7SWU78wRp3nq3ISho8iqwIDAQAB
+AoGABjZ26AijFanC7XDPXITnCvze9NJBFDnYiHYsVBPNbkVu3nQ0flHjDzVQ6QZu
+aBK1WJBaoRk6Yjafxrvdz8xssrCun+L9Y4PoZxkpCFz0185k3Vv5MMxwQMMZDV91
+ylXtKZyf7d1XmJPhj9S6otz70VG6hPY25EkLqAeZwOl/yekCQQDpwJMBEDWEtenL
+xjVknzgwbHiST5NWzxc+ZO72U6O+VDE66vFcTxVUC5pDRYtEeRMnY4Gd67qQrX6S
+lCa7AxlfAkEAxFpgP7h2d/L58Zlhc+HQOl8Juy6+nM8jjICNCOYYzwg0Gh7poXTp
+Q1VurcFzXdpR6oY1p/ouXMeYabcyyKZeNQJAPTvFRrIIUwuUg10Y/5L2FTlVHH7c
+ChGV9TJbpwuiCWnku5pwP843uByR/K1rHjTZX6ghfE0UQnIwhhVpT/Qv4QJADeVP
+dnL5f1ektKJkMS1D7T2YlLSkLLjEDUdzs7OFAfHUrhyN8C0z7N347TcJkRTIQ06o
+MXEVIt/FO4YJhAWyGQJAdk9hFZ4AiqM6oJfIfCRz5GknS4gMY4Y6Pck2D5QAQhnt
+U0ASSXngYPq9UJW1lyqJVPDqP3dR3kYTU6EdP8CKjw==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/no-proxy-test.crt b/lib/hx509/data/no-proxy-test.crt
index f7f04a5c9..b8ec0dac6 100644
--- a/lib/hx509/data/no-proxy-test.crt
+++ b/lib/hx509/data/no-proxy-test.crt
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICDDCCAXWgAwIBAgIJAMJEvwnR1+2ZMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
-BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjA0MjUzWhcNMTkw
-NDExMjA0MjUzWjA0MQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MREw
-DwYDVQQDDAhuby1wcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvEtS
-ZniMPYU7vhYo8a3796uB1WVsQbKfWzUCCkszmLuI5SHCGFVRAhTqB0PJlWVdfQoe
-/pY3LrGjEkzDeaW1I5ipcOsMkJYvvtcpjJkIJOoyRQWPF8cfNy0eETVrguNAQd3g
-5Xzb59ATokfhcRXVL66MOOm6KkBWt1X9Zpw43pECAwEAAaM5MDcwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0OBBYEFCJ+fNoTlqeJUQ5qyR91m8dhZ+oBMA0G
-CSqGSIb3DQEBBQUAA4GBAASGJez+cKEK34j/L3Dt7HuWYzEaBoKAYGY+DKkj5yll
-SZtvWEAmYbs3n+c0Fkg0vVf/M9Q9rDPwmtAJ/zu5qO79pPxs3HDnvjKD9vh4oLc5
-5oc90Qm2HaHAwJmbBXgDpGx8xpJ+aoMl7zZYvTcK5HFIJFkNjUmU5cESFUphg2HE
+MIICDDCCAXWgAwIBAgIJAMJEvwnR1+2cMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
+BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE0ODAyWhcNMTkw
+NDExMjE0ODAyWjA0MQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MREw
+DwYDVQQDDAhuby1wcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6fW3
+th+tIlkuLd0ovmQqumtF4PZqwWp724REsdfVW4CMmnYm4WeI9isI+1KVgUFpLxKP
+KjrnYPmgiGRGpYTiRxzjkZHJfgZwtCQa4SV0V81iuhKBVwfIxT/l6GSioZ6Gue2q
+WcHnhM/vJQtNUdBeUdEexJkx/w7Zsvk7fI7kZQECAwEAAaM5MDcwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBeAwHQYDVR0OBBYEFL8+ODIOT7HCsmqZgNXbHGgH0waAMA0G
+CSqGSIb3DQEBBQUAA4GBAI9UWIUZIRCJGajoPxU45IbrwabILNZX4Ue1oYAowV9z
+2aniOySf3o6nPZsQCYJrCtyTy+1uS7HUiC2IdaHUJk2GWXx0PckwyDGhUyy3kKS3
+spmXjLHq0/sb5PIyj9egHlxCfPlWy9psCQIyK2EkOcR6UjXi3H3SAHjPYlIEUeHb
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/no-proxy-test.key b/lib/hx509/data/no-proxy-test.key
index 6c9b0eac7..3a5facb22 100644
--- a/lib/hx509/data/no-proxy-test.key
+++ b/lib/hx509/data/no-proxy-test.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALxLUmZ4jD2FO74W
-KPGt+/ergdVlbEGyn1s1AgpLM5i7iOUhwhhVUQIU6gdDyZVlXX0KHv6WNy6xoxJM
-w3mltSOYqXDrDJCWL77XKYyZCCTqMkUFjxfHHzctHhE1a4LjQEHd4OV82+fQE6JH
-4XEV1S+ujDjpuipAVrdV/WacON6RAgMBAAECgYEAsgmKRSeweq8SmR584l+/AiSh
-o7O9k7UgZm4NmswWYlDYFMdBrh5ldVFvIyVeYqswpX0/ZzuDu9vss+3vWoNrbDh5
-YsPSiF0Wuq5a4hin+8XlETbBqMTgMSi5ApfKI8ATiRDLrWYdUZpDxqwcGqciTkve
-sXgX1l9RX09iP9JUIx0CQQDkM6RMKUYhR0mbjMOT863H5BZZRpRt9cMOjxrDtruW
-CSn2PKkDPCi/f6+vZgyY/BM+M0ywpdOAJsy6AuOQrIMPAkEA0zsvNR5srV6DUN2E
-AFMWw+lb8qe5MDvmPrcawzyzuhnTwCTXNQOBHVI6cC7JwF59gFwsMRvp41UmDOp1
-A1gEXwJBAMUqmVn0j1NRdJehF5pNgGik+WpJQRWAsfdyTX2r9Ie9gzPtVVomME7E
-09aIJXpI0Zd8W1aE8ChZXamZtWTaqKECQCq6eSUsn10+lh+gf5g1NpCwvtnKFcrt
-AvlCvtYpjE2j9dKTYTknGVIeFRYmUMdqFccGXiYc+GX1DnpkXwErJ88CQF01ruzY
-BvbcMbWiaYD365CKej4h7DdmLHuFjGm2CwyKpat2sA9f8d6cL8OojB/AqJOTye6G
-w7FNZBkAanu77r0=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDp9be2H60iWS4t3Si+ZCq6a0Xg9mrBanvbhESx19VbgIyadibh
+Z4j2Kwj7UpWBQWkvEo8qOudg+aCIZEalhOJHHOORkcl+BnC0JBrhJXRXzWK6EoFX
+B8jFP+XoZKKhnoa57apZweeEz+8lC01R0F5R0R7EmTH/Dtmy+Tt8juRlAQIDAQAB
+AoGAf2xy6GCMPX7w5c3kWP3ZP7sZThMnxbwnRUHe4DW7YKC884uSVYW8VMbPl4I9
+Jy7nCNpE2y1Fw81xn5dt2sxrKGF6gPaJBKMQD/aeOtS/tTNmLbCdRo/Qo/I/w6MV
+rf3qZvn6CmRX5CqZSV5u9BU8WYseCbruCr9dFD1wLroah7kCQQD3zO9oYGNySNHK
+sfTRiKI55WRpgFEKe2hd78Fdo6nBfC/yeSB+VadGmLePamMxT7fbB2Yz+PIKRJct
+U2IXlp9vAkEA8bOKeNzo+eElVOAvMXZU3CWrcmOPK0fp7BrcJRDys9Pd9qb43szU
+nGP7rfH5tT6MXerPSo8IMCzxuK62FWkKjwJActXLAMDidRzf9CIiBVRfcZsnvGiV
+pdjo1dd88csdqSfHBIQzlbhV67ZsIo835qs91cgJCf7NFAsTUBL7O1k3CwJBAOe5
+qliV8wcexBvLk3Nob5Ngyi6xJOHp4GtslQM0bHvb9EI1cwSofG4zrWfnRfBuN0UT
+igmBd+g4LsdROWDthCECQQChetAFhke+8s1Htb9WelaTHeqa02yXJhUcg9YeNSe4
+kXd7VTHOOOlxtSU3+uIq9wkeGl0sSIbQaLK3AqExSzK6
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/ocsp-req1.der b/lib/hx509/data/ocsp-req1.der
index 1cbbbec05c15eee9b84f290d7a05ed7afc733069..83bc6c41eeaa7898cbc0d474ae62dffb48790fbf 100644
GIT binary patch
delta 45
zcmd1IoS-WbX!B&bfk;ni$yAw$tWU>Svz9;pIMGo;;Nf$DoOg<I3nSy!+7)N)TLS>W
CVHB(Y

delta 45
zcmd1IoS-XGEyJ;7^1WpyKO+8XMorgYKPF`Ld!nO+z{QS?6M3D}69b)cZ(c~9H4gy3
C2o#e5

diff --git a/lib/hx509/data/ocsp-req2.der b/lib/hx509/data/ocsp-req2.der
index eb710a660881e5b956d96937ddfb64fed54d3058..756ed2f639867ee0d09ab8226ffc7695e292f343 100644
GIT binary patch
delta 45
zcmd1IoS-WbX!B&bfk;ni$yAw$tWU>Svz9;pIMGo;z%1<6^8CvJU8}QhT-CU|QxE{Z
CmlV_h

delta 45
zcmd1IoS-XGEyJ;7^1WpyKO+8XMorgYKPF`Ld!nO+K-;McX-8_R^>cpl^ZrU-wFm&e
C4HR?$

diff --git a/lib/hx509/data/ocsp-resp1-ca.der b/lib/hx509/data/ocsp-resp1-ca.der
index b282309d1f346d57df2408a1d86f70f84db4d4b4..956e9f67bea0f0abdb934b649701500dab4d00cc 100644
GIT binary patch
delta 642
zcmaFP{+xY69IK&;g@Mt;WUcx@n<vW+M0!F?rpiQQeLBXPwfyl%CPt<P1_^#60|QF~
z6GLMou;QqN$_9!C@@$;iY>cd|>;{ZXEJ7>-51$L<yi=T87#X+Lt~g`g8UtQ7POUbN
zw(q=*jI68-%#Do<ox(AJvJ+dCbgEt4KPtK%-5<C5>(0cMW9Qo1Sml#1u8exvKXaFl
z$#!S|V~5XwJi5lrj%SC<a)BKmJr7LX=Q{tN+sUc29wsYi8&7nWPs?giFFX;VzeVSl
zozvEZe<I?(uiH@3vt*+Gagq5s>QWX{Gh8PvYKfHM%X#=J^{{!nfWW@q$@z>D9P|9=
z&(zl1RXe$#(M=TOA%iG!UPF-o48i_0h?+c)QFpR9lT7^{c~7lRH<dQ{eYxOy`a!$-
zu8n2~5{0L~)V;eYJS^sP*ujU6D<3IZt@TlhPkpX3`R($vi;rA5zOd`mx#aZ%we>3-
z@91=^bTMCebMuUPtxca;A(OK5@z%-hJ67_|^w7?;Y0dhuc<$$x;}`2JdUj>X_$s#N
z`fD_`ZT4|Diu{)G%Eyw4nUR5UapO#b#%Tt!Y|Npud@N!tBG_WeAPOX{%o1!6*nm~R
z<bO=Y2)|o0>(wtxp8DYFV)y!H@uaKzG7<CsMDez9l-*n1wc^25E52=_Gpy2A`q-_=
z<_z&T$o8PmX7{>d%NBi3QvX@fZa!I-yHso2gP142D;n&4OIB%p5xF51wR`RTs}rt1
vn7HGdgu}6Er(Uz}76_d#D#2c%A3dG($xWYSwJ$;%FYmmf^kw3nLdLlO%U=&`

delta 642
zcmaFP{+xY69IJtek*UeVWUcyY8IC2B?=3U=5%FI$YPt^lF(IqpOpHto3=;fC1_qV}
zCWgjFV8u}jl?@aP<k>j2*%(<_*$o((ScF&vE_P&`$m^V*80eIH^Fr#Zc?P^}oLX%j
zZQpqr8Ch8wm>U}z*bSN7<39dLf2Z+kd6VuJ1BUR;Y8(x|TyilEwYAB)Nw%wg^Yv>p
zy$HJ&Vz@!|@tafU{>a|B-RxAn`if8d-tW^7{C=|R#N)_qhLveSfrZ}h0}juA_*>51
zcj@Pk3Muou6Q}$(c=+?X;g&UjzD~QIQt)i1+7_8Kzjqrgv;}tB-|1gzIys+Ff@9XH
zb&?uU?guCLGrEa_JY*Cl&T9zrpCQ<PMp2XJG3rhhXOgL3X85DL&Fo85_WjHYubN*N
z<xNswfA71c^uss(v-fV2XYhEgwK{b9`s7KsT-`;QUafc(wEMr&F-56)d-FDL)wuA8
zA^O-^mbAGq{hseLd!L|Q@~Z4w!)kr)ZyUCot!Fu`;pO!AE$@^J!Jv$njT^GFW1MwY
zoZ9vyQzO3b$eEHyw`zTsGchwVFfMMKY0x;$K$eX;RF;oLj70=nOc_Lhq?K8M4FVgm
zDwzC_$r#~xOJ=?L8Ol%oT2!RlWFAfG?#^ZZP$X8wb(<$+o!<7Ws~4C9KO2@Q{wT}r
zEzPnnpSfzS%%o4ZXWW}?%)0FJ9excPiEgImKSx&Yp4w%%S$o%hkBxa6RX;rzOb~qZ
wb&{pAI1Afe+pEI;J8O>z3zpd#-SL~Ax^vd+N5A-2ly|vR8qQP76=8e}04jwP)c^nh

diff --git a/lib/hx509/data/ocsp-resp1-keyhash.der b/lib/hx509/data/ocsp-resp1-keyhash.der
index e8c69cf495b40bee65830f3a037f3e19148aaa49..2db50c194d71cecb6b4956e43eb37dd4caf34d78 100644
GIT binary patch
delta 560
zcmZo+Z(*OHsp2gxxySh#Xa3&zTMkURIVY%X;r8tk{6+=_mIfw<#zuxF76wKWeYG?L
zZJsPQ5a|gmnJN>J_30RE*7C<6nHZTG7%&ts5EFR#Tp;J2;@rZ>xV3i08T-~u{>UU;
zzpsR$C5l<Y`TNhAJ2@}vNBbMLG|Z?lIip;wbMj88=fSe6Zu?Bc`83*7FP}KK=l;yh
z2>*o7-UbWvrT00hR8OhZ*>N~K=D^MCepgoR|0u^V+RJfq?!o)3b484gJl>^ZwMR^R
zWt7<kLr+Ilb-{nuPk3fDzgs?My2qtb-sCqIe=KBtI60CrP6Xs3gD7!cLy-Rr!TvLt
ze45d%{%mCNBz?xj3$?089gSV}XY$&xG#x0}TD|IGO~rFb<~pSd=_?=A8RtCywLmFX
z`q7u?H|Fg>Sbk~Q=Q?X+w%sQ>cNs_32G3YG!$Vte{|0M!McJKvp3;9N*gu%!<ZxG{
zDtwwclbUS5-nnS$B(<{z+pqWMsdTSgk<YGn<f_A>-n)##lP5Cyh+vBjaOkys5$Wm=
z(=qUw>n=HQLBhiLMxmoWqYpX8?J;rA(S18#OVTeX-v0aHZynwGi~G(@n$W5ft$LdC
z_@!pO%eK;1lPcD#Fr{gqKU-Y*P=CS6jXDd`m><hFd}g1z$@c_Tq)RFLxoQ8uDY48?
eo3?miZ`HzOug+>nhR?dO<yKl{{m~`jjJyCuk@jc+

delta 560
zcmZo+Z(*OHsZ#JH;c;Wtf~P4P|IJN^7kC@JUCCO4-^jqg(!j*f*vP=d$kb$_ua;)D
z49Akm_m-Lbi1@D=HC>1On2^<PCPt<P1`Ndu!~`yOWSq$BoSqoylza0+>a2N_KQal|
zr>=T`zU8XKvIC`gYem0LEAg8)<?v_sck2oc$kzv(G?k{WyLY;N#SiuCO%o)GV#HUx
zkTj@TW>O@up)>fr>1+PT4)&0bGnK0&8t&e<*(Y}Lwq8=@EY+_wrStAin6TJ^QPA<@
zJKmy4ZmMmYg1!IWUG%d1thi)waQun)Pcqj#r@JsNogB#+Cj#=2QIt5ZA;^D*VE-9S
zKF#P>zxc4ewX&h)YboWMCl_ws^?vHS?oaPuSvKs+eBWdru(2`8Q7dG(ZeG`h9_zna
z{yDa%(j&SRe`arc_KBm7%j5W*67dWso8B6cy?WlSM6Tra8MmEDd_J-A(p3+O)#udG
zlIok}zRzAckB8GKN8jbdop~~MC0Si2JefH6$2E!UtTT+(lP5Cyh+vBjaOjz@zPPYS
z^01)AlV`JKLbK;{Crsf|JE>4tJMU|MmSLJVb89E3>b5H`Zv_v&=Y45&hBf-o!HB0t
z$|-J_z8rmeq~O?fWj03Xo4GPGWhDPJe6n85e(RQLlgs;{MQ^7XG#`7a@?S!@$2>;7
eytDZY8`Ck)JxRP}w<lKcwcK`4+V;4M(G39k===Ww

diff --git a/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der b/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der
index 0f0e47a7d5370f1898ff9eabd04594113f3bdbf8..9dac36734c8107ec0ff87ab7bf4a191c3611a49b 100644
GIT binary patch
delta 243
zcmaFO^qOfx6sw_$g@Mt;c&++Cn<vW+M0!F?rpiQQeLBXPwfyl%CPt<P1_^#60|QF~
z6GLMou;QqN$_9!C@@$;iY>cd|>;{ZXEJ7>-51$L<yi=T87#X+Lt~g`g8UtQ7POUbN
zw(q=*jI68-%#Do<^=J0~@_SaHY8sLHwqw(V*5&J8l&>qdI2N-x+o~x!eEH*h6E<FZ
z?#_Pi(lgy!`PrKcJaXn~ujjjSx_o}g+OUZ3<FEP-tMYm@9%#Gv=X9}BfsNI-)rso@
we!5gH*g4ZKakZa*-6i$u%39^h&wgorIMuC`(V4s7!~N1ZZbR=<$sUDQ0D<mg9{>OV

delta 243
zcmaFO^qOfx6sv)Wk*UeVc&++s8IC2B?=3U=5%FI$YPt^lF(IqpOpHto3=;fC1_qV}
zCWgjFV8u}jl?@aP<k>j2*%(<_*$o((ScF&vE_P&`$m^V*80eIH^Fr#Zc?P^}oLX%j
zZQpqr8Ch8wm>U}zCOzV5TBjV$RT{jQKgc_;Hjg2aFH~h_ma7D_(%a-x{qULoy}!Mu
zsxD(*lpZg?{QbF%Df&;Jy|67gBtH3@nl#6XT!oI!JrmuQMs8oh6|$nw&S>@D4<92!
wRwm6@&i!?Iw6OF2li3zZTmQMrzp_l4wRZ26g<7`qPus6INao40tUhiE0JP~_d;kCd

diff --git a/lib/hx509/data/ocsp-resp1-ocsp.der b/lib/hx509/data/ocsp-resp1-ocsp.der
index a8803f7e27ada5d6b74c6ec02c0e6d1cd1cd56aa..7771acf464bf4c28cf753f316e5f1dd0206ff5ed 100644
GIT binary patch
delta 575
zcmbQnK8<}s6sw_$g@Mt;c&++Cn<vW+M0!F?rpiQQeLBXPwfyl%CPt<P1_^#60|QF~
z6GLMou;QqN$_9!C@@$;iY>cd|>;{ZXEJ7>-51$L<yi=T87#X+Lt~g`g8UtQ7POUbN
zw(q=*jI68-%#Do<^=J0~@_SaHY8sLHwqw(V*5&J8l&>qdI2N-x+o~x!eEH*h6E<FZ
z?#_Pi(lgy!`PrKcJaXn~ujjjSx_o}g+OUZ3<FEP-tMYm@9%#Gv=X9}BfsNI-)rso@
ze!5gH*g4ZKakZa*-6i$u%39^h&wgorIMuC`(V4s7!~N1ZZbR=<$sUDQld~D)L_mHp
zh!W>D1bN92>?MQAcNyL4&qfwc(q~M(P^)^>(b!dgCa(=k(}9w$)vGSnR6Lhtu2Z^@
zzVcC>an9pk3zTxDAANa#W8VIQ<(HOyuCq2~+kK*QmvK~W@QigcJhTP(Z?JY(l-<ea
zDg9@H{evk^4tGVW!l$V-smb>1or{)EQaf9){d#|%O83eY`Rr;(t~xC0y~`*(c`=hu
zy|=LB9_MGA`Fr1QIWXzwoS?Ra+qYv0%a$)9UHxG?20nA$B_}ROSQy_Zbo6KRA;-8q
zCeAs!Z|7@C`X$BNe?R=Kqg#J*-<e4hT6LmTPjeo>)U0>eR@!P(#ab1nH0|?eiwhs>
zFF3hTXF(eCW7&q!>>5)y`JUj4bSY&&H|_s7C6@VV(-tr6ty;M3)maV6@L4yu+)Asg
JKe|Mm7XUva^ppSq

delta 575
zcmbQnK8<}s6sv)Wk*UeVc&++s8IC2B?=3U=5%FI$YPt^lF(IqpOpHto3=;fC1_qV}
zCWgjFV8u}jl?@aP<k>j2*%(<_*$o((ScF&vE_P&`$m^V*80eIH^Fr#Zc?P^}oLX%j
zZQpqr8Ch8wm>U}zCOzV5TBjV$RT{jQKgc_;Hjg2aFH~h_ma7D_(%a-x{qULoy}!Mu
zsxD(*lpZg?{QbF%Df&;Jy|67gBtH3@nl#6XT!oI!JrmuQMs8oh6|$nw&S>@D4<92!
zRwm6@&i!?Iw6OF2li3zZTmQMrzp_l4wRZ26g<7`qPus6INao40tUhi!Ih!#~1mp*!
zC~;mxke3X>UNV||m(i_$@nL;yWkbo=Qpz_^F5JB9{nUBgpWeT+Y}k|ezR5mdV`Gw|
zR>*GMysiyB)_=A9b8JtgM|3Ox%-;6w6Gt1D$MHEO;u%afy)`0x^}Jt+T*>V-Zab6s
zd}8ILs~#4s&#9#))i=p~pS^M(52sU(zRQU_^JMNyvbs!oGI8#YYZBR6XBe#~FJ|(o
zFL;vhxUp)%)0B<><|f1oyp7(jWQ`>(%~xMs*d%#a(BjFn*)pNo^SKkIaH*YCsH>g#
zwLi-+&6~NklT&ru6_>Yy2jBC)v^m2Xedu7s(<0>*w@Y7+K0Q)!?7A`=qx8*OnVB+@
ze;PhnFJ`}W%e2Ymy++WYw^I$8k3CiSFCpAx9wT1f+5Co$=@{ppB;K;y6D#;yZaXM#
Id)(y)0BPUuQvd(}

diff --git a/lib/hx509/data/ocsp-resp2.der b/lib/hx509/data/ocsp-resp2.der
index 6058fe8689577528107f60c809e85c194dd5ebd3..9be7a443cd0a757b53b18d66d530b7d1ac212226 100644
GIT binary patch
delta 603
zcmZ3^zMOqR6sw_$g@Mt;c&++Cn<vW+M0!F?rpiQQeLBXPwfyl%CPwCkf)e~j1_qV}
zCWgjFV8u}w0t=N56b<CrIJMarSy|Z)7@1gvSOm<%ZY|HhEYP(&>&8`$%R2=Pc-c6$
z+C196^D;8BvNA9?HZq*-;=EYal)QIgj67%k!*{Y5G(F~A>qza9khA&IroQeh*M-Fa
z2^oEr0n?VA`mL}<^7Bs1e#@^y>_R-D-TuWcoPocC&Dr^c<hCW)@EleZ`15|x=4*Zv
z8rDtScv&gujP&I_jOjLOeUdJ(iVKLgS@ykjTKPVIef!)vxAVct3zvH4iZ5tlQa5N~
zQZ{H}n%vG9ECTYML6kVJA;`OiVDB1Ce#hume>Spsl0IYNg<934j>fL~GkI-Tnhum~
ztzLDprsBCIbDh$K^p%h5jB_6UTA-9G{pic{8}s%bEWfnubDgy@+wK#cyNsi1gJ-Op
z;h`<Ke}lEVqU=sSPw77s>>o^Va=0r}6+TU!Nlmt2?_9KWlG@pV?brMBRJvEL$Y)nO
za@Ao`?_EaW$y=Cw>b->}_c%Y}%-{Qd%YjKZ=LEGa+`b)4u(o^=>FN*DG4Pq|E;(^Q
z!ov7Qp`$;e4>`u|F>%h(eLG)E(l06A{`=u?9o_ni`_4?7(5e%ydYbe2rDna$w$fIU
zD%PqnrD>l(TU_{1f5FL(It$X6AImm;X4jay$@c_Tq)RFLxoQ8uDY48?o3?miZ`HzO
Vug+>nhR?dO<yKl{{m~`jyZ~H%^Kt+H

delta 603
zcmZ3^zMOqR6sv)Wk*UeVc&++s8IC2B?=3U=5%FI$YPt^lF(IqpOpMG61ts{63=Av{
zObm^UK#Gl{&;(4P7AhMk8pyM8YO^u2va%a6GO-A;2(+ELkanb|T0iF(Kku*fRf`OG
z**LY@JlekVGBUEVGB7tbGK6QYd&07RUQ?;NePaDLQH{6TYF!u0>4~1v5I^*TU(q~h
zZRSDki)t2MrspO~S1hPp$20kaLeYncl~Mi-P48U=n$EYE<*%8cbG}+`p7GHo2fiF<
zn0fNb(+Lk$|NFiE(ikrt%k^7q+m_zMZNYJWBIW)w*{=C|DB|nl!xw)aecS5J@OeQK
zle$3@ld?e*)8ux>U=fi2jH1MO4ME;D1bf$L@;gSi`o)L!t(6TWUrQ<9Jh^c5uJ=>t
zb$@#Q%Ccck=KCi5fQ^kwj#?qRb@RG5^jQDZ^3Sn7l^)Tp_%nOkvrimtTpq{gl!#|A
z+4R<k?A7yrC2}RV&$#VO;`51>m#%tPtUjlfmQ>#)_kH%tc|4p>Ir=Uq?#z?9E6M6I
z;mO3gKdwn+XPsfRp1g(0r@r7x!sEuO1y55p{+pW+FYq>cyOK4QU^QQTabc6>VL^*0
z&t}VnX3ytNn8KxYQlYMP-q-#t!!&Q^)=o~<ZC7003LbpV`_kqNYxJRm5l@ShQ`|0n
zIr{WS!LjSgY>d)3b7f}ANd9T~WWAXE)-BT}m-iY$i{4H(Xg>B-<-de*k9mxEd1vz*
ZHl|~ody;s|ZcnV>Yq{;9wC!=18vtJV{7?V@

diff --git a/lib/hx509/data/ocsp-responder.crt b/lib/hx509/data/ocsp-responder.crt
index 84d3f8254..190c7cbb3 100644
--- 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 After : Apr 11 20:42:52 2019 GMT
+            Not Before: Apr 13 21:48:00 2009 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)
-                Modulus:
-                    00:a3:c3:2f:3b:23:31:19:eb:1a:23:d9:c9:a1:b3:
-                    ba:ef:95:9e:8b:f2:ef:ea:39:80:bc:69:ef:82:3f:
-                    50:b1:81:62:41:2a:54:bb:2d:6e:8a:b0:8c:3b:fd:
-                    2a:4f:6c:3d:ca:67:58:8b:21:f9:6b:b6:e6:f2:08:
-                    86:0a:48:c7:9c:74:17:68:02:3c:8d:7c:14:bd:2e:
-                    4b:ea:14:d4:6d:8e:33:86:cc:61:e7:91:79:d2:d5:
-                    48:38:ab:ce:26:66:62:7f:82:1e:f7:9b:a9:9e:0c:
-                    09:42:6c:2f:44:c8:dc:9e:1c:dd:19:05:44:90:e4:
-                    91:9d:f8:d6:18:6b:6a:cc:3b
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cd:59:73:92:2f:01:61:d0:7d:25:c5:41:33:45:
+                    2f:99:0d:3c:04:82:c0:74:b5:7b:aa:d1:7c:78:e7:
+                    19:03:7e:22:d0:67:a9:e2:7e:33:6c:e3:fa:a0:22:
+                    6d:1b:e2:f4:e7:d8:9e:bf:c1:77:d2:a6:f3:7e:3b:
+                    33:06:bb:c8:89:ba:33:5a:7d:53:98:ae:98:48:2b:
+                    11:bf:b0:3b:47:21:1d:b9:0e:49:1b:fc:90:3f:e0:
+                    94:42:40:dd:14:7a:57:96:27:02:26:1d:8f:2e:ce:
+                    5b:1b:62:26:cd:70:b7:d7:8f:6e:24:8b:a9:a8:6f:
+                    07:26:c4:d5:40:a2:8d:dd:13
                 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:
-        94:0a:26:c9:20:7e:7d:9e:f5:8f:6a:31:66:4b:03:85:89:09:
-        25:b6:d4:44:ed:11:c1:ef:0d:e9:3c:cc:05:5b:c2:c1:58:e5:
-        72:23:64:46:d2:f4:c5:e5:c4:70:c6:d7:23:06:01:1b:d9:6d:
-        1c:99:1c:19:fc:80:f2:3b:a3:07:da:da:35:82:44:ef:52:a2:
-        ed:95:30:83:c6:e5:24:ff:18:13:8c:37:5c:17:77:89:83:ec:
-        06:02:c6:09:bc:62:0d:76:db:91:78:0e:84:db:40:22:b6:e3:
-        8a:46
+        84:f4:14:8a:8f:56:2c:30:4c:9d:47:19:91:a0:60:a1:5f:81:
+        12:c5:f9:5b:c2:41:5e:bc:34:43:6c:2d:ed:9f:2a:19:4e:62:
+        5f:3f:f7:c3:f6:88:8b:2f:a3:8e:cc:92:90:85:2c:5b:25:cb:
+        09:c7:d2:83:2e:d3:3d:1b:3a:92:78:ad:24:02:66:2b:cf:cd:
+        73:71:e1:2f:a0:c9:b1:2c:a0:66:03:e3:1d:80:f3:07:95:b2:
+        4d:c8:0a:59:44:75:07:ce:96:ff:f6:22:04:9f:66:96:a3:a1:
+        8d:7a:a1:a6:ea:cd:28:19:57:9a:d8:b4:da:66:79:7f:c5:a4:
+        17:0d
 -----BEGIN CERTIFICATE-----
 MIICHzCCAYigAwIBAgIBATANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
-MDQxMTIwNDI1MlowJjELMAkGA1UEBhMCU0UxFzAVBgNVBAMMDk9DU1AgcmVzcG9u
-ZGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCjwy87IzEZ6xoj2cmhs7rv
-lZ6L8u/qOYC8ae+CP1CxgWJBKlS7LW6KsIw7/SpPbD3KZ1iLIflrtubyCIYKSMec
-dBdoAjyNfBS9LkvqFNRtjjOGzGHnkXnS1Ug4q84mZmJ/gh73m6meDAlCbC9EyNye
-HN0ZBUSQ5JGd+NYYa2rMOwIDAQABo1kwVzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAeBgNVHSUEFzAVBgkrBgEFBQcwAQUGCCsGAQUFBwMJMB0GA1UdDgQWBBRw5GDj
-gXqg5WSx/p1gXxDtW7ciOzANBgkqhkiG9w0BAQUFAAOBgQA3q9GhghnDETjk5psc
-VWufC2CUCibJIH59nvWPajFmSwOFiQklttRE7RHB7w3pPMwFW8LBWOVyI2RG0vTF
-5cRwxtcjBgEb2W0cmRwZ/IDyO6MH2to1gkTvUqLtlTCDxuUk/xgTjDdcF3eJg+wG
-AsYJvGINdtuReA6E20AituOKRg==
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMFoXDTE5
+MDQxMTIxNDgwMFowJjELMAkGA1UEBhMCU0UxFzAVBgNVBAMMDk9DU1AgcmVzcG9u
+ZGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNWXOSLwFh0H0lxUEzRS+Z
+DTwEgsB0tXuq0Xx45xkDfiLQZ6nifjNs4/qgIm0b4vTn2J6/wXfSpvN+OzMGu8iJ
+ujNafVOYrphIKxG/sDtHIR25Dkkb/JA/4JRCQN0UeleWJwImHY8uzlsbYibNcLfX
+j24ki6mobwcmxNVAoo3dEwIDAQABo1kwVzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+4DAeBgNVHSUEFzAVBgkrBgEFBQcwAQUGCCsGAQUFBwMJMB0GA1UdDgQWBBRLExm8
+Q+YJb73vtMCS2ZxShqG3tzANBgkqhkiG9w0BAQUFAAOBgQCE9BSKj1YsMEydRxmR
+oGChX4ESxflbwkFevDRDbC3tnyoZTmJfP/fD9oiLL6OOzJKQhSxbJcsJx9KDLtM9
+GzqSeK0kAmYrz81zceEvoMmxLKBmA+MdgPMHlbJNyApZRHUHzpb/9iIEn2aWo6GN
+eqGm6s0oGVea2LTaZnl/xaQXDQ==
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/ocsp-responder.key b/lib/hx509/data/ocsp-responder.key
index 0346ac15d..203b875ee 100644
--- a/lib/hx509/data/ocsp-responder.key
+++ b/lib/hx509/data/ocsp-responder.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKPDLzsjMRnrGiPZ
-yaGzuu+Vnovy7+o5gLxp74I/ULGBYkEqVLstboqwjDv9Kk9sPcpnWIsh+Wu25vII
-hgpIx5x0F2gCPI18FL0uS+oU1G2OM4bMYeeRedLVSDirziZmYn+CHvebqZ4MCUJs
-L0TI3J4c3RkFRJDkkZ341hhrasw7AgMBAAECgYBPyn5s1gzKkB7AcREpVKU0rzX9
-AnWbLkFnjEZCtA7hLiVtku6N9OjzcmohoIzI/fhtckVWJUueDBQiwbxtrmBzNsa8
-vgaBJqS7KtLZv2YwFV/WK+VI9D+t3KSV/Qm/azdpaKkVD6Uc//M4kRB5f65RL9oK
-cxfn7kQVaHMUlxZdQQJBANmpxMVuwSANsTBE1R3rE7NxAkcJgVDkzzu+MTFBhbS3
-wEOmI3uRiRb4Mak8mlP0EXOwf8NaW2gteWdylcL1dZkCQQDAmxUCWYaaIOEWtDaW
-AIpYVt5YjOuUTpNTnGpMud9IhmBzNEDMaS1SEADKDwaOHY0Xp7jNrlh0cCvHa2xB
-0QzzAkAsE3O0IyxaaEtkIdwiFdNEd/LlHaihD+RjDa16cvE3WipFyKPQxvTCwPmV
-cp8xtu+9xJTqoyZ1XxgBebOX6gqpAkBLPorHnzgBkKS+3OqSUWW6uz0j9PG3v7a4
-rFuu29KKH80gVKKX+OL2sz/LsHEMJilPu3tsBxeRbZz8zE+/qq7XAkA431Gs3hka
-7QPKNkJPZp8U6DRwkoeH5/gwcx2ugzf6QaqxgRaWCLgaiwWEd8uo97UmbROuu+wg
-wEsncFwd3TNG
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDNWXOSLwFh0H0lxUEzRS+ZDTwEgsB0tXuq0Xx45xkDfiLQZ6ni
+fjNs4/qgIm0b4vTn2J6/wXfSpvN+OzMGu8iJujNafVOYrphIKxG/sDtHIR25Dkkb
+/JA/4JRCQN0UeleWJwImHY8uzlsbYibNcLfXj24ki6mobwcmxNVAoo3dEwIDAQAB
+AoGBAIp1fwyZLyhh6JA4IY9NXhunpckw1E2dNMZnu7LVt7L4MMcuroiuKUSJr6qb
+q8/6xsEw+VE4RO+/bDy3897dbQfjVuNBYxQ4rpVlG2SfpuNIuRXEYBj4bMTH44pf
+44NUG1Bd81kJ5SRFS3d/BPX+jmz/uTy1mx4Gmy0viqf994XpAkEA5pXByoFFg6DP
+xLM3LgLpuPVy9fkg0qBIFRXRcXQDzwyqScwtGmhJB9PcN1Ju+mLOJgeLy3Nuqeod
+a6XfiDi4bwJBAOP7pDPRqTGiygvubEQebbwQtyYDrPOHOtBRX4JI7ymy3Ke5FLPu
+8GvKF00B4wh1uaGhD2SFtjqeITfox3MNz50CQEblSJ4wvOTJrtf1mkOlVaMupFgI
+bxUTftYszSaq2vjwFfN2uW9jHQExHIZN7B1D/8oli8/T//RyLPWKHH5PojUCQE4G
+7BYIJd4lFv2qZkeSGoCJQAW0sFbQ66Isl4GhsKkW3EpTH/DNUF+z1PG4OZnFoPje
+hMQkt0+smzXlZ43LJkkCQQCbiSeRyXQ9AsjIPJZjRspvBaiHllR79Ye2GSI60s0a
+mbWk5ZGIZTQQwm9ZjggX8KzSsaZt8Rk88yrGLx+eZeNm
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/pkinit-ec.crt b/lib/hx509/data/pkinit-ec.crt
index e69de29bb..fed34a97b 100644
--- 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-----
diff --git a/lib/hx509/data/pkinit-ec.key b/lib/hx509/data/pkinit-ec.key
index f5be5c56b..b06b3d7e5 100644
--- a/lib/hx509/data/pkinit-ec.key
+++ b/lib/hx509/data/pkinit-ec.key
@@ -1,5 +1,5 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0rL4tO/Yub2W7Go5
-68zwGmCggVGFqWW26oWvTvn/FrmhRANCAASTwtiTORzwgAbivk/+N9tJPZqocXzk
-7PG44ny/Hr5FzBIMrSxPa3uLpXD3NQjksle23tUdiEddfcaJWB7qxNux
------END PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIMJMVBJ2dFrIShCgDWsA8aewbFKgmVCGuxUjX1awRPoLoAoGCCqGSM49
+AwEHoUQDQgAEE6JDiprjkrpX5qj9IlGfJ9SQsa2zwseJpANCebwc9R/5WbRpN/F3
+LVNrQc3hdugtBPNBcV7Y+IIA0kVU/T+6bA==
+-----END EC PRIVATE KEY-----
diff --git a/lib/hx509/data/pkinit-proxy-chain.crt b/lib/hx509/data/pkinit-proxy-chain.crt
index 6219bfddc..076308957 100644
--- a/lib/hx509/data/pkinit-proxy-chain.crt
+++ b/lib/hx509/data/pkinit-proxy-chain.crt
@@ -1,14 +1,70 @@
 -----BEGIN CERTIFICATE-----
-MIICMTCCAZqgAwIBAgIJAOFd/6I9Oly0MA0GCSqGSIb3DQEBBQUAMB4xCzAJBgNV
-BAYTAlNFMQ8wDQYDVQQDDAZwa2luaXQwHhcNMDkwMjA3MTA1NTIwWhcNMTkwMjA1
-MTA1NTIwWjA1MQswCQYDVQQGEwJTRTEPMA0GA1UEAwwGcGtpbml0MRUwEwYDVQQD
-DAxwa2luaXQtcHJveHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANjqwCUs
-EBXBX/suoqLkkBuvGCg+Eyr/RvVDUugZgNPGFk7TlVZxeC3skQ9glVkI6jghfkQP
-f4M5aS7DrDxARc+8VW/Z8ARakWsS9sV4gfjXj6vATS/fOJwIZMZPaCLyB3ymx8IM
-uZyym8SH8TUviNLpW5cU/EJSUnuHl1ihTPQvAgMBAAGjYDBeMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBQ0JrVVHCxVEne/mmlb0SfKXuC2+TAlBggr
+MIICMTCCAZqgAwIBAgIJAOFd/6I9Oly2MA0GCSqGSIb3DQEBBQUAMB4xCzAJBgNV
+BAYTAlNFMQ8wDQYDVQQDDAZwa2luaXQwHhcNMDkwNDEzMjE0ODAxWhcNMTkwNDEx
+MjE0ODAxWjA1MQswCQYDVQQGEwJTRTEPMA0GA1UEAwwGcGtpbml0MRUwEwYDVQQD
+DAxwa2luaXQtcHJveHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxc2RMo
+bcMKCFQHAwdVe0QwnnQenFZ7tabNpsSR87KqLfmNT1b+mREeOhhcjm12Z22D3tZo
+RgyYSnkzTstOngI7ZN3jMEr107lvgpaO3F5B1LBlP0pKrET5VrK/UL2f9obHeX1r
+1irf4GW895b96aPWyxio55v3Q/SWdHoNaHOtAgMBAAGjYDBeMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBQG8ttTe93FGllomRThw5DLqtV6CzAlBggr
 BgEFBQcBDgEB/wQWMBQCAQAwDwYIKwYBBQUHFQAEA2ZvbzANBgkqhkiG9w0BAQUF
-AAOBgQBjx+Tzk4M0V54GOKUxiC8pN3HU70h347nvDBtkd6AT1V+H/qmdznOZMiQA
-8HS2IxzWHuUHHgg1NKeerTXqZA33zScg2LmsmTgJnyHK+6LiR8g4FmJwnGl98w1g
-gQPNTa9qSU0xyfLoYQjEfr9GcXx1t2n7tII+xqnTQH0ceXUYRg==
+AAOBgQCVZsiDTI6klQ1KFUaD3IguHjIAd+FN0WYzRJLfTZzrSrgFi7OIswGSi68X
+lhKIIt+7KP33K2Yw80pj/r58OHf+IJH70xFfsKefxyeNDl3Spg3DZQoSaUG+UWv1
+lvBHJ+5c5XQcA1QLZU//GPbk/SF0rLgx/3wo7ZJnVJCgSLGLKA==
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 6 (0x6)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: CN=hx509 Test Root CA, C=SE
+        Validity
+            Not Before: Apr 13 21:48:01 2009 GMT
+            Not After : Apr 11 21:48:01 2019 GMT
+        Subject: C=SE, CN=pkinit
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:98:f3:f9:84:dc:ba:51:5b:cf:a7:04:91:37:02:
+                    f9:d0:0b:40:66:a5:7f:2a:2f:89:32:ac:94:ec:00:
+                    42:76:56:b9:38:e1:81:4d:07:16:d2:f1:2d:91:67:
+                    81:d4:07:4d:0a:ee:80:9d:ce:b3:b4:04:86:14:5e:
+                    b6:50:e2:e5:e0:96:a3:32:e1:56:90:9d:59:d3:5f:
+                    b8:1e:91:c8:94:e2:8f:0b:21:e3:da:43:16:00:30:
+                    aa:d9:e0:c4:8f:3b:6b:a7:d9:fc:57:6d:a5:54:ab:
+                    5f:f8:4a:54:87:34:06:5c:44:25:98:99:e2:bb:62:
+                    10:e0:ad:25:27:cb:58:a5:4f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Key Usage: 
+                Digital Signature, Non Repudiation, Key Encipherment
+            X509v3 Subject Key Identifier: 
+                B4:B4:31:F7:E1:14:21:18:D4:59:D2:4D:37:4E:06:CC:6A:F6:53:00
+            X509v3 Subject Alternative Name: 
+                othername:<unsupported>
+    Signature Algorithm: sha1WithRSAEncryption
+        6d:63:a4:dc:95:ea:ca:05:e0:e9:e1:79:b3:41:8f:1c:80:dc:
+        61:41:1a:43:79:d0:f5:37:bd:7c:1f:7e:ea:ee:bb:33:3d:46:
+        48:2e:ee:22:7a:b1:a0:5f:b1:e0:81:7a:8f:12:f1:80:5a:0c:
+        db:47:ce:14:8c:c7:2f:7e:47:d7:63:fe:3f:62:a5:74:99:b7:
+        e7:58:24:c3:49:b8:b0:e0:f0:f0:5f:df:13:de:7e:5b:57:ee:
+        65:6d:51:17:51:02:c1:20:f3:e4:82:e7:fc:4a:95:01:d9:15:
+        89:4f:96:71:db:1e:66:73:4b:ad:be:3c:89:d3:b0:cd:50:aa:
+        40:e8
+-----BEGIN CERTIFICATE-----
+MIICMTCCAZqgAwIBAgIBBjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
+MDQxMTIxNDgwMVowHjELMAkGA1UEBhMCU0UxDzANBgNVBAMMBnBraW5pdDCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmPP5hNy6UVvPpwSRNwL50AtAZqV/Ki+J
+MqyU7ABCdla5OOGBTQcW0vEtkWeB1AdNCu6Anc6ztASGFF62UOLl4JajMuFWkJ1Z
+01+4HpHIlOKPCyHj2kMWADCq2eDEjztrp9n8V22lVKtf+EpUhzQGXEQlmJniu2IQ
+4K0lJ8tYpU8CAwEAAaNzMHEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0O
+BBYEFLS0MffhFCEY1FnSTTdOBsxq9lMAMDgGA1UdEQQxMC+gLQYGKwYBBQICoCMw
+IaANGwtURVNULkg1TC5TRaEQMA6gAwIBAaEHMAUbA2JhcjANBgkqhkiG9w0BAQUF
+AAOBgQBtY6TclerKBeDp4XmzQY8cgNxhQRpDedD1N718H37q7rszPUZILu4ierGg
+X7HggXqPEvGAWgzbR84UjMcvfkfXY/4/YqV0mbfnWCTDSbiw4PDwX98T3n5bV+5l
+bVEXUQLBIPPkguf8SpUB2RWJT5Zx2x5mc0utvjyJ07DNUKpA6A==
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/pkinit-proxy.crt b/lib/hx509/data/pkinit-proxy.crt
index 6219bfddc..52919e590 100644
--- a/lib/hx509/data/pkinit-proxy.crt
+++ b/lib/hx509/data/pkinit-proxy.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICMTCCAZqgAwIBAgIJAOFd/6I9Oly0MA0GCSqGSIb3DQEBBQUAMB4xCzAJBgNV
-BAYTAlNFMQ8wDQYDVQQDDAZwa2luaXQwHhcNMDkwMjA3MTA1NTIwWhcNMTkwMjA1
-MTA1NTIwWjA1MQswCQYDVQQGEwJTRTEPMA0GA1UEAwwGcGtpbml0MRUwEwYDVQQD
-DAxwa2luaXQtcHJveHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANjqwCUs
-EBXBX/suoqLkkBuvGCg+Eyr/RvVDUugZgNPGFk7TlVZxeC3skQ9glVkI6jghfkQP
-f4M5aS7DrDxARc+8VW/Z8ARakWsS9sV4gfjXj6vATS/fOJwIZMZPaCLyB3ymx8IM
-uZyym8SH8TUviNLpW5cU/EJSUnuHl1ihTPQvAgMBAAGjYDBeMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBQ0JrVVHCxVEne/mmlb0SfKXuC2+TAlBggr
+MIICMTCCAZqgAwIBAgIJAOFd/6I9Oly2MA0GCSqGSIb3DQEBBQUAMB4xCzAJBgNV
+BAYTAlNFMQ8wDQYDVQQDDAZwa2luaXQwHhcNMDkwNDEzMjE0ODAxWhcNMTkwNDEx
+MjE0ODAxWjA1MQswCQYDVQQGEwJTRTEPMA0GA1UEAwwGcGtpbml0MRUwEwYDVQQD
+DAxwa2luaXQtcHJveHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxc2RMo
+bcMKCFQHAwdVe0QwnnQenFZ7tabNpsSR87KqLfmNT1b+mREeOhhcjm12Z22D3tZo
+RgyYSnkzTstOngI7ZN3jMEr107lvgpaO3F5B1LBlP0pKrET5VrK/UL2f9obHeX1r
+1irf4GW895b96aPWyxio55v3Q/SWdHoNaHOtAgMBAAGjYDBeMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBQG8ttTe93FGllomRThw5DLqtV6CzAlBggr
 BgEFBQcBDgEB/wQWMBQCAQAwDwYIKwYBBQUHFQAEA2ZvbzANBgkqhkiG9w0BAQUF
-AAOBgQBjx+Tzk4M0V54GOKUxiC8pN3HU70h347nvDBtkd6AT1V+H/qmdznOZMiQA
-8HS2IxzWHuUHHgg1NKeerTXqZA33zScg2LmsmTgJnyHK+6LiR8g4FmJwnGl98w1g
-gQPNTa9qSU0xyfLoYQjEfr9GcXx1t2n7tII+xqnTQH0ceXUYRg==
+AAOBgQCVZsiDTI6klQ1KFUaD3IguHjIAd+FN0WYzRJLfTZzrSrgFi7OIswGSi68X
+lhKIIt+7KP33K2Yw80pj/r58OHf+IJH70xFfsKefxyeNDl3Spg3DZQoSaUG+UWv1
+lvBHJ+5c5XQcA1QLZU//GPbk/SF0rLgx/3wo7ZJnVJCgSLGLKA==
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/pkinit-proxy.key b/lib/hx509/data/pkinit-proxy.key
index 7c7881fb1..a136e904b 100644
--- a/lib/hx509/data/pkinit-proxy.key
+++ b/lib/hx509/data/pkinit-proxy.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAO9KW76Zu/U543+Z
-RXmIrkV+3/bLPlyNxFFZuWdSskUzGO2cl8eKeHhGebmcpfllSvN+vx2lWjIPWXb/
-1KL80bQuC2m4QJhQLhLmNPoz6jCqLhSWUOP4tNmkKTIic6drVE47+7B7YYyLIk5n
-F4GqLivSeEnHu4fVoanifjc5ITcNAgMBAAECgYACyECM1MjErymgAC44nYg5MqJ0
-AiT1eoh/0aVAOEvuVgvCJ4H0Rf3kmB0uNU4QukbG0gBy3ctQrbECmzLjukDN68Gm
-5ll2IbODaJw/mAYVjgQVzDHjQn9mo9Cz0SHTvj/kY+/SGfoYwcJSijnzuX/KB5kU
-3zct0oRhLaXfrRpuWQJBAPm1U69NiThH5MU3AXfUEiTbfopgCBTGegCJbtEjQUK4
-+EtElHcf6fmCqSQ2WQoeoWh+B1qRj2EYVrXMsU7aOh8CQQD1UdWH0fkzkSVaOFwW
-OzdZGN0s+G7pFaJsE3TCUMbjhZ6Qj3QbCPKTRtoogm9cXEwhtZDw16XpYcjAKVnp
-kcFTAkEA5qs2Tu4VIERpdDTHymXBDQMl9bWYQXjHIs/R6qfilTxBQWZsr05v2Ol2
-TdlWjx6Ug+5H5MYp6MuO7gnUkL7OiQJBANQI8Fvdg9wrVzKcxhM9CYDL+dd1vz9d
-QK7TPjb55H4hLsVaCIuZdzkOo18iJiiZagA009snOTL4HrDgzOMR5RsCQAlGvjRm
-BU7fZhBbIA64JPfXBw3PC4WpbXsz/ONDnvNpDXmzYI3/noVDxdDVlTN3BCrnzbV1
-Z1exkYA8XBq93+g=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQC8XNkTKG3DCghUBwMHVXtEMJ50HpxWe7WmzabEkfOyqi35jU9W
+/pkRHjoYXI5tdmdtg97WaEYMmEp5M07LTp4CO2Td4zBK9dO5b4KWjtxeQdSwZT9K
+SqxE+Vayv1C9n/aGx3l9a9Yq3+BlvPeW/emj1ssYqOeb90P0lnR6DWhzrQIDAQAB
+AoGAHt/BHOjFhPCCCPPVRUB3oeeuMS5LRcmlLqAKs7GQljpaqsrEtGeqwymHMDML
+jVmY/lRdFBunT60ul8sXIS/TqhWS+IJFh+rg8CGPn2ODe1BNybovNtufG9Rea7nt
+nx7gUrY6D9Rv9nj5boQgQnjv1hJZhf5iNZPB021+D15DuIECQQD1AAbnN+5g51dj
+u29nEMcLOY7w0bZU+umEIwqztysDoIvXxwlIkxWVLaFnDBVBI3VYHmS+hJumJUpR
+9h4n8GxRAkEAxNHYDQhfPboGwj09e4Ti3DW/+91rSG/ts5ZRPfKtn7u0JKH19fyd
+cZgKOH4/gSPQ7VvPUwDEmHA8kA1gUkImnQJAP0pMfjqiqAHbP3ZSJwvcf3fVBz0F
+nxpabLoor5hn0j4NIibWrRrh/nGVOmuSqgsg6yye1eCn3NnRQy8TRzoCoQJAYx36
+W7XXoNJKDQ+iIs4tIRDAeiprmLMlVcdhan0ICuUQN1KI9zQcZdRXcVPCz1omISKX
+Kgm897euCC10UHiX0QJAd85xJ55g3JtAV/bIKjFfCv3/X+cifG3Yv0qQas8Xju8p
+lGFhiqi3RF1TNRvxEyFyFxYeHoWZ5HtlnDSGL8H1gw==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/pkinit-pw.key b/lib/hx509/data/pkinit-pw.key
index 53a079a0c..b1318f328 100644
--- 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
-XDw/Py+nK3mJX5XpqFBPUzEpHEJw/pEzD+EaNCFcE7upK7np35Csbrszgal8ce2n
-JIfErUwMoROgHKj75bWJ7DnV2At+LEMAp0M33VmRrrBR9NxrhoDbqtj3wwUV9djZ
-To8GZxCV9aHrR93Sw3dgOn3ZolN552pHk2Bv94UoKpuCDhzYSbQIIAcSI/Y4t9Fb
-8nF5tXuag4bJGIC1UkOSdv4U3KMZeMB9vXyF90GZFlSfznpnuhn4LHmNvMsuMBcO
-tCqHxDFsPP9w7Zp56Deg4H7xhcLZocf3i8IZUPppj2XflFkuLr5Ae6laVWf4UDK2
-ex24qtzMIlIu+0POvoheVHSin03n7JzbgZxkRBw4cshzqh7kUpfGqdTp0j5N6Oao
-tfR3/jUYBde8d53Y4qyRv01s39Bh7WVI7na5CpA2aBJNTm2tfxT4KACMqV5vxPKI
-yRVtbz37D6K2FMVxLfawP36oJ7rDRdN8zsryV/KLI9pLjWwIcry9yCD6ILh137gQ
-XJnjWFwSHHhCdlePNLghGDC/8qZkavAtVhyChJnkZO/14BN18htrpLlZE9ds+eF2
-6Bv6JK8gZ/XlmWN3doHgOIt/z9WULANm0xn+AdvUnG50X8ZDMVEtgMKBp3tSLxlr
-TLrzhYXsdfZIM7ury9CDHMHnCW4lim52UCR5PTEM6vpe8h4hqHb0PqdTuO5XhELd
-imtz/p3X/qJFw90fi7Dm6jNl/7xW3HXjrwlEwwVu46fOEcdoHf5rpTXIKZtgmxdI
+gbigerGjK/y7uOByTAObxdROrhA1MWeab5yvAm0R2yMyYgQbUgfSO6oDKj57T3aI
+HrnK6q7DPZPhjtH2LMhwrspdQzyrSUkcT7GzKhgyWWX8N+97T5m6iH/RAulL4EX/
+d+Wl6hm42bc/+/NPQhKDTz4OdylZIGkWpNtklLUNPnGOZBg+XFF/MkhhhFE7D6dh
+Y4CnyrlogQe1ajgBmtI0JioxdBnrZbhKw5Xq/4u4I6RW2ieSDmxjd/FcGOhahncR
+zBRJXHhXmeB8qqNwyI2PCRvshlXuIau4EsnlqUZ1e9NuK232YKMH3SR6G2wCFdpe
+yjIUO8WKnea4HYoQgpUujbk0t5qx9vJBzZHn324/dfVJVlWSANnUYWKeHfiVnwI9
+1RgMicnMUzR4GvhUtFr3EOgAFI1TiptjQ85yyUWmO1ixl4K/CfmGw4Sp89areueY
+D9y/Ri1f6nREMZjSVnCHGGOnfNPPVIwHMr5nTagBrKY3pKG1TFIevXkGOGYPb2HG
+wZ1H4YS/ObLQjAy2at8zViO+9lhE0a0IKFRZq2flgePBSW37n0kXhPn82jQgLyei
+Of98rpclwHEF3UazXti0k/HmVZPr/4aIpFmP3qnUcLaDa1gjGxrRgBS5jJvY72Y2
+Q+yWqqylGzr22C1M2uVcuJkr4LCYwjx3EC3SoxUTryyQWuRj32I3bv2ueWb6DLRb
+L0AYTYoTKkTB6kcBGwLasLCBcoPBg8qy6SoO3mFC+KGYHmkocTG1uyNUJjERqj4/
+/6iMuisYX+WQEWiBR+E/c1iXvzuaxtoAwNoZYfXR52T/ZNuykyYJBEgTHu01DZgN
 -----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/pkinit.crt b/lib/hx509/data/pkinit.crt
index e69de29bb..95ee9c72d 100644
--- 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-----
diff --git a/lib/hx509/data/pkinit.key b/lib/hx509/data/pkinit.key
index ceb93ebff..2af2307ca 100644
--- a/lib/hx509/data/pkinit.key
+++ b/lib/hx509/data/pkinit.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANPQD/I8GN2muksj
-s0ravWJ8wNZvKeKnXbe4t5GP7zIxwiTNC91htpvNdSYykQpm8sU5/67S0XLR8wah
-0nezysybuGlzYKHoDcW6CLfytWGIQz+nGn5ScNRbzQE3kiDBFTrrMcHA3DXAExRs
-BCz4IVJV1XE1yPVySngVtoIlG0cNAgMBAAECgYAheFtMt9pmDBacEQQf6/jJO1Vt
-jRtdSX0xruqzAb+Weu5myk/5p5sne4vrgUoSDrqGF+gjRAT809hHUALmD28YJFmG
-FjV2wwbEFzJ9SkbWyoT29ICGUVeKGjl1F+Cj3KhfUq70j3phz5ZQeNcm//F4j0rI
-Cu23mj80uZOoJwYegQJBAOwhNgR91mT9DZkL1hp6ytJP7fGqPPlg/TwTgOBkLBWF
-FsbljhvlHIwbUtBr3uGl5s3C3xZdlY0gqwpuVgj0bCUCQQDlowGas2hSxi+G99PI
-5jfAorIUkuR0G+rbNjSqGM1IrWj8SztL/93s3rz7OJff44cy9AiJ3psgBrlY/fg7
-C4bJAkEAxagrOmlHrPNyjXkt+K5u1suXhyKUtb9tWvuMdskDaeQlI8sGQO1xDwrU
-MKkLQeGIqRaFfYhK5n7BDhM8K3TGjQJAUwPWtKJe+G2FCPnWqi3vwcgPMLjZtc/R
-22WBLGzC6Z8m8O4Rhav+An+TOg5/eQS7/4ORAqZi1fUYVD+b2VyVYQJAKbaxRuaR
-68gNlypwKyRlM7b8l3KP6Pu998hEHmnqUMgeGZgBsU/yny3WJNsLZRb4xNFAxcnu
-cpG/j+8w+zFyBg==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCY8/mE3LpRW8+nBJE3AvnQC0BmpX8qL4kyrJTsAEJ2Vrk44YFN
+BxbS8S2RZ4HUB00K7oCdzrO0BIYUXrZQ4uXglqMy4VaQnVnTX7gekciU4o8LIePa
+QxYAMKrZ4MSPO2un2fxXbaVUq1/4SlSHNAZcRCWYmeK7YhDgrSUny1ilTwIDAQAB
+AoGAV2NtuJ90RG+0YLSXU1r76AXFsd/0m+G0/aLlI0Gyt3ItOXZ+LchTHgp2ApGk
+98OEHS7PhVpICh5bjN/gQq6gr6K1g8EemheEn/M0ad77y9g/6xkuyCgjeW8khVQ/
+KovidHqpwtmtMQhJJFOl3Rh1E0ULBeiVnYlOG6xIzxwWbUECQQDKUQFLwKjCxaew
+hCDEClAYgX+aJ3hLrkrZte/RwZnlmvyZJrMy4I7hBlu3ushgZuln4l14u8LQDJyg
+3Zod+YxHAkEAwYnNOnKT/euosOVqKJuLnnZtW7+Lu8NBzlCwdaSzIiYZnsIF5C+n
+zrX1v1p8TTjsu9cUKXgYtgknghbaBnyKuQJAEpPxrIUaehgwV9MqNxZDWJy7nOo2
+76wnj2pXhUlj2mOrAl09Y1SfiiZNUcfDEqcgk7uDncyQDQ67a0IuHsaFjQJAHAZq
+U3ZX+8LuMH9n+e1cMFwRxeFcyJmjo86HXuG0ltNRjm2mEL7d2875gPYHXd9KWIDy
+iHa9jU6SDAJnG91Y8QJBAIQHn9lEtJ+kLIWijyomdx0StLaaHYymqOiD/JiUhNrO
++gOj9xsaK17X0HlQlAyodG/UwdncPnMXOjwCILQT+F4=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/proxy-level-test.crt b/lib/hx509/data/proxy-level-test.crt
index 0c26ba306..88edbd0d4 100644
--- 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
-aq7bmo7sqmA/zwXpYjqzhm2Nrtv2CI7/1pey1/M+fJcmAqTJflUFV4yir+n7T7xF
-AtM3KrI5Q8BqobV9FOTeJkx8DQEsWleoWmPjgWWvZgHofrimmI+LQE4/D3cBLhDe
-Hf1BIAS6YvUTDQIDAQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HQ4EFgQU1OfZAsXToezJeqYKz+qn6nVsBzcwJQYIKwYBBQUHAQ4BAf8EFjAUAgEA
-MA8GCCsGAQUFBxUABANmb28wDQYJKoZIhvcNAQEFBQADgYEAJKuxT4zf9yvhBbBO
-pAxBG+4Mtt1123MmIqNDsaCLXGaaVkl03Tj02L+3nhud7tGDaEgRfGPJktrfIU8i
-Tp5CIZZMElCfLahyGDv3HPXWaC7g+224+MRvcuaZukLYnbkXinc3QF3ytrojHKvk
-bTh9OLngnRi5iQepEG+xSuLYBys=
+MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpSBN+FKVC2wAP3byRsbA1+GRUTfz9
+E3QOGzsYor7OT0sL+wuBfqgBsDpDWLZYWOLHlKODg5ktBLm8+vehOiRuMgxJB0MY
+uNw86/JhQWp7bvFRttWVfZYReMwEjOTdK7x6Aa3ZvM5o/8Bo8NZq08/71X5cwBiE
+1zMmCUtZpcVchwIDAQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HQ4EFgQUw5aS8IKx4q+/8nHq7O+YUjs+D8UwJQYIKwYBBQUHAQ4BAf8EFjAUAgEA
+MA8GCCsGAQUFBxUABANmb28wDQYJKoZIhvcNAQEFBQADgYEAscBp6MWOKv6BMY6N
+NTl9eMnnYVT2B9ynGK+FsMFBdnDeJBj826cMzfk7nx+J5OcHB8YhaYv7GqpFa1gz
+8TACxL6bgzgtVmfCPYAOSVEcNVAvMg5IuDd78fDaFZsfgnR9kF3T81/nUAYu1Ldh
+iEdCHg9VXCrB9/EZOfK8zsnEzCA=
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/proxy-level-test.key b/lib/hx509/data/proxy-level-test.key
index c2629c279..fa6768490 100644
--- a/lib/hx509/data/proxy-level-test.key
+++ b/lib/hx509/data/proxy-level-test.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOQatUMw/16OC8D+
-Jo2A5ABcs9nAxgVqrtuajuyqYD/PBeliOrOGbY2u2/YIjv/Wl7LX8z58lyYCpMl+
-VQVXjKKv6ftPvEUC0zcqsjlDwGqhtX0U5N4mTHwNASxaV6haY+OBZa9mAeh+uKaY
-j4tATj8PdwEuEN4d/UEgBLpi9RMNAgMBAAECgYBjts0wTzYDNqMqva9KwmJpSh0Q
-/rVR3t4Lf9gk2yHyIuTZrigtHIG9owfi2MDyU/PCqaZa1YoZgqRYtNIj4K7ICAIy
-MpY2Qu4l6HhRBHWTWqCVkE72UA868IB5eWOjqEJEN5IYoS69WQWc0pd6IfnA117p
-DMiffXayjMr1qurVnQJBAP51n0yRLlQ6CZHydY31PCYBxYgyZu61a/Gowa9CCbvI
-U2nzEC81BXIH7jV1HZ9wejxS0aPNPuaR+HMAqjbju6sCQQDlfD0owd8i3dU1L2Bf
-nvyxA2CdYB4Hgs48JRAtYmdspgyV9QdAGWGLyJ/v5qgyt2jLYyk5qqzldXPgMfrV
-rnQnAkAgdJIv6uiU15423kz+IURduKYgPAWC9uLgvNyPZQXmzKNPBTCQRNv/8mEA
-soJnvqnoncudb+VQ9VdSG8iaHavnAkAvs9amvT4b6k7iglmfJtZSGWig7hTv7MHg
-ALhPJtBm5lFhbpC2Q1BilS6h2KmH+VYgSRmNsivEeti+dsU0W9IrAkEA1r0trrk5
-i8ujhwmhsxyNuazJroA05meHmDbwQhnjPds9M3WVoY9oTCzhihVQ+OUpFBMsu/U+
-zO1mioIvx/R3lg==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCpSBN+FKVC2wAP3byRsbA1+GRUTfz9E3QOGzsYor7OT0sL+wuB
+fqgBsDpDWLZYWOLHlKODg5ktBLm8+vehOiRuMgxJB0MYuNw86/JhQWp7bvFRttWV
+fZYReMwEjOTdK7x6Aa3ZvM5o/8Bo8NZq08/71X5cwBiE1zMmCUtZpcVchwIDAQAB
+AoGAWp/Qd6X71y/A972AbwsOR8Zjh9J8hsu8TLT9TTILLg27In3Sag/xR34douJC
+NEfZmHkVlJmGDljCSs6cdT7YMxsI7MAR24wzgg99x+0Of8V0lQD1I+cy5CUQdOoe
+LtqK6tufDuNG1ppeFc3s5iaWPQzkCwb3ZY7JcGjEk+Zm+CECQQDaTv07uY8moFUL
+n/s4/QGvQIAfGJVdtj+deNq2B5rSQX0lFGqEOtq1RqptwUpqnT37ArSiE3sEYjv0
+x8+YYLfxAkEAxoIk9nkdmKH33O/6vPTG7MYKhD+D4id2VDXASlEv7X4wIXjlNhj5
+cmAeDZ4GMrgeQTXwSZs0hYujrI9L5J0T9wJAT8XFa2mnEapM6W6QUobBctTS/Inz
+KsdJ/7UF1rZ4sJQVstL/CUqoWM11wZ18H/FNkMewUflkXnm3Bv9ssHXHQQJAZKrN
+Odzz4FqLCxT8D+UGGD7aSHS5We/vNwdHK6j+aC7tE5xuiL+jiJgrxXYU6JWsah+D
+aqB1wx+sci79KsNpwwJBALFqrd7N3t4D4Rh+VaR1qUSm8Lq/SCn4tYjucZpLb2bZ
+0szSqKs2XO97rhJd7lvo0YhlQptsPTg0JPURMwivzAs=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/proxy-test.crt b/lib/hx509/data/proxy-test.crt
index babaccf07..e82ed2dc7 100644
--- a/lib/hx509/data/proxy-test.crt
+++ b/lib/hx509/data/proxy-test.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICMDCCAZmgAwIBAgIJAMJEvwnR1+2YMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
-BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjA0MjUzWhcNMTkw
-NDExMjA0MjUzWjAxMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MQ4w
-DAYDVQQDDAVwcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwOOSDzTw
-7Mcno66PrQ5j5fsfalj4XDfV7Qpcl8cdi0epxbnuUP2rYLXywOFZKMM9mSyxNJ/v
-ylsRB0K5vhKzowlMNvpk4mJEw3+lrqJjk2kwfXubCljvAlL/nHEHNd3Df2ksNWKO
-wXLIq07soA8GgHd3/bl+BVo7K2iakQBj1TMCAwEAAaNgMF4wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0OBBYEFGUBFJqHzz7PeKmgs9O1XMlyeEEdMCUGCCsG
+MIICMDCCAZmgAwIBAgIJAMJEvwnR1+2bMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
+BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE0ODAxWhcNMTkw
+NDExMjE0ODAxWjAxMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MQ4w
+DAYDVQQDDAVwcm94eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzD9rvFqU
+UYec1cMnPavmb+4UBxxZ1ZCZly24yR30k5KERNmAeqNNI3rbxPhQGOF5x97Y/izm
+anNZxvH+EK75xLsweAYBoJ4K/Hzx2A8CYAbuFrV9Zomx4AUe35o4WWEQwJMwIxRm
+8E1BmiL4C71NwK6fC+BIdWiFKgOuOrm+5N8CAwEAAaNgMF4wCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0OBBYEFD5WzyL5AGFFHSdahlmprI+OnUMlMCUGCCsG
 AQUFBwEOAQH/BBYwFAIBADAPBggrBgEFBQcVAAQDZm9vMA0GCSqGSIb3DQEBBQUA
-A4GBAFPGg4wNlv7J0jtPUJFBDPLWwSRqswJUDB1XJ6nhWmugKkaswaj3rEbInpSE
-R9Mk/36pVkxX5H8RJHq11WaYegcLUQ8c5eG/4UERpnPi2EAzTEo0kFJI6EMB4/2J
-zzttrEp3s9hIsnX1v+PXa7xxci30gMt4ONu1KWwQOhg1Mhde
+A4GBAMhRGdqxHMzj625UCzMkAzrFLEnLJSXU1u3/RHlUQNyfjs5+UW49ImKBshCa
+3lNy4LQDh8MYjkA/mUphOqZjuHBsfkqlJPgLEhhAIns7vm9TJawY97cKO4gd40Ei
+4SQoEcWyKEObqyVQmZ2269wwqfT5BMRqoZPaD/a5jvB1HRNE
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/proxy-test.key b/lib/hx509/data/proxy-test.key
index 133783cdc..447a2b1ca 100644
--- a/lib/hx509/data/proxy-test.key
+++ b/lib/hx509/data/proxy-test.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMDjkg808OzHJ6Ou
-j60OY+X7H2pY+Fw31e0KXJfHHYtHqcW57lD9q2C18sDhWSjDPZkssTSf78pbEQdC
-ub4Ss6MJTDb6ZOJiRMN/pa6iY5NpMH17mwpY7wJS/5xxBzXdw39pLDVijsFyyKtO
-7KAPBoB3d/25fgVaOytompEAY9UzAgMBAAECgYBRd8yY36NiXjs/xtqoHQvUdtwt
-7qX3TR3toBK7iD3SNdJe0Mj3LCzWDAMbtBIURWIe7+FoeKSuswfeKTCKNxvnZIma
-muKNiMJG/zEZ5Ti/jC/ctkRVCj51F9WaJAqjBiar37/6zEYF7K1n3Ms/TKiIYLT0
-87LfhRC9sD2utvXbAQJBAOdD6cshZ9QU9FMFwmPTz0xXuSB0cbIm0xajaqSKnPym
-3SpTbn2GznJjRTSfyBpA6jmKddcDhtVBvQ4tf9YpvkUCQQDVhOftSsy513gme5We
-kvo6AO82cV42uysupbiEOtSBuZ5WtZveN23yAvPFL0jKFQD+6hMy59HByllU2IIH
-QxkXAkEAoPcNEBx1NxFKqUqV7YOsgneAXA2QYS5SuCwP+uybreK6h05A1k/w+38K
-2UDpNxS9skUkFf7XZzF1VBvpIXg2fQJBALkOrPkEKHY14uPvntjGaGuXXbzg+xgS
-lrWiWk74sjAREcPzOTma7wafOmo/tiW3mJpXg/ZN54W/fDdGQ0RKClcCQQCEzGUB
-cc/Y+q6H57zWsPwYaAgLT/VNSovXIJRdM4itWTWPmzzlH9KTlXtOY9Gjnwn3Akem
-BXpEwqpddh8CxIwB
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQDMP2u8WpRRh5zVwyc9q+Zv7hQHHFnVkJmXLbjJHfSTkoRE2YB6
+o00jetvE+FAY4XnH3tj+LOZqc1nG8f4QrvnEuzB4BgGgngr8fPHYDwJgBu4WtX1m
+ibHgBR7fmjhZYRDAkzAjFGbwTUGaIvgLvU3Arp8L4Eh1aIUqA646ub7k3wIDAQAB
+AoGAcbgJ+xgPpok0CEyc55hzN/S9j+v4FJFrAqJBVTDpgNS98juLbjzH8S4xeKys
+o/2+OUtZU8OaEsDgxoTr6UwS4bgjUVxNJytUbkULNfuN8+k4ciyzVk9za7TT+1Q0
+MXDyHDE7kE2WlIB8a/qkzpZ2p1JnzGvDCDTyEJH1wu+r7VECQQDy4SEXk3eem4oU
+AeYUShkyxLgUu/AjkM7pMsdJeUCcohhwhGolUmJfusoIyztwU5IRByXXJhWE53io
+6UXYl0w5AkEA10gKJV4XM8pGxKppTIgcH04zK8U8pzzgXIh2WqRiDbOX2zk038ss
+5g/0amcCGqMac6UcTlsq9Hkb1Vjp7L7p1wJASmXRyDIA41HLwwMt4issetOte5Ry
+I8LYzrAiQYxl0VUJ3XWCOjp5Lc++0WDHrUm8JYEmAziEQPjSihMitQzraQJAcRk5
+q1P5II4+C4fzde9zxsaQf4hJSxriS/qtIwWFNemJ9/Pf4UqeNedf4p5nLpNNjD/L
+1SZ0NKeDhdwGWQgbVQJAcFMoL0PzBSWRwxhoOd6pu5+w/HrOYG1Y1v5Zf8pwtErx
+i2JYmlylQ7uc1s641us/bHz0UMUVOQQHnqKT4OMPQw==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/proxy10-child-child-test.crt b/lib/hx509/data/proxy10-child-child-test.crt
index fdf340232..6e0708e77 100644
--- 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
-tqnW3IX2nxQCNiy8VJcGOD5jYRE58DrC19qBhA0SWFxYeYmP38rbqLIu71MbmsGy
-QehjyqBHb34R7+uuunlNiiPhr+ergVtFXuGI/NVv/fzZNLAYnP5CswlwEwwcVQID
-AQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUcN/d5D5w
-ShTBxROnm42U5Nzsu6AwJQYIKwYBBQUHAQ4BAf8EFjAUAgEKMA8GCCsGAQUFBxUA
-BANmb28wDQYJKoZIhvcNAQEFBQADgYEAEPvI05Tl68wluLnUuv5O5D2Tey7/41Oq
-NDSqe0Csm9ZCebRwqZynrGj40rFvz4pdL+o6nWBHlnylzCANMxzG9yvfd6HWOSbx
-jrMWnEj5P+/n3z/jnfIy43+kdfz2Y5gO5lX62Lj9PUWmnKfXEaiKShcjZ9z7uVdY
-pr/66HGCFnM=
+AQUAA4GNADCBiQKBgQDRY94DoMXpcQWDorXSjSv5phbgFhfFRA4gflBNlcI1sHMJ
+jYAusRylG44O+LqpxRkO16WAZl3aENLs/Y8BWx+yJ/NaokM1XhAE1EP6X/RIvfcF
+Cbhf7srgUhzBLcA0d9gCqaMO0fhWnd4c702GWG+HMKLdve/FZE3lS1DOj6YQ5wID
+AQABo2AwXjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUsqNjmNmz
+g3dJD9IzRsaH3WuhEvcwJQYIKwYBBQUHAQ4BAf8EFjAUAgEKMA8GCCsGAQUFBxUA
+BANmb28wDQYJKoZIhvcNAQEFBQADgYEAP58arK5WdV5h7pj56/LJlEnyx8xhiTUG
+Y49T9JULQOG4gsGyA1dhdxM2IZQpLboUR6NvWuiLJyC4LJPn+2EqjK0LrzXhG2VB
+1/kDMqgNmI5eikOV8KkwAkt5SrLqHQvmQ5rJPrHALhvkmL/Uh0TEwzgzeXF/IvjM
+MUU7n22YsNY=
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/proxy10-child-child-test.key b/lib/hx509/data/proxy10-child-child-test.key
index 2f275b3ac..ffc6b6c83 100644
--- 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-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALWfpaY3QVebZuvn
-OfJpu9gdOAri7HRbI25C5Y+tdSlVX7K2qdbchfafFAI2LLxUlwY4PmNhETnwOsLX
-2oGEDRJYXFh5iY/fytuosi7vUxuawbJB6GPKoEdvfhHv6666eU2KI+Gv56uBW0Ve
-4Yj81W/9/Nk0sBic/kKzCXATDBxVAgMBAAECgYEArtV6kRGZreqjXa0dQ/RyZaxi
-2V/uPGfLKIXvE6rnIJ3VXGSoA3QO5QPnL+XUlIpdQxh7PhEfkwVkm1FMPubN6N4I
-TRM1YcdhCvbMisokU9EJJf0xbXexIw7KPF71k8R3P4ymXhxFlLXh7cdEDzTCBhDu
-oiTWt++oQXzcOKSsFFUCQQDlQfx0nZCZRCDB0kI08y1J+l+B2TczEC/r8Vee5is8
-LBhK+IxhDWJ5Q8asJ3VrpoK0YaScRgJH9X9/IvsjADNbAkEAys86Ko+cfLdPSpZO
-5MiCz/9jDa5RXThbdZ4n4PFgHdRMkV7Iv4/QouCY3NUI/jWwJLimMKJsfu9pjBqJ
-qWhuDwJAX4YWFdUNSf9MEtZ0BbIJfdiX8Pe7+0fUX+AonSnUe/b3jE1x2IKGNHbc
-EiFC2L8BmP1SZFb7XlZZcHT35UaRHwJAb9QuZZOEnTxSy3TwEbUCdICE9OE+2iEe
-RU+s+5r8/dW3Vp0mIoLBb15ay8HoUIv4EXeDo+Ob4a5Py8JCUBhWPwJANgSvGw6s
-/ok+wgGxtolJAQswCPm6FQoL1s/r9zlDBdPa6U8k4q5wBFwWOVidVVK/KH2oJVZ2
-asMn3h1UOyd8pQ==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQDRY94DoMXpcQWDorXSjSv5phbgFhfFRA4gflBNlcI1sHMJjYAu
+sRylG44O+LqpxRkO16WAZl3aENLs/Y8BWx+yJ/NaokM1XhAE1EP6X/RIvfcFCbhf
+7srgUhzBLcA0d9gCqaMO0fhWnd4c702GWG+HMKLdve/FZE3lS1DOj6YQ5wIDAQAB
+AoGAc96ZutQ68MVUUdW2W/82+H1KZ1KScN0KHD0J3wUiZWdxITYmWrAzs8IdyHcn
+hE7HYQlAUl9TTBrHPdHKUuvEC2bZpUXFItXKUxAy+KwAl+ODhfm2H/M507/aA+jc
+1fBtpzEisVZV1Htp1A+YmSsbgEmXCV/I/pT6SS9FIflOs0ECQQD+ylFFSJzzr4xT
+c4G4Zb+EWrYYlrRq8Wru18LyqJxmlT5I1SxBRLgDmqJSGF8ibTtSAxt647Uw7Q1e
+oYLFGTaxAkEA0mJeV88Qytm1ktQbikDRVqtcldDyONtQspXnjSBFV3jXY69jEsL8
++NZWTpD03lw7UNQdh0MieC7O9nr3YIxXFwJAduv9pOXwg/kS+Tx3dpbfHiqsxatJ
+yISoEZTZZCN45JSSPrJo9onZja0WSFUhylLLlkrm/6PaxVxPmjSuccqD8QJAfoGI
+GWT5xACFnnTM2qV/O45vbebmwCmgrMJXKhVtnNudKOQdvvphA4BfBX9EvzDWuhPS
+bbOA1qPO74ehmPzKoQJAAN3YQmzAN24WzyDi3g86l5B9tf7jGHNtsmLTITG24O0o
+8opaBS6rqb9PaxCTHEBAMPy4vCkwQ1UUpWyi5rjvFA==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/proxy10-child-test.crt b/lib/hx509/data/proxy10-child-test.crt
index ded88f29d..3d3043218 100644
--- 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
-WmMHUzVIvtSLu50g+hQwBWG0ZBJUuUTsSBHFpFJKHXS7hKPs5ZeC7NrtYZEd8F/6
-U6juEwYhIS60Fw0KFoUbVm/qSFvTJur+O5uYEtT3ls/BDEetRNDOxyPCBqmLZ1Ft
-acCZnrhjI39ILAIlu6UCAwEAAaNgMF4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0OBBYEFL0EkxvM9AMDSZM/3GNF2wQ0SOyZMCUGCCsGAQUFBwEOAQH/BBYw
-FAIBCjAPBggrBgEFBQcVAAQDZm9vMA0GCSqGSIb3DQEBBQUAA4GBAJwMPuG/Au15
-4HRh+JIdNUffikyZbdS47/C6UFm/YuHkjwzObk9rUPCRiNO+7emsKvXpjpm3r+qe
-Yx4Qgejc27Gu6pbTc/RuOUM9a9an1zabtqR9Jd6Ln3NeEGUn7SMJu25GF6vJOE7P
-cyRpnVpnRd00XXda6wt/jDORbIRm8dhi
+ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuullDtJworBIXZLCB5nEvC8T
+x9FvUt/C37TYjSHlpt4ScKl6ulH+9o9pmHylBlrGS3Yz/PLNl5NcJWglEd/XSDzR
+87TM6TnU2GkIaoQCpg/gkf2EP24CRQQyHdKqj5px3ezYybzH+uiGuG6F01o4kPTz
+5jNOtOL8l0iYedDzQncCAwEAAaNgMF4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0OBBYEFC4u8d6XsLAukrR3kIqhR5ZrNH0HMCUGCCsGAQUFBwEOAQH/BBYw
+FAIBCjAPBggrBgEFBQcVAAQDZm9vMA0GCSqGSIb3DQEBBQUAA4GBAKMKN7CSoopg
+RBm0Ybd8U0u49lXDyZnyOpuTI8OS6yBj9Ym/m9U+cJyvE6D9sVoBiFCW9nnR4eqB
+0SW3qiwe26FFAbliEjIk+N/+4mq0HC9YgquhoNtoTLltixCKom64UzaYkB1hdd1i
+yipCRlPOYElZzf84QDWNEzRG6qVAU7hN
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/proxy10-child-test.key b/lib/hx509/data/proxy10-child-test.key
index 8584ed82b..453175544 100644
--- a/lib/hx509/data/proxy10-child-test.key
+++ b/lib/hx509/data/proxy10-child-test.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAPJYlf45obAOkUEr
-Y4W3lX/DF1pjB1M1SL7Ui7udIPoUMAVhtGQSVLlE7EgRxaRSSh10u4Sj7OWXguza
-7WGRHfBf+lOo7hMGISEutBcNChaFG1Zv6khb0ybq/jubmBLU95bPwQxHrUTQzscj
-wgapi2dRbWnAmZ64YyN/SCwCJbulAgMBAAECgYEAqin7f9t1pYpFAc52fhCu31vc
-DPJV1V4nqx7Q0rZ8zjvYkB7PrCiW5tP3WI9qCHxjYBV0CamUkI13N9ptLcHYk27l
-pKH3f2yUq4r/OkR+y+oawu+ZJ3FzQ1VN2vlDACHrJTmo5xgICSdzmXlLIJezvaC6
-ZwDiCvzIjlZ2mkJkcw0CQQD+BghyHpK/I9JzYbgU7yba3RNSJjXljvAvpYeXNXHj
-FYu9BHjnTMzxrEfV3/7ZtZGhpQ7jr7l5E8cdLxV1ztirAkEA9DtLIgDsCnY2Bw9W
-xrLMDka2XzGZct/jkg4/9p9FQNbh/Blyz2Iojg8BHwbSAYMxLm2G1SRD0QMBfJFe
-6IRc7wJBALi/SoU1FyVMuFKST39qL6geAV9NywUZ4DXG/cZLaHjvwqHGDuiqQqPB
-2L0EHCXamAAoO5v8wbf9WmMvSzxTI+ECQGQFxIdwiTrfntDVX1yQ7TELlLT3wzhg
-qPqwC1IdeGdNmc99PJ/iO2myi2sBiBBGgmXZRVcVOxDmgj1Z69yeGNECQCCy5kWr
-LfUpc5kLru35n2w28KEWDxB77S5Pc34wADZBZTgmCO+oLNp0XVm8VaZWiqIJpfEl
-Ck7YrRwSTMEWmm8=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC66WUO0nCisEhdksIHmcS8LxPH0W9S38LftNiNIeWm3hJwqXq6
+Uf72j2mYfKUGWsZLdjP88s2Xk1wlaCUR39dIPNHztMzpOdTYaQhqhAKmD+CR/YQ/
+bgJFBDId0qqPmnHd7NjJvMf66Ia4boXTWjiQ9PPmM0604vyXSJh50PNCdwIDAQAB
+AoGBAIJ7YqApSpZYR/yC8k8KCqxwlPd+fp+1M76l6jMEQeTuzKK3vcSKb1pCna3k
+/fNktV+CwiJIgjvZlI9Ml+xVflxtNSOZgFixxqgeGPZ1jUMm0xvr6WBt25d+zclb
+HpW3E7DllVF0bTp7wK8hGI0Z0T8qGdjGmh9q13eOf/v3LBRRAkEA9N1JVvIHah05
+FgMi6cOC0Qx4v1HOF4lV2Vai965dtkpmFyjFaCs698guBJyQ0dMA7qevseX8wiwM
+PZB8e8jCaQJBAMNpbCKqggEj8kSSlHQ0T+Fap7ihcci7hj5tyOKhAX9h5vFyF1tO
+acZ7AllZqrrx0GYhwq/s0V6lRsXC6/Djgd8CQFOQyZywkLM4Mek/PMUGgjiRxwuU
+AX+q0O+RT6CzkyvJDDpPIb/BMSiq2nmcbRgOqLzJ4X4W/UHPAoZoLvOXujECQE56
+eEMz1yI+HX4MoDJLEAmhLtqne9rx9Of9jz/1CXTvDKDLATZaN4DOxhK8QCT0GI3r
+4RRmN2+bUOD7d2Y2+GECQQCfiGuPvzBryDxdvfZs9kuvn7D4RgDmEskWEVdbhP9d
+Y8LWrxPA4SZL3fFG7b0m3KPdsaAiwCRgvC5PAdhpsr6l
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/proxy10-test.crt b/lib/hx509/data/proxy10-test.crt
index d44a05bd6..702619768 100644
--- a/lib/hx509/data/proxy10-test.crt
+++ b/lib/hx509/data/proxy10-test.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICMjCCAZugAwIBAgIJAMJEvwnR1+2aMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
-BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjA0MjUzWhcNMTkw
-NDExMjA0MjUzWjAzMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MRAw
-DgYDVQQDDAdwcm94eTEwMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5Ob/3
-2MTKRNK4ubVPXNLRRBl/GiqQ9udpT4n97dg64D2aAs5HM6KHtsxp9Aswu2DUbOvY
-cAv93ygxMA6FZ0MD1XXA8l6PYBmDbAsTXKc4rbyCRHA9YCjbdstNYRZ9NoubW/k1
-ACPJnnpXnyWCufm6xAkya/g3zzCw+d6tpJWHTQIDAQABo2AwXjAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUkHjcteTyhVCIm4fIMFIK/AYV8SgwJQYI
+MIICMjCCAZugAwIBAgIJAMJEvwnR1+2dMA0GCSqGSIb3DQEBBQUAMCExCzAJBgNV
+BAYTAlNFMRIwEAYDVQQDDAlUZXN0IGNlcnQwHhcNMDkwNDEzMjE0ODAyWhcNMTkw
+NDExMjE0ODAyWjAzMQswCQYDVQQGEwJTRTESMBAGA1UEAwwJVGVzdCBjZXJ0MRAw
+DgYDVQQDDAdwcm94eTEwMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJdc5I
+Ynx3LIKW63t9dlbSVhPbLYx1vFg2k6eKG6q/3INLrtylxtp3mVxpYHVxT4EJMN5m
+wr2CixY02vaqRSsnZmDUTSEfHInvtjjXxVYbIXyT34QWrM0pLD6Sgos0fJe3KMYD
+ByiNMBh0IkpyTcqyeb8mCcRtClzUbcHr9NkzSwIDAQABo2AwXjAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUGAKhYNPztzv9WZExtC6Oubgj0uMwJQYI
 KwYBBQUHAQ4BAf8EFjAUAgEKMA8GCCsGAQUFBxUABANmb28wDQYJKoZIhvcNAQEF
-BQADgYEAgcmmd0MRNnf7scQ9FM28MVpUVQ+ZRWEvgvEIDrSmaWVY3NFj7xhUZbIl
-YNeVcOhvmjRILvptzg9gazmRNZLkm/1ZUSvt52RSP3ubqoa6qdcAsBhOjCsAbJtt
-X490FFGmpeOfAao+e7UhbLXPdAUo32LvyFtSkO3TXjp0a5x5vu4=
+BQADgYEAA+B+xr7ARPUG9xmKRQ2wrJnXAcEV6ndslXcvJS7pdkTcnGp6Yo5oNTQ8
+GmqFE1PE/IE0Njpz6wTT3xISKKr5NLgtFcMpnGFoZ6AQ1jQgxynVlQOx/Tch+fMd
+aijOuz8t0LTpSndhAl8BlJ+poLN2sYMkvUhue/t7A0IrYIkKDsA=
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/proxy10-test.key b/lib/hx509/data/proxy10-test.key
index f706c1142..aa12ec39f 100644
--- a/lib/hx509/data/proxy10-test.key
+++ b/lib/hx509/data/proxy10-test.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALk5v/fYxMpE0ri5
-tU9c0tFEGX8aKpD252lPif3t2DrgPZoCzkczooe2zGn0CzC7YNRs69hwC/3fKDEw
-DoVnQwPVdcDyXo9gGYNsCxNcpzitvIJEcD1gKNt2y01hFn02i5tb+TUAI8meelef
-JYK5+brECTJr+DfPMLD53q2klYdNAgMBAAECgYBkN4XRUNyw3+nvfrNF3GBIT4NI
-DN1JD/4HMbzkwkKDIH7UDH6Vca+XpGUXUq6XUFrEtKYqtf0XAB3b9zd0IHnV9n+o
-mwxkV8W2fzn5uSGoBEz7LZDE+AlwVj+UfsGB2hR3riJROL0/5Yh5BUKaTtfk1k5P
-11Lcc18/8mPMyKMgYQJBAN6WVj/NJSQU9NqU3ddnIn0sC+N+8TN4ctU+vyA/ljOQ
-3TqeGR0k6moPM6eQ7Vf4Nz1ZNzrXeToUyTafUuq1NuUCQQDVB6pTdtReYfoGd2wd
-SQfb7ctFI+cz2u/MfBFlHjLmX4IqyOM/nM2rfvuytUURl605oanm2tEmTCT5HWKI
-12BJAkEAuxTqmydmfyQqBIm4x3IE1+Yse+JXAmbLRZY+d/FZ4i9w8fKtswQzDj+G
-r+Esy5Jxg1u4AvnWB04vLHzO6Ty0TQJAJk0Ng5oezqVg9Z6tEorZ3eHgJRsya3FW
-ofZAjmSilCbh2V1q9jn0BHx9NoE+3M3feDgnuvjml7MjBqMQ3zeR+QJAVo2zzjql
-p15qAsqgsSTOgKII8hW58GaUN71vS2qv82c+AS+p3vzFKCyCiHZuYej6SZqP+TUr
-VMvTov6kyrhehQ==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDJdc5IYnx3LIKW63t9dlbSVhPbLYx1vFg2k6eKG6q/3INLrtyl
+xtp3mVxpYHVxT4EJMN5mwr2CixY02vaqRSsnZmDUTSEfHInvtjjXxVYbIXyT34QW
+rM0pLD6Sgos0fJe3KMYDByiNMBh0IkpyTcqyeb8mCcRtClzUbcHr9NkzSwIDAQAB
+AoGAIyqdR6VpdKQgZ5fThqMRpMXB0ZCx5BtsippbtI//zl3/zUZI3edIW3g52Wst
+FQp7y87sA6Qa0J7W0YMna7GHRpnEc5pgFv8amiJhIM+uxcjQOByXLfmOO5i4g78R
+1HGbT7VfEJNjDszVbFH49XQQGNgrlS3oFw+wtlBYB09s3gECQQD5plvCIsGwIzTC
+73JrAUTER5zDAGgEHNWLn1TJ2MGPBXBBXv4Hlj1TZJIM/EYsz0sulIpH2710wMOJ
+eQFvYUubAkEAzpWmwbD/RsVnmBeOgnEAFdJ7qIZPZ0CAlcntWbDwKnGqbJ8ZWhMo
+etzaZhrOY3QiAas0bdSGPEiCAmW/CA9qEQJAeQtQMjDn+J8ZVesDbx6OWRzfxSzN
+QjE42RnH4pZWQyI/63JDeSo/Uc/RgLpQzCk2Kr+azHyev503MdCaAYcLQQJBAIQ1
+dhFDizvpnhDSEpwcYWeV2xnRSwPTXfd+0W2zNSCUufLmJz1kQWXP7d2mjitL6W+T
+9+vKNVZjOQD7yLQJ2WECQQC/ClIgX9Npa4cO/3ttODswubwY0mZU25otW0TKYu7z
+5g37JWUv1AwFzPmisWz7v+aJkJY7Tp1aGMZy8y+9r0hF
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/revoke.crt b/lib/hx509/data/revoke.crt
index 65da3c8b6..df1ecc1f7 100644
--- 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 After : Apr 11 20:42:52 2019 GMT
+            Not Before: Apr 13 21:48:01 2009 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)
-                Modulus:
-                    00:d3:0c:e5:df:be:5f:59:40:dc:96:38:fd:7d:ac:
-                    84:89:38:8a:4f:d3:60:c9:db:64:28:ee:9f:a0:fe:
-                    6f:c7:6e:9b:dc:68:b4:7c:56:fa:ed:fe:6b:01:6c:
-                    a0:4d:cd:7b:b5:88:64:87:35:9b:70:57:01:b7:04:
-                    18:d8:ef:d2:06:38:f5:2b:aa:f9:7a:11:f9:95:27:
-                    36:ce:8d:f2:3a:5c:d8:08:64:9d:d7:d4:9a:4f:ea:
-                    39:45:b4:3b:c5:ae:4a:f6:ae:ca:5e:85:dc:72:e0:
-                    43:68:01:2f:fd:6f:4a:e5:bc:62:c7:72:61:30:92:
-                    57:12:85:4b:47:92:96:51:91
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b1:c4:3b:0a:bb:c6:09:cc:70:17:ad:40:fa:81:
+                    3f:a6:10:74:14:d7:72:e8:99:03:49:c4:bb:f2:0a:
+                    94:da:f5:42:7c:33:6a:f6:d4:fb:ce:64:cd:9b:08:
+                    f5:76:4f:ee:24:7e:58:c4:b4:4a:e9:8f:6c:b2:8c:
+                    82:42:06:3e:c6:a3:bc:fb:96:3f:7f:ce:cb:15:79:
+                    46:38:35:df:0c:2b:28:f3:1c:83:4f:0e:84:16:ea:
+                    20:07:c6:bc:29:98:33:d8:a9:09:3b:18:33:4a:6e:
+                    8e:6c:bd:86:f4:35:97:30:ae:fe:6f:2e:dd:c3:4b:
+                    a7:9a:d8:32:41:c9:e3:46:55
                 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:
-        c4:ba:0b:33:fa:70:e5:1c:df:4d:9a:40:99:05:2c:e0:6b:1a:
-        b0:fd:72:f0:36:da:c4:cd:b3:bb:19:8b:4e:9f:4f:2d:72:3f:
-        83:0e:9d:37:2c:2e:c9:67:fb:99:37:40:4b:ac:57:a7:72:42:
-        35:71:5b:4e:19:97:92:b4:36:71:53:c9:e1:3e:71:68:f3:18:
-        5d:1a:ac:50:21:06:2c:a3:e6:10:2a:73:73:a5:60:49:c9:ff:
-        4b:f6:85:6a:b6:75:cf:f8:5f:43:04:eb:df:eb:5d:10:c1:42:
-        12:15
+        10:5a:65:89:e9:2b:3e:44:ad:8f:73:d3:f0:a1:e1:15:0e:c5:
+        b9:27:5f:e7:9c:b4:73:10:ad:e9:9c:e3:7a:bd:f3:2a:bd:0c:
+        c9:d6:c3:39:41:f9:16:ce:eb:61:77:3a:9d:f7:a0:20:ef:89:
+        a5:50:3e:01:df:1a:86:80:3e:f2:5f:d2:b3:10:5e:1f:28:b6:
+        3f:d8:34:41:0c:bd:cb:fe:d9:63:46:4e:5a:23:d6:3c:83:eb:
+        6d:22:25:bc:09:20:b8:1f:08:b9:f9:9a:a4:e5:1d:39:b4:79:
+        89:e5:c6:34:26:2b:9a:2e:cf:3d:66:d3:c8:ee:bf:f4:8e:03:
+        bf:d1
 -----BEGIN CERTIFICATE-----
 MIIB/DCCAWWgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
-MDQxMTIwNDI1MlowIzELMAkGA1UEBhMCU0UxFDASBgNVBAMMC1Jldm9rZSBjZXJ0
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTDOXfvl9ZQNyWOP19rISJOIpP
-02DJ22Qo7p+g/m/HbpvcaLR8Vvrt/msBbKBNzXu1iGSHNZtwVwG3BBjY79IGOPUr
-qvl6EfmVJzbOjfI6XNgIZJ3X1JpP6jlFtDvFrkr2rspehdxy4ENoAS/9b0rlvGLH
-cmEwklcShUtHkpZRkQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
-BgNVHQ4EFgQUsoKOjnS+MKckrITJpjVsnlZWzWEwDQYJKoZIhvcNAQEFBQADgYEA
-TCx3gl95d2Z3OSBESKvtGdtzxLoLM/pw5RzfTZpAmQUs4GsasP1y8DbaxM2zuxmL
-Tp9PLXI/gw6dNywuyWf7mTdAS6xXp3JCNXFbThmXkrQ2cVPJ4T5xaPMYXRqsUCEG
-LKPmECpzc6VgScn/S/aFarZ1z/hfQwTr3+tdEMFCEhU=
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
+MDQxMTIxNDgwMVowIzELMAkGA1UEBhMCU0UxFDASBgNVBAMMC1Jldm9rZSBjZXJ0
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxxDsKu8YJzHAXrUD6gT+mEHQU
+13LomQNJxLvyCpTa9UJ8M2r21PvOZM2bCPV2T+4kfljEtErpj2yyjIJCBj7Go7z7
+lj9/zssVeUY4Nd8MKyjzHINPDoQW6iAHxrwpmDPYqQk7GDNKbo5svYb0NZcwrv5v
+Lt3DS6ea2DJByeNGVQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
+BgNVHQ4EFgQUbjzt6UsgzlBkTjAKPTM1Ew61fqAwDQYJKoZIhvcNAQEFBQADgYEA
+EFpliekrPkStj3PT8KHhFQ7FuSdf55y0cxCt6Zzjer3zKr0MydbDOUH5Fs7rYXc6
+nfegIO+JpVA+Ad8ahoA+8l/SsxBeHyi2P9g0QQy9y/7ZY0ZOWiPWPIPrbSIlvAkg
+uB8IufmapOUdObR5ieXGNCYrmi7PPWbTyO6/9I4Dv9E=
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/revoke.key b/lib/hx509/data/revoke.key
index 55e3ffa30..23538fc87 100644
--- a/lib/hx509/data/revoke.key
+++ b/lib/hx509/data/revoke.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANMM5d++X1lA3JY4
-/X2shIk4ik/TYMnbZCjun6D+b8dum9xotHxW+u3+awFsoE3Ne7WIZIc1m3BXAbcE
-GNjv0gY49Suq+XoR+ZUnNs6N8jpc2AhkndfUmk/qOUW0O8WuSvauyl6F3HLgQ2gB
-L/1vSuW8YsdyYTCSVxKFS0eSllGRAgMBAAECgYArjGbGg07DaPnbWYkc7IMwmWUY
-0aIQJOAG/i4cF0RTX4Rzt3s+iOggQbYsxhBR3YugSrOLnskjJiDpdcP2x42LcS+R
-sjXAqhD4V03BfBl5jg9T2oh9y4d2SyP0UsVATvzHaPYhnqEK4rRExAm7wHVt1WdU
-G9pr0cTNr9dnd4axUQJBAO9mpeWTA4/1/yhxWju5+YegbucmNkrhFia6Zjw5b6MR
-SInjgrEK2K9qJ2iFrX/hzztanDVOKw8UhYIWBM8iniUCQQDhrwdf+tz23Hx9h44R
-1k/yyge+xZAB/EgVMiNSWFY6iBCWuM7n+6gXO4NDtrdBYIaTtqTAWUeTyypG06rJ
-/7v9AkAcDtrIsldLixhRpB9gOqa9N5dn7fmVAxZ2iYgr7MthwEfRKWIK3+uPe5CM
-1oYEI/IG0dLXCIdRaCVRnsUHhdYlAkBbDIolJshOr9Vpr26Zs6S9htRpGrtmkalj
-I78sUYc4RfyrUhPnc5f1B4WFpAl6zr58iYseLua5sZV0zaBxrkLhAkEA4UtIiu7u
-KS07l0dr8sU1FShNzjz+k+gQoCrfQOy0/kjva2jxkhZ67munq2lcpYOmsRf34m7B
-2uoNaQc0Bb3bFg==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQCxxDsKu8YJzHAXrUD6gT+mEHQU13LomQNJxLvyCpTa9UJ8M2r2
+1PvOZM2bCPV2T+4kfljEtErpj2yyjIJCBj7Go7z7lj9/zssVeUY4Nd8MKyjzHINP
+DoQW6iAHxrwpmDPYqQk7GDNKbo5svYb0NZcwrv5vLt3DS6ea2DJByeNGVQIDAQAB
+An9mxQtdKTFUeNxU09S8/fvOBbUWV3gXAF7mRtZhF7z22NOW+iLckEUDDUPQXV2L
+CKqkbmbjUVf9ru0oTBMCGJoxRYMF+UUPyCV/2EZFZAOJ5RfpCHAbOO7PfIZarj6K
+D13HS4P8fxMQiSq3hqVU2GYW+i/n4QGTYIPVqRae8lKBAkEA4BL0YfKTpGsS5NA/
+dPGbljkthRfUqlan1d0BtomLhE77SPyhX25DhW9B6VTZu5D7klRjr3/Djo9qBKE9
+xrVYeQJBAMsYOIbSDPDvF1oKhyutj9/zkXskUXci/6a1diPrUXF2cPzyKv+VWpyd
+AB3yWaCLgkyeI5l3KJbiM/t7xa6FXb0CQQCmNOkZDjn9p36oQuAO+ngSAe+F3Ztd
+jlGIDRsMLxJR3dP+24VHqB5lh5U4YjvvKSex7u7Sas6/nBljvcZ48mLhAkEAiCX+
+jvL1VfcSMnxoTTGXB8zitCiOrE08EOgJAN9Zw7Rg3lEB3kCjc+YUE/9JckTT3sUM
+nG6zOSL/MhGxXeNuCQJAW/6AqwhOHIDevBqiDWNTPnM0FkQMkDM9rdN4JWyARJ5b
+mNcdiUjyg/akjumwT4cma9PRKX3HW3S9293oJ9twhw==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/sub-ca.crt b/lib/hx509/data/sub-ca.crt
index db5c11b15..787ae4e97 100644
--- 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 After : Apr 11 20:42:53 2019 GMT
+            Not Before: Apr 13 21:48:01 2009 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)
-                Modulus:
-                    00:b6:3f:43:2b:f6:52:05:d9:ae:43:d5:4a:fa:1b:
-                    a4:4d:13:72:80:2e:c8:6c:c6:2d:8e:f0:fc:7e:19:
-                    8e:44:ca:2a:b9:ba:c4:ff:f7:e2:79:75:22:38:13:
-                    e1:24:2f:a0:d3:f3:2b:2b:7d:a1:45:2f:7b:3a:10:
-                    d1:5a:ac:1e:5e:5f:17:c6:93:5f:83:30:33:20:6a:
-                    71:1b:6a:16:43:00:2a:23:fa:ee:3e:71:45:1a:25:
-                    90:68:57:e8:7a:48:ac:62:b4:46:63:37:c4:e4:b7:
-                    3e:df:c0:75:e4:c2:26:50:d5:fd:9c:ca:f3:e9:b4:
-                    0d:75:8c:8b:8c:d3:df:a8:4b
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:e3:6d:42:f0:72:93:2a:b5:ea:6b:f3:80:ac:50:
+                    8f:ed:ae:bd:1c:76:3b:d7:50:61:d9:a1:32:2f:57:
+                    01:7a:2d:9c:d4:c9:ab:91:ee:91:1b:cb:59:1d:6e:
+                    01:af:de:24:8d:00:26:15:31:52:be:11:16:a5:8a:
+                    59:4b:9d:b8:49:a9:2a:ae:9a:56:6d:0f:9f:21:4b:
+                    6a:11:61:e2:d8:72:b2:b7:da:2d:e6:36:b3:90:82:
+                    4f:e3:24:36:96:0b:49:5c:48:6b:e2:f9:ff:40:24:
+                    ea:d8:3e:da:a3:72:1a:82:ac:0d:1d:a6:a0:0f:54:
+                    e1:18:dc:e9:3e:11:c5:ae:9b
                 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:
-        2f:f6:60:c7:a9:40:10:06:e8:8a:3c:b9:df:a2:61:c6:84:62:
-        ac:50:01:e8:f3:06:93:d5:a3:51:42:9e:5e:34:33:7e:44:d9:
-        2c:16:47:63:9e:74:30:3a:4a:15:62:0f:46:26:27:8c:cc:47:
-        71:34:0d:de:d0:58:d4:c1:b7:b6:b3:fc:8f:0e:04:2d:db:35:
-        f0:57:3a:d5:2a:cd:34:fb:20:17:9c:58:51:3c:fb:43:ef:2e:
-        7b:f3:02:99:fd:cf:45:25:f3:a6:e9:e8:7a:94:f1:ba:07:9c:
-        90:c7
+        5b:fa:55:63:b4:03:5c:a0:24:33:da:b3:01:05:87:2f:7c:27:
+        32:85:43:df:b5:18:3f:85:4d:cc:31:d7:10:28:08:f3:40:9d:
+        c1:af:29:32:0b:bd:f1:18:e5:d3:f7:21:df:40:9e:07:ae:5f:
+        e4:b2:09:e4:a8:ec:35:f5:d3:a0:59:3a:ab:a2:6f:1c:ce:74:
+        01:55:74:45:83:08:cd:05:56:cd:a5:63:21:d4:fc:18:47:17:
+        f9:fb:8b:1c:71:2d:be:6e:53:a1:92:0c:f4:f4:54:49:77:38:
+        88:68:18:28:dd:3b:7c:b7:ed:34:74:1b:34:af:2d:25:f9:ca:
+        d2:bc
 -----BEGIN CERTIFICATE-----
-MIICWDCCAcGgAwIBAgIBBzANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1M1oXDTE5
-MDQxMTIwNDI1M1owHjELMAkGA1UEBhMCU0UxDzANBgNVBAMMBlN1YiBDQTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtj9DK/ZSBdmuQ9VK+hukTRNygC7IbMYt
-jvD8fhmORMoqubrE//fieXUiOBPhJC+g0/MrK32hRS97OhDRWqweXl8XxpNfgzAz
-IGpxG2oWQwAqI/ruPnFFGiWQaFfoekisYrRGYzfE5Lc+38B15MImUNX9nMrz6bQN
-dYyLjNPfqEsCAwEAAaOBmTCBljAdBgNVHQ4EFgQUj1nzzM4mfLkZkTTka4RLvLKg
-CFwwWgYDVR0jBFMwUYAUexwIpJPepjT4WP8pWpcsB8YSOvuhLqQsMCoxGzAZBgNV
-BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0WCCQCayq4ZKFpHwTAM
-BgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB5jANBgkqhkiG9w0BAQUFAAOBgQAOiPQr
-jUEcHCLalRKnlNlkV1Qv9mDHqUAQBuiKPLnfomHGhGKsUAHo8waT1aNRQp5eNDN+
-RNksFkdjnnQwOkoVYg9GJieMzEdxNA3e0FjUwbe2s/yPDgQt2zXwVzrVKs00+yAX
-nFhRPPtD7y578wKZ/c9FJfOm6eh6lPG6B5yQxw==
+MIICWDCCAcGgAwIBAgIBCjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
+MDQxMTIxNDgwMVowHjELMAkGA1UEBhMCU0UxDzANBgNVBAMMBlN1YiBDQTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA421C8HKTKrXqa/OArFCP7a69HHY711Bh
+2aEyL1cBei2c1Mmrke6RG8tZHW4Br94kjQAmFTFSvhEWpYpZS524SakqrppWbQ+f
+IUtqEWHi2HKyt9ot5jazkIJP4yQ2lgtJXEhr4vn/QCTq2D7ao3IagqwNHaagD1Th
+GNzpPhHFrpsCAwEAAaOBmTCBljAdBgNVHQ4EFgQUEIkLF2HOfmOMEWiP/9XAORMs
+v8MwWgYDVR0jBFMwUYAUUTzkpzAUjFV0lRxYavLGBWqn4/GhLqQsMCoxGzAZBgNV
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0WCCQCeT5+ZKyq6fTAM
+BgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB5jANBgkqhkiG9w0BAQUFAAOBgQBb+lVj
+tANcoCQz2rMBBYcvfCcyhUPftRg/hU3MMdcQKAjzQJ3BrykyC73xGOXT9yHfQJ4H
+rl/ksgnkqOw19dOgWTqrom8cznQBVXRFgwjNBVbNpWMh1PwYRxf5+4sccS2+blOh
+kgz09FRJdziIaBgo3Tt8t+00dBs0ry0l+crSvA==
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/sub-ca.key b/lib/hx509/data/sub-ca.key
index 36f145dbf..bbd5bc7d1 100644
--- a/lib/hx509/data/sub-ca.key
+++ b/lib/hx509/data/sub-ca.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALY/Qyv2UgXZrkPV
-SvobpE0TcoAuyGzGLY7w/H4ZjkTKKrm6xP/34nl1IjgT4SQvoNPzKyt9oUUvezoQ
-0VqsHl5fF8aTX4MwMyBqcRtqFkMAKiP67j5xRRolkGhX6HpIrGK0RmM3xOS3Pt/A
-deTCJlDV/ZzK8+m0DXWMi4zT36hLAgMBAAECgYEAhfgbOMXppcNPBy5T32dScBZL
-pU6+prdH5jvgYBIJMygqID3bcw6VvRMOBIsYhbE9WJD4uw+u7VzqCNU0EKNV7muG
-4MH5f/tw0Pv15DCRwwHFquVaK5saMJHHTQKiUCXHSjvTG3Gvnw5NwbIl4RQ/+q1n
-Riyy8JL0J4VV7Bhz3QECQQDki68Y+96Wop9vc9ZYBtyL0NAJwZOHfvfxPklLqAgZ
-jw9uECCwRGIznnuFrN23B4xrltvQN+RPFDbUIp7pYsvjAkEAzCPKOz+rHsn/VvI3
-WQWEydWlrJ7C8j7NX89dUN4lc5o40OVzZCjDe0+0vt5ZzPa6T91BQYJOT8cyV3+1
-IVOueQJAVQw2CJIR7vRtaEgvB2rmP5FhGYBTqiRxl/CZzfGlsf0uvMJ7p5yK/rKH
-PONrTmUcuBzXh9CEwXjAPojzod4GCQJBAMQhps1iEJDWVqM8uHypVrlssW62YmrI
-eB2TZ/6oUKdPB0N9EG6s05QIMoonq3PHoZ3V4DqGbaMsqWtz4Z0Rf1ECQQCSoq08
-7rF56RErF8p8H1bM2UoIesPZvbe5Cop5KBWY5efWxKlIANdCrl1G42UScdzYf8+p
-Aj6codFd46RRTmbQ
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDjbULwcpMqtepr84CsUI/trr0cdjvXUGHZoTIvVwF6LZzUyauR
+7pEby1kdbgGv3iSNACYVMVK+ERalillLnbhJqSqumlZtD58hS2oRYeLYcrK32i3m
+NrOQgk/jJDaWC0lcSGvi+f9AJOrYPtqjchqCrA0dpqAPVOEY3Ok+EcWumwIDAQAB
+AoGAcDAw6j4K3PHaTyBSpC4loeEmBslIYcGUU3ASOooX/3ZKvCkzyow95tEcB8mB
+aYkSzL97Cc9H+tyhKE4kGIoYIse1D1ANUTKxdbzf62QQbSVgmKutBHEOrRoB2/97
+sE7APe6tyvOVqZleCjb/8NgzbzsZtH6mQmSQZj/SsQvmDSECQQD/CF7b8oZ5VYGJ
+GZUn5iDiT1RfIezZjE+gvttxinxv2HipzJ1s8ySTWBCqRB1AhuSHX6zOP3GV6cg9
+UVUd6pnRAkEA5EoWHohhMskL6pdOl4HTqyvCmLheY3y9wn6KRdFj624gyI2hyqYn
+iIyNDcfdu4YtLi4pH6+szvqmb3TvQk3wqwJAJh3XJ6JozMulz5reOxdfBNP8dTd5
+0c3xvMGpxJ+BF6pP5njpcnYomkkIPJpvkMxYbY80IaND07ccMWXthcohcQJBAN9u
+G0P62pan6n/JYuQp7o6jH6v1FnxshBStYIuAqjir6m4fIHCEOkEMvqj0KnH0mpeO
+GjWm7I0PCIIhgmH0gk0CQAamGhuYqbpoAJDWep/F/x3AXz6FqqBN1o+5N77d6XcJ
+RIU9tIRgcyecm0CFEtHcjzlQ1V4f2GXuoTkZn7o0ZjE=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/sub-cert.crt b/lib/hx509/data/sub-cert.crt
index 39dc45172..065476b66 100644
--- 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 After : Apr 11 20:42:53 2019 GMT
+            Not Before: Apr 13 21:48:01 2009 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)
-                Modulus:
-                    00:f6:d8:4a:e9:a3:4f:37:8a:fa:8a:ea:f8:48:05:
-                    2e:1f:58:e8:60:0b:80:54:8e:8c:7e:79:06:48:0f:
-                    1b:9f:d2:45:42:2e:1f:6b:ff:c3:a2:23:58:0a:3d:
-                    82:25:26:5a:a0:69:ca:d2:46:df:36:fe:07:a0:a6:
-                    ef:ae:48:73:c1:c2:fb:c5:89:b0:f8:ae:4d:5a:19:
-                    46:c6:9f:0c:de:22:fd:43:ae:eb:d2:00:6c:30:c2:
-                    67:83:2a:87:25:cf:22:e6:8f:c2:f3:70:6d:74:38:
-                    1e:a8:cc:5a:c4:4b:b8:e5:98:bb:67:0d:c7:c6:55:
-                    2e:16:6a:ca:e0:f6:a1:d2:b9
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:ab:c3:df:fd:78:b0:14:50:bf:50:a4:83:b4:cc:
+                    45:bc:0e:94:e7:1c:50:d3:08:54:e8:55:2f:ee:f9:
+                    b5:0a:d7:d5:2d:a8:c0:6f:6a:d7:9b:b5:86:fc:58:
+                    c9:26:af:c5:f4:ca:85:b7:02:d0:d6:e1:ae:40:1c:
+                    3b:f5:6a:52:77:28:69:d1:9d:2e:55:9a:9d:d1:f6:
+                    02:09:c8:b8:b7:cf:91:27:1d:7d:7f:43:1c:8c:26:
+                    da:25:40:a2:01:17:30:b9:63:bf:7f:16:17:27:7d:
+                    0f:d2:be:a9:5c:4a:ef:9b:69:96:47:57:2c:c2:7b:
+                    96:e6:f6:5e:52:0c:7f:6e:b9
                 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:
-        19:0f:e6:b4:5d:2c:f8:d1:a1:f5:9a:ba:b8:61:79:05:26:01:
-        72:46:30:14:1f:85:a7:1d:11:c5:b8:59:ff:23:1f:2e:1d:9c:
-        c8:99:12:8d:6e:f7:19:ac:53:47:d1:34:85:d3:03:ea:04:50:
-        7b:b6:04:b9:73:cd:3e:e5:b4:10:c1:bb:f9:a7:70:92:96:d5:
-        95:f3:31:8b:0a:fb:8d:63:82:9e:c6:4c:2a:b5:56:f5:0b:24:
-        c8:26:52:c8:83:78:42:b6:9d:34:74:bc:7e:c1:72:98:8d:01:
-        b6:a9
+        65:4b:14:a0:36:3d:41:8c:2b:e0:b8:f8:b6:d8:50:43:3c:31:
+        97:17:71:15:93:ef:8a:bb:6d:73:40:9f:37:db:51:56:68:9f:
+        ce:88:ea:89:0e:f0:31:c0:11:f8:85:43:54:76:3e:41:7e:46:
+        99:1b:05:8a:ce:79:05:65:b2:bf:4c:c4:12:ac:dd:34:69:c6:
+        f7:31:02:db:8f:a3:ed:ac:4d:fc:a8:b1:ca:be:5e:65:2e:12:
+        91:8b:c3:b1:05:b9:2a:b6:04:30:f9:57:cd:01:0d:db:a9:b1:
+        cc:3b:2a:0a:53:9c:2f:3a:0c:a3:36:d5:7b:5e:8a:cb:be:75:
+        70:af
 -----BEGIN CERTIFICATE-----
-MIIB8jCCAVugAwIBAgIBCDANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJTRTEP
-MA0GA1UEAwwGU3ViIENBMB4XDTA5MDQxMzIwNDI1M1oXDTE5MDQxMTIwNDI1M1ow
+MIIB8jCCAVugAwIBAgIBCzANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJTRTEP
+MA0GA1UEAwwGU3ViIENBMB4XDTA5MDQxMzIxNDgwMVoXDTE5MDQxMTIxNDgwMVow
 JTELMAkGA1UEBhMCU0UxFjAUBgNVBAMMDVRlc3Qgc3ViIGNlcnQwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAPbYSumjTzeK+orq+EgFLh9Y6GALgFSOjH55BkgP
-G5/SRUIuH2v/w6IjWAo9giUmWqBpytJG3zb+B6Cm765Ic8HC+8WJsPiuTVoZRsaf
-DN4i/UOu69IAbDDCZ4MqhyXPIuaPwvNwbXQ4HqjMWsRLuOWYu2cNx8ZVLhZqyuD2
-odK5AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTR
-2LJ4knq02rSC7ijNo06ur7N8+jANBgkqhkiG9w0BAQUFAAOBgQBvqrwCH0ncmwY6
-mFuhvm8yfwIZD+a0XSz40aH1mrq4YXkFJgFyRjAUH4WnHRHFuFn/Ix8uHZzImRKN
-bvcZrFNH0TSF0wPqBFB7tgS5c80+5bQQwbv5p3CSltWV8zGLCvuNY4KexkwqtVb1
-CyTIJlLIg3hCtp00dLx+wXKYjQG2qQ==
+hvcNAQEBBQADgY0AMIGJAoGBAKvD3/14sBRQv1Ckg7TMRbwOlOccUNMIVOhVL+75
+tQrX1S2owG9q15u1hvxYySavxfTKhbcC0NbhrkAcO/VqUncoadGdLlWandH2AgnI
+uLfPkScdfX9DHIwm2iVAogEXMLljv38WFyd9D9K+qVxK75tplkdXLMJ7lub2XlIM
+f265AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTR
+YE5fLP703inb8l68LLLfc1iEQjANBgkqhkiG9w0BAQUFAAOBgQBlSxSgNj1BjCvg
+uPi22FBDPDGXF3EVk++Ku21zQJ8321FWaJ/OiOqJDvAxwBH4hUNUdj5BfkaZGwWK
+znkFZbK/TMQSrN00acb3MQLbj6PtrE38qLHKvl5lLhKRi8OxBbkqtgQw+VfNAQ3b
+qbHMOyoKU5wvOgyjNtV7XorLvnVwrw==
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/sub-cert.key b/lib/hx509/data/sub-cert.key
index a2606952b..b9eecac7f 100644
--- a/lib/hx509/data/sub-cert.key
+++ b/lib/hx509/data/sub-cert.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAPbYSumjTzeK+orq
-+EgFLh9Y6GALgFSOjH55BkgPG5/SRUIuH2v/w6IjWAo9giUmWqBpytJG3zb+B6Cm
-765Ic8HC+8WJsPiuTVoZRsafDN4i/UOu69IAbDDCZ4MqhyXPIuaPwvNwbXQ4HqjM
-WsRLuOWYu2cNx8ZVLhZqyuD2odK5AgMBAAECgYBCHfkiz31ecTlekEVkdQ6/kr7b
-SvlarLvw/FW0Y2eQzW+DpHsCIIW0HidsxsDfVoCbyvpqjFUpk61TWKOGWR231+fe
-mcn1oDltdYl1apU/iyhsrctZuBVJW9pe7hos4MvU1ZrZJzyF8jnMy1RpQD7A0WQf
-9QEZ7Itjg9zy+OTpAQJBAP3/fVfYHsF3YB5CAo/Xm2rSek74ylj1UGzPh0GNMkRQ
-XX5BJu4lamL9AGzTFr2bdC8ilkiOQ3AWIhdrWaO8rVECQQD4yl6hFRcHEiclePum
-wDYGmRlgiEGPJ0mNgtOQpGPK3PQXQfDhDNdN26RF9kVysqWINWxjynzVUvzh73TO
-EdTpAkBK26iiYiS2Witu33+Hy0CX3A6GBdcFHs+kMgmn7Sg6cAEN+7+wgkB3ih88
-832JRi6Y0bW/DoabmzpS8qWJl0rxAkAwETlTOfXnAdTaYpOMVhqaD75dbjXsaJTH
-aH1jtr8pFKN8UtstQAPhIQyOD9S/IlDlDh1Q8nBH7u644EDbB4rxAkEAyNPbKke9
-rxu01y2/mUVugo5c8puy3o2Wi6+b8x3wotYketv3lUKDtXjJQap3CGcLe16cZ25O
-5YoBKDXPhDxiBA==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCrw9/9eLAUUL9QpIO0zEW8DpTnHFDTCFToVS/u+bUK19UtqMBv
+atebtYb8WMkmr8X0yoW3AtDW4a5AHDv1alJ3KGnRnS5Vmp3R9gIJyLi3z5EnHX1/
+QxyMJtolQKIBFzC5Y79/FhcnfQ/SvqlcSu+baZZHVyzCe5bm9l5SDH9uuQIDAQAB
+AoGAeN4T74SOuyz7A19RAte/to64P00Qnv+85+SSH2L9/8xTSZb3GzAe2oZJn6dG
+nP+RmCkvINJNbPhQKvLzSkXwEpvCd7hU+v5uAd906Wu8af7a1W9JaJH2mSbWhRhL
+/aa5gRY8buNy4IH0uGiv1Yti7GHTBLMsZGxZPKLL5gpz80UCQQDgeyq0wu0EhvX1
+JlgK2uhc9p6toZ12XwjAH3ikEYtKOEr7kzlEBnPMqUWU/5hrh8sLtoq/Rhy8lrYj
+e4YmiSOXAkEAw+Hdee6ie2IJRolpOsiiZ5GqjxLYILBIzS0xnIIgpJGU4g42fTT3
+rJ54nanAs6ebwqV5mgVelRvGMrYpN0IKLwJBAKLhm9Y3TgWn69Wqsd2Gg23Y4MA5
+8WhPgqjs7PuXY0tCV139sGKkj+ejt0Jqx2zWxkTEeh5ZwEYy0Qwj9+4EOhcCQD2l
+Sn9CI65y1vp06kIOvFWd2TB3vL7k27R+oZtgtIc2LcXKtUlILx4LLWho8PVZLULf
+stpPEEoa2JBDFcuHJA8CQQCc/rbxp/yofG9hxFTVZvB3+USQPN7vMijkd5ppwpkq
++hyaHDANZsPEG39Gw6roX0z1lWVkVYl7cT2AlsCwOaFJ
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/sub-cert.p12 b/lib/hx509/data/sub-cert.p12
index 39c69cbe169d8f2e5810a93bf4bbcb72d9886135..5428d11d18ef2330ccc3bb25f1bfe039db36323f 100644
GIT binary patch
delta 2807
zcmX>gen5OeZ2eBN+jrk*daPz*;$UcKVt<iqxz$BnI=SwETPy1U)1t19FFz+H*4?cU
z_E}l5=;O%;D(2m~#exR=vll<~R8v|Pd7axV%&#<Tf@;>v`9W4eUmnG}DR4V7P5r9B
zfPZnKyx-Nm0y8c24?me#^6=M*va@B^x4d-x{o^we1K(}wZ9l5&=WBjpQ#hn+D7b%@
znZp9-c$p4nZ!OtVjY+ShTOJs_+01`nZ{Y7x{hNmr!^&PP`}snr_{@iOh7N0ZZ}Hrj
zDYGF%`ss@Z-SywLF|Bs&5#^Bob9T>r-ldB#oa}r0OU-b4WNW$DoA-8s>s_wZ6_(y#
zlaO@HWukYw_paSFbw92M{#shUD@J1_^N(%2s@yZbToavS`)kqcn~b~P<*yK4H$hs+
zGHubKSE8HTSm$)LGbTL`voE$_Tz_@x`qQ^JzjR64aKFBy;ncqmZ%<A=^E-omZ)GLV
zjk8Bn&u!A`de&F;cIuz|%`Z>M+~0Mmi<7B4w%0sBLf3<P)x#4Pu1z`5wnY20$d;7)
zJ^OZw<!2|||Cj$xG^xCf?MOyrS&MPu*A+jK|IXZbbxlt-Pkqbpg^M;CvUc5%mpqik
zTX-<-vTj1yhZ>2p%brX8Sb1x8=Lot7NXV40ci!{+$$Gyo7mLLQUfM5bUbff$6l0#>
ziB$=`B3t;Es-N1It`%hZx;#4m=mfc$CVDH^$<^n)Kb&%kXDRz<+gaA`;R!3&t6$pS
z_`xQa<G<I5H?uas()qRSIWKcajA`WQec~_A#k0pL^e*gSHeWs2CiUj`v!XgrGykfT
zKGm;X8?r9FPBkf*%}k|;L*L)cI-TV^C$mdgX5Wo_?0GF^PZ#at_UmnO*LEv+(VZaj
z@!q@j&t-(_4~oPohILGRUHM|w4x98JqL<j!YGqq@L|>B$`F2v<?VsO!#VMS5SF;*#
zUQ}KBCv-03bIr>RpQ<Oj9=KmV<>3e8+Pu~2i=XXMl74+A(#EE7S(d@woMziQCaZ54
z8n{3CBfRC}uENNQ2|oK>YpiccJTzRB_~c!#I-5@Wi#}QX-skmgF*RE)-P@k}G?X-X
z6~%cPUJ=tcZn@~Tq)6_TxiS{543Tm=CsaaG_HVly7`ZF_`u(|0((7%TXUq%AyBqsA
zNbl3-o17O+^BmsVTqyYTd;6r@e{N~IX*^Wj{IFcsh{bvL_alZ<w|o<=TzD?+u)iz(
z<%(R@Vp);DFD|ev?9pXiUq4fArcHyJZG3r3@cYjP!ye6BeEq_Y$dK*K4c_d_M06C&
zf6hEF`l?vd>xGr@@40JKcSd$kUh!u3!^$Tzo0*r*ujsy>`a{cVQ`kS|q!nlOM>1dQ
ztxZxtz!A7{=?hjnMWd}@XY^wtcJr7fNatOA-0(8Y>g$rdn{4Y9u7^IIv*mJ6y|;Dy
z(xrCio22g_7Gnyx`O+6~^Uv1DN|jT0X1_i7?Ofv?kJy)PZ;QKMwbwl^sN>~QSs=Y&
z<qK)6D_lov&NXUox%qV2?AWPw2ELsZEjJ^dB`=jfT&I`0T}?~W=h%z){%!Gcb_*0)
zlcz0QeR^j5n(Sqd6c%sh+_!EImt^;57mY>rHySJsZJxMVK`LR#Wv6K$UCQ=xlp7pQ
zR!`=;^3{6c&0qWO*J}QrWVABo(f_OOr2S@fIouO4Stnt(Zd&NcL#(wSD@;_jtUkNq
z-OU7!xpUYLDVX;iOHh=3uuGPCmfvwHFO&YW7uNh*c3ArEwxyw(dp)%D8l!ygzP$F`
z*KF0{F73zlg8YRE*RS77TP3eICsNrv{^oK%*}Y|IKkVZ9?!9l?aZXCCU}@-W^OU{I
zDr9;hKkrrhEmv2Z+iA~v?YqTwj*A(pTxSe!N`*SFTw`4}{k%|5!%Ww^A79%0f36e1
zKJSO?>iV{4kDvU#toQ0}%%a1Z4x#hnUyG*Ju4&#NuX?E{xvk#Sf8Sb#$;ax|t_2#z
zKU`mY^!@*dG3-idwst*=2byf&1WL6{U{uK2KljWHo!99-yS27W|GLxqIm4H0_kMr;
z^@l6B;NaqoD=t{a*J%8Bye!$lg!9Mwl(a`zy(<nWJH@`*cc*pdxs3)hbbfB^Z0i3|
z`0Vjf@tf<|E6=?$aQ*eOs;7STN!f4%s}lYftWxtAF8!K!|C+ox>wbY-tCpsCvg`F%
z=LcM@dUe?4RK+C;#oevmec@k4wcl~y&NN!OV}YzcqsLO)7vJw~ku%@r*tm7>anXxa
zsmG$`PMG?71$X;IoqbEi>rM-o<t>nA5%%jzddp_Iq~L4N{E$h?3plR-KN!nxTECS&
zLb&(l-*D-LZqao<yPn-%^5J1`8iUb(vCM|f94jN2uVHTDc^?m|ec+B^&cE2aR&FCF
zd(34ir@QOKt$z8oak7V2yI)?v<@5dp!7C^B{+#mVSemH4frb!6biYDjeAKk?ce5=0
zqa`erwo2x$Jfh%Qd+48%Bg3WLNxS1`XHTy`rlH$(FfJy%{yOXazm5y<Gz$9{PQ11H
znfhiXm9BrrS8p#_>V8({MeG8Fbxb97yCxle_&Ig&)t4`%*YOqaV6B{Z>w?6Ry0z~P
z6lrx$JF-9j+_#RM{nLIaR$VqI`2O+NvFLrTR(KrFy7;~B>vNlVyE7zYzejuc#`JNV
zc1yi<{^^?f{3Fk_+^kmGPrhlM?m3C+c=n=v7XQeH#Xr)YUSQhCb8^$V>7N%fiV2j7
zUEOu$$HUN)+kRY!%@u|2HAPKIuoN;_pYWt;KZESaBmcK21+VhWUlk%yv5&8b&*<0m
zJ6*d3H^{v%T3vdb$5=)(c6xa25yKshGHWOGZmGF-a!xJV)>j-mFN&RzTljdz<WLT`
z`X|OFyWN_Pz5q1_Selp`4p#W3Gg<LYm6ns6QhOys+bVkVhAGC^9zVGgd&P%eGjscF
zIo=$d2ie&tKJMIBo0s|fVVk;BVa|@9)6U3+nb|Cu=H9J)r}|CLwBwASrydqql*HTV
zo!q{B(N(|3r)zGklei!zc<b+Wqy6VCGAo4}*VMmBH*G(oDq;5ZgGpJ2#N(~=*vqD|
zde7X?yzu6nzlU#~X48*-^6x5hE~9Ckt?>^r)x*1IUDME$w^=MVQ}vyJ`^xtrz9&59
zy=#Bk_)F?wV*R5lR-YSpD?1#2J5|sscmJK2?;5+BPH9Q?_x!kWf6pCZOTm{)oszR(
zD&5djec{?IS09}6L*Mk*%_pwLdsrWp>k3LNzr!+j{uJ(86^o~Ss$I7;;k5mEO=WKF
z_3td7PVX-H%;a_KeB#9g39}|_W$x|i?K!x2O%lWHoBtKNu06b!n_+En#Ww4pyvete
z6-gF6CFxFDCw_><9{71<+YQ602flKT7kv0UTd#dd=vMdMtUA>_^(?}_o*&O&d~KO=
z(}VW<%K=S);+KWieY<Rbz?_kvxz)B~pZc%Ple0H3P-aPz<GSZ>bl~0bpnV!sUfSMI
z+iQ^bHT7!3S(ew<-(9V(>Y^SrJHNi?Xvx<envnP0&tUQCjJTs$R|d(P6qV2p+dRis
z-|F|uGZUMY`uuLouund?nJcw^<D?&4rAJmuPmA6plI`iPws%EQ^2Hzqjob1cF9sa^
zbaax%DIc%@XJvowJG9AA!OfeuL2a&#u!+WQmksra=QmeIKfaQYd|O*;`bROvLpfo)
zt1_Rt-LDW^cWaC4w>4FszMn<@SZv+1;ffKD&-WcaT_?>t%5dQMqh*b{b9EJR{$I6G
z3VD8a33uAc=PM7qpI24Or_^zELbhRofifGXR+~rLcV0$LQA05nkp!*nZnt?4c`uNe
zIQ#mi#{W}`S|uh2ar-DOxmG0iaLyKy8msC(TZ@I>n8)jtuy82MOL#Teq<#)4Spxt~
CdvnqN

delta 2807
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

diff --git a/lib/hx509/data/test-ds-only.crt b/lib/hx509/data/test-ds-only.crt
index bce097f73..bc55f185b 100644
--- 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 After : Apr 11 20:42:52 2019 GMT
+            Not Before: Apr 13 21:48:01 2009 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)
-                Modulus:
-                    00:be:25:45:1e:2c:d1:1d:66:56:4c:89:d8:4c:d2:
-                    3d:6e:d8:00:65:c2:62:aa:ea:4b:aa:9a:05:62:4f:
-                    6f:05:33:91:16:fe:be:f2:03:1a:b8:52:8d:00:2a:
-                    2a:ae:23:c3:71:97:57:9b:e2:e3:f3:79:06:c8:40:
-                    0f:d8:0f:33:51:29:3e:57:0c:56:ac:24:1f:c5:ea:
-                    89:a2:40:06:8f:08:a1:94:c4:8a:b3:61:83:75:b9:
-                    90:c0:98:a0:8b:e3:7c:5f:3b:bd:90:09:08:84:c2:
-                    0b:ef:dd:ce:ae:1b:09:68:67:e3:37:de:dc:26:f2:
-                    d8:08:84:6e:50:6c:60:f8:d5
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:9c:d9:70:8b:a1:4d:1e:7e:7c:f8:12:d5:42:05:
+                    78:48:c1:37:4e:85:5a:0a:be:6c:b3:51:67:c1:50:
+                    b0:7f:36:80:bc:f0:65:4b:90:d1:2e:28:f1:ef:f5:
+                    67:a2:13:61:75:44:63:ac:61:7a:54:ea:85:0b:4a:
+                    b1:d4:06:b8:77:5c:ff:86:e7:38:b1:92:46:c6:5a:
+                    70:d8:f4:40:42:ab:13:83:cb:5d:5c:d2:b9:1d:c4:
+                    cc:7a:b8:c7:04:a3:34:b8:3c:df:5e:c0:03:59:c8:
+                    0a:e2:17:bf:7a:fa:e0:cd:d5:b3:5f:ab:3d:f4:43:
+                    46:cf:03:8f:2f:4e:1f:7b:cd
                 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:
-        be:60:3b:7c:1a:ca:51:a1:5c:a5:29:1f:3f:04:08:ed:03:26:
-        08:01:33:60:fb:22:c9:5c:e8:02:a0:e6:de:cf:55:14:b6:25:
-        48:bd:8f:f8:c1:15:d8:28:d6:f6:19:eb:0d:c5:ad:52:d8:6f:
-        a9:8a:c7:30:a6:b6:ce:da:19:6b:0f:df:2a:84:d8:b9:cf:14:
-        9e:81:bd:49:a7:3f:65:84:6e:76:91:f8:ef:e2:54:46:f9:48:
-        8a:50:c9:af:d4:77:2c:87:85:f6:31:bc:d0:e8:41:0b:a1:99:
-        58:e8
+        a2:8b:92:24:0b:e4:47:cb:1e:40:3c:cc:31:ef:4e:76:cf:1a:
+        29:8c:8b:a6:ba:87:19:80:4f:a6:26:21:b2:ae:41:ca:ae:2a:
+        fe:1a:0f:f8:70:30:17:a2:41:7d:d3:62:36:8f:72:3c:50:d2:
+        b7:1e:22:ee:95:0c:20:14:26:47:99:50:97:a6:e1:da:c5:88:
+        cc:f7:5d:77:f7:73:ab:c4:f7:50:06:11:44:4d:31:26:b5:80:
+        70:67:aa:0c:d8:d0:b0:b0:b5:10:a6:3a:3b:cf:ef:bb:de:6e:
+        12:d4:cb:38:86:16:f1:b2:47:3a:29:c4:07:6c:cf:ef:6b:d5:
+        40:f8
 -----BEGIN CERTIFICATE-----
 MIICCzCCAXSgAwIBAgIBBTANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
-MDQxMTIwNDI1MlowMjELMAkGA1UEBhMCU0UxIzAhBgNVBAMMGlRlc3QgY2VydCBE
-aWdpdGFsU2lnbmF0dXJlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+JUUe
-LNEdZlZMidhM0j1u2ABlwmKq6kuqmgViT28FM5EW/r7yAxq4Uo0AKiquI8Nxl1eb
-4uPzeQbIQA/YDzNRKT5XDFasJB/F6omiQAaPCKGUxIqzYYN1uZDAmKCL43xfO72Q
-CQiEwgvv3c6uGwloZ+M33twm8tgIhG5QbGD41QIDAQABozkwNzAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQUlj7gjxVneJwCAhtE2mCcNecOsiEwDQYJ
-KoZIhvcNAQEFBQADgYEAEYzQUFka1TirLVgl1mjD8HFwvmA7fBrKUaFcpSkfPwQI
-7QMmCAEzYPsiyVzoAqDm3s9VFLYlSL2P+MEV2CjW9hnrDcWtUthvqYrHMKa2ztoZ
-aw/fKoTYuc8UnoG9Sac/ZYRudpH47+JURvlIilDJr9R3LIeF9jG80OhBC6GZWOg=
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
+MDQxMTIxNDgwMVowMjELMAkGA1UEBhMCU0UxIzAhBgNVBAMMGlRlc3QgY2VydCBE
+aWdpdGFsU2lnbmF0dXJlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCc2XCL
+oU0efnz4EtVCBXhIwTdOhVoKvmyzUWfBULB/NoC88GVLkNEuKPHv9WeiE2F1RGOs
+YXpU6oULSrHUBrh3XP+G5zixkkbGWnDY9EBCqxODy11c0rkdxMx6uMcEozS4PN9e
+wANZyAriF796+uDN1bNfqz30Q0bPA48vTh97zQIDAQABozkwNzAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQUGegPnNMShCUWLRohUznBcQ0zJS8wDQYJ
+KoZIhvcNAQEFBQADgYEAoouSJAvkR8seQDzMMe9Ods8aKYyLprqHGYBPpiYhsq5B
+yq4q/hoP+HAwF6JBfdNiNo9yPFDStx4i7pUMIBQmR5lQl6bh2sWIzPddd/dzq8T3
+UAYRRE0xJrWAcGeqDNjQsLC1EKY6O8/vu95uEtTLOIYW8bJHOinEB2zP72vVQPg=
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/test-ds-only.key b/lib/hx509/data/test-ds-only.key
index 7a578cfe0..1159817c1 100644
--- a/lib/hx509/data/test-ds-only.key
+++ b/lib/hx509/data/test-ds-only.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAL4lRR4s0R1mVkyJ
-2EzSPW7YAGXCYqrqS6qaBWJPbwUzkRb+vvIDGrhSjQAqKq4jw3GXV5vi4/N5BshA
-D9gPM1EpPlcMVqwkH8XqiaJABo8IoZTEirNhg3W5kMCYoIvjfF87vZAJCITCC+/d
-zq4bCWhn4zfe3Cby2AiEblBsYPjVAgMBAAECgYADavQVGMUhfCds9MVYjCbiiSto
-qNfRLqjxhhc2ryrVsxmWijmwa/HdAk7ag+eEfcwTjJ7chHWIeNJwYwZl4dAQS3hi
-0pWiCZXgNU+y/VtEH0Hn3LEdOWFX9exICr9M90GTO1OxEASDforZoZS+UHo/m/do
-DsBdDLWf+6o1jJymwQJBAOIsIFraYhx5H73Y19ktee4mOaoC78NXTK8c8PBdZeMI
-wILxo6qniCzq5n0G1TQnzMQvAiT3yRfdPTojehZqZ40CQQDXONUfyKZXpIVRp5kO
-/wJM5LqX7XyqOAnoEEmQ71OEdo5xwBqAzp7oEclknGgQ6yatC5D3FYYLE9o43Xri
-ToBpAkEA1rxMj9YOFriNgYNzFFjQDmMulpMpL08gmJYi0CPtC4yQswJXgTyE1xjD
-c2tcW6N6D74ODClSPR0p95wdW1D1NQJBAL5qMu2W+czq62VOEfYZmnBroccPP8/e
-Gq2t01ie1daJigeL/ibeJ+uM6RDR7KSjWCmb5RsmeNzOKLFNCw60g5kCQDRwavaE
-tW+lj1QsZpB2xwJe9eYnIJdMDDg0xD1nvwCcBfRz70dRTvr+LmtEWv/Nsz4VzB3j
-ZwE42YJ8Wd+F+5g=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCc2XCLoU0efnz4EtVCBXhIwTdOhVoKvmyzUWfBULB/NoC88GVL
+kNEuKPHv9WeiE2F1RGOsYXpU6oULSrHUBrh3XP+G5zixkkbGWnDY9EBCqxODy11c
+0rkdxMx6uMcEozS4PN9ewANZyAriF796+uDN1bNfqz30Q0bPA48vTh97zQIDAQAB
+AoGAScGuPNrTCv3sAjPI+MzdrUi+mzv2BYtaTlB/e9ZXyNp2W2KoH4qv8wbqDi7W
+Vs7KS3ynak5EWl4VxiOPz+aBI1OfpCVKzuDR8IkSQ0rE0ufMOG54QP0SG7mp3dPX
+bsXvyeqO1EOVj5H4oqJKkydDRQpkm8RszaNJ+o+sEWlgAIECQQDNxs8O0iYc6xRg
+XDOIE9l/B4Fi/YXl9Pcs0xq2Cwk22NvzSQyYo+mHt2GK2xGYkyPV/dTXAbe0RaVa
+YcbZhFUdAkEAwyGYBbs5JAtKWVp4bJZ95pepeBGPeZ/X4UbqTiZe9gPXrr3ax/qE
+eVezTCOD1ZUEacpTHWWrp0fBZXixMdtycQJBAJpGCQqFh0l6/UXZGlFVAGT6TYjX
+pcFnzMBwbMA6uefC4fQdujHeAcFcPOcLor+O4PkYWq/ve7jN1lBSqfB+BAkCQHde
+6b0317DxJz6aVek39zVFumq1c2wYGNy7oULFvnoJx7wicOC9pKUGvazqXRAf5V9C
+Yq4tMGFZSDpnJx80/EECQCdJqAA4kpOI/tN4dT6si+EeXYXZPHALGy39x/eTRT0N
+gZfB2IB0AvmpRUyr/d+XOewD/u7Rf7dnNdFQPrKq+sE=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/test-enveloped-aes-128 b/lib/hx509/data/test-enveloped-aes-128
index 76bcb71cb0152d2f66715dea1e118be0706a2217..678691e161ed729bf38d6120d2ac670b6ce37d4e 100644
GIT binary patch
delta 3062
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
J@ei867y#I->LLID

delta 3062
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
JpP%RI0RXlz@T~v<

diff --git a/lib/hx509/data/test-enveloped-aes-256 b/lib/hx509/data/test-enveloped-aes-256
index 2b22284c803de873d4f58f3df7ea615272576f98..1c02102d7759a8863077b848e7ae59720f87c424 100644
GIT binary patch
delta 3062
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
P|Mv6G^F{x4J$V)YG$#dp

delta 3062
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
M|1tTlMZ=0o01GYoS^xk5

diff --git a/lib/hx509/data/test-enveloped-des b/lib/hx509/data/test-enveloped-des
index 49b1e5868ce84d581a668a78a8d97c057b9b1e9a..b2ddd4c15692c58bd4c88df42a2d8e5308a6aecd 100644
GIT binary patch
delta 3068
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
NO8ca>bXL%$dH`!;-zxwB

delta 3068
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
Q*lDcJyBWRwk)^mF097vI=l}o!

diff --git a/lib/hx509/data/test-enveloped-des-ede3 b/lib/hx509/data/test-enveloped-des-ede3
index b3288b5d4884af728a1824c3e2011e7f4eaf802f..5f8f4e09767221a7e7ffab8909a66f33e8ba0e12 100644
GIT binary patch
delta 3071
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
S!)W6>=S{};&f(Mk1OWgpo&=!)

delta 3071
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
Se!t!QbooOL?~QC+ml^@0egOvn

diff --git a/lib/hx509/data/test-enveloped-rc2-128 b/lib/hx509/data/test-enveloped-rc2-128
index 00ed8c9222990aa3a0e60f0f71a5e91356148775..91b104300b96bd827f90dd44f8dcf641b0004497 100644
GIT binary patch
delta 3046
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

delta 3046
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

diff --git a/lib/hx509/data/test-enveloped-rc2-40 b/lib/hx509/data/test-enveloped-rc2-40
index a98a19b1a1f4418c88ad22f34d1114ec3c1427f1..6aee80b48a13cb75e7e7a4bb6ee60c8e1f9d0e3b 100644
GIT binary patch
delta 3046
zcmX>raaLkNT7B9b{h;iNWs<wA&feDfx~S1scyhHyqI}kWOHS^R#leq7o1E|6t$erO
z{U)D)fQ5`5hBeW5>MEjl{x0*mVv=#=QdPu6*Om6UwkiHR^QF1HOU%VrwU~c8eVq5x
zMXrxK`)1kL$_t)dEpeOaxxCT7y~m|z?6r<nNIrOE@+@852g$D)k4}81TpxTsD)`fi
zyj2ZN+!nHneD$Ur|GKaLIloh=miW#0@5P&DX?U9c+<30cW@l{C+w+;b1?D}JIL_el
zDEX*b%8i)~=cOD3DyDx~K4G2^`xnXV%?_fUwbUj{D`zt>NW9K$Q{|3l?x}vz)Fq@E
z_s+Jxe@DjAclQc7|77X=r<A2THOtlSy5_$6$ip*<K89C>8oFW(IQf3vs7<?(s;Rz?
z<%qbTQRxAx4~0t}cOCqdE9~8MUSq=fk7B+%1P|V?kJ4o4Pqr28aGZaEMW|3vHDSfg
z>Rr)3f)$@wu7<lty0s-%&%I+Qq(1wk=ItY_LNhq)xcEFbZWYWtlX&0ZNZ_nE3*RF@
z>YLte7CK#F^=V0_o|gWz{VO^(?dok7J+%=w4)49aqed{LnUA^G!1K|i?DzK7nKphq
zug1r2W4m)TFf<^CMP5Yrld&Xk%GrZg?>lWTz8}7DUZwgaP3ikWS?l$rue?n9x=JNW
zafQ$Cqusk6p54$LCL@2lep>GIL(@{cQ@dSs)%EK?>gGK)dv~L2_N+FZ#jOTUa%=K>
zKhB;gYR$mRC;LSq^C{12+jh50{6D5G4Uk#QlyG^)_B#ibv7E|I*|kaV%JH|07^P;<
z<Tq8TI~1t-kZ)DI+nu}XJov;8TuzXEyjk%{e@x<>#Z!*u-dng$YfW?1-IsBH&#cjw
zUiQIN=Iw_r_iy!wk1x<#FLJuSyMo(;Gq>b(NA-vP{zIzkcDidsEUvn>@YmlzXB1EN
z2z>i-{X?0;#MRSx{g)9CzVmRG8TV`Vu3Vp+pCUq+M=h83ZI+((&ib?Trjts2^B(rs
zv29UJ|7q)Cw(8uuGFPtOueX`lY>T?}Ab-`%OINc6b^UKIRB}DC%e$T@zL+&{gYcF^
z#RoS&wz77JaV&OMopW*7qqAG4g&&^1AbS@RXR@&J%^TJwC(5O+Exi1#P|)n{I`26f
zCnw)E_nvUxqNdH(b}jpzv^5(K_?yqZdV?>jVBX5spjQiI_^0_U(op_7m+3FBGK+5B
z<pst6s=goU{kgzK`b+e-(67PH;`IvuJ5!&pRe3%;TuFjKGRtLd{*JFc$Cga~AY|RB
zXg5Xl|GSur@-Zx7D$nxD)~ubUJzGvZGoj-8_d_i|vz`c_6NxXWuUYG{N$7QL_QGe2
z1YS*@Cn~3~IjsB0^kd(5%T*jc6Y{He>)+SgA5HQovFTf@@inl{X4CS+npK^0Q(XoA
z)tj2u%~Gx2%~#^v6DwAc8NI^${k`wX(-^EJE`Ob<vVWZ$qeFSr)9hUf{E8a>bciXk
zh#raO_mTQ8r7PmlY`gG=<eG#EZ#x!6VTrGtBIR`}%zkc(7MnBqkIX&Ag9a%T(u}uw
zeVwl6+<V?0Hhp7zvaP+-ly&RWa{j;Q;=Ft6Z&JNL{@%S0?-`Y_+hlEW{4G))y|a7o
z)g-Td8zXdI$}Rj~p7-m3TeL^W^)>~ge#a>sewMS+H;b(cVzQbeHR+wD)8yw0=MQbm
ze7-Wq&4>A(n%0BO882-grZsF}{<rz>Hr2faWx9t2o;`LfEBt(%XZ506b7aeW)+H9m
zEljyLW82R{)%vF=dyno)JG&)7!`nLds@#>et2f=^`M&o5heplRw%>EtzV?dA{a=1O
z`G0HLw|$dOteSUB^5?`WOJ99D*tPP#<fZwK*iJdLTV0<QDl}jJxahU60Ny<p{aGqn
zB&B0gvp+VRuW4mco3Z|nn}5oVRI!_n&6Ne44`2MgCBls1*uiP96YKZ<t=OTdZhY6N
z)uFX|ll}X7&#OKtyS&)7ag|jZQ&X|$h2SacgkIcNcotgm%dUM_*5>eM2F{K;2N$^1
zPVt?xU$5(P{dHTjXEQscE^ev*DC_e(cVf!~B{v<P{E5pneq4EMZDRj7dt2KlLH?HZ
zZqW;^g<Er1#j`3;`e67ueq(KB{hhd9w-xt1y56Xjb^83#pqy#Zx8qjcm8hJo=+n)S
zvz1xbqDyB(ze}p){ra07{6GF%$}c~iw8c;Pv*pjn8GoH?E?tTHv)k*uSBc!&c^+Lm
zK1fdd5PbXnTpjN8dln{4)}p_?r!&pr>670qab@G#jIyV%(s`<nc?3!q?fZE~@czvD
zKRx}QnU8dxQ|i4EcH=R(w#VDUm3b$#tbM{GR9<b*muQy%`OxT#Zq}9aW=~yDX|8|i
zo|+jx+eTGx{`p3$uRgzI&bL-Bvr+%~h+}^Zds&;-C5A9<zMSfHzqN#fIgIZA?7L^=
zdV5+)?;-=nZ-+7}?u)&jX1;lQ#jH*D*tY5}dr+TVCAPiO=Dy?$*InO|73wEe9(^&%
za8cg1$-#D7q1lp4*4zra9age>;b)(Wm)1`gy_|plK)}Rs1uHM9eVa?3>E3)`V31vJ
z-fy9){?K`@?N$Awil@G5uU+;cM#nTQbOEEv@wl@0`%Ja0t4nxJHh-T~e$3)tz^o@m
zyzI5#ZMzFj)*t^S{c$7Hxg7tA<~L`^6{*-9>-o7ZczO5A<~i!SpILZkUH(yY;M0U1
zHx=?l)1PiTAGG0Kq11yHB{zzs78-{#SWI%b5`V$9>U#zE=>xVwIueTWzn3#l5Bp}V
zes`zky@od~^%k9+@0s)`gjY$Pd&b4U?d1QmfT_|YtGFaiK59q(hxt8jf2_|x7Ht0X
zJ$bkLC*h?LOJn}cU)&tRt=jdd^3vN=Gkoj<tEX+}vg^*>+WR#wg5$8o^S~^ZKI1pD
z9uzSx*d)`>HIH-JU+MVb(>{Er^Xp~zNJ=Q}%bvegU4!w}at%Aaf={z{L@!^n$XiUQ
z>zrNOvlsJ^A9<Mb=km(J4es@}Dr=@*dH!DR>RsKKIeWslP82_V&_UDrWw?S(KyKCr
zVRyf5d)7l6R6PUlT@<w57-h3%t!TT2N#nf>3<>imeBpTNks-}_%3<BY1!kc=f7*9-
zf4Mh9Rr~VZiVggRLfLZ;t-h7HbowMu$JlGjB_(niF5hZ+=~(0QMOA`p#s&W{wtC6v
zrleItx8@%%xPIc)o~>#dZnIo@d$V?a^8OQfmE1w~DXhtkJ~pd=-|b|dA`<Sjzqb9W
zti-bz*H_sOScM)QF^GtneQ2rk4B5=8L(5JrSY2b18#%rEpM+v*P{H@gPWB6{d)X7M
z40jxUH+l1=e~*tZncN!3Hh*pW%Z~S-CHCEXT5mb0<zCjxB^TLdZ{v=0xZ~krED*VB
zKEve*y*(1M9Z#=m(O&kkA??8q>-AajTb9;0RhyoD8L;VK+Pts>r8`fvTxm$qXRJE7
zTIp{6w)|{EhlIF!e{ZHvoVR%Si_qU2Q^MG#<7Zx8v0Jrk$4|Z9i634~`0Tw%Y-XR+
z*$1(`b?%a-^*O5^6n}iH@|)MN`s$YKV&_A51q>aRq}^0*XVC3qweCLX@!3jzQtY3r
zSM9AAvA;1msHu0R?YiwXzWg4}Gjifhyp2x|RV}e}7nwFQiX&E9w^cag*=E;fAxZy<
zb0bgBm=!ty+rG4L$$tLo%jF!VTg78E76-^iNq<|DbnEZjmbUt1c?HYF^p!Th@-8{-
zF5KmE{I%!(|7>#^tvkafOTV&a&u~)A;*XhaI(y0-g{1}u&Y9}udpS+oU_Zs`nOaPe
z^}DNDo%-+2-0zcl<bTQa=Z&kEKFnUY!TOU|)1wHLX4UQc4*tEqs^NNSsc=@b;(wvg
z7jM1WtoD6+YicOq`dwLae|=}-=`)XVb}(*YNb47JwdhC^DD*p>JBKafTo(VEk84y?
z%{(%tLteUEtH@RJdh_1uRn6qB6RN5od{!>azRA`t=EfPxw*UC@hcQVrHZ1+1p?Jov
zA<F#@?}1B+GmnJU_DGAn|B6pwY@fPm5`Xxy-z{pVwqF<WadCTe`FM(e{|>XLcpEPZ
z`-2%%HG}vR9?M%u+?y0*vOUu0{s~Pt*^7*EFFAfDO7WXz^sT;Re#nCBL+zTq%DlB1
qd<_$C-n3)k)|0-GK38^Wb312RS+rBcn`c`RgbLgqTNagBUj_g#tk?1Y

delta 3046
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

diff --git a/lib/hx509/data/test-enveloped-rc2-64 b/lib/hx509/data/test-enveloped-rc2-64
index e5f7fbc62b90901edc1c132f70f10fa1213089a8..58d6c4cb14c561c74bfb8033271e3e8054b19def 100644
GIT binary patch
delta 3046
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

delta 3046
zcmX>jaYkZ7TK$r{5=RB=o{Il4Jbzp%%dO_~`I`MEqOImHS2i3Ca-VhQsyv@T{(<we
zWLNxoc4<aii;0Ny%!Cgwna|y9)MEDO`6upC%MfDLF5Q2tA+6cvk1O{L!IB!~)DH3a
zysz0#2ySSyzGl|^#44L7&DPIgj$x`=;Llzz(+DZcJfpfJ4bK>#Pkg3S|D@WR`TG4g
zAq`F377ixY9u!Qnb^fy=aoV%C37hTnwH}5EN|<^7GOU>4v&gaax!#6<UUAPiI_d|#
z-D01~X14J9<0hL%i6tu4v&7y7`mK5tbdI-uBFBY2*@0CR^~Vn`U-RN6^J=lYt(-4k
zdMOJxncteYOxpWv!RbA_wM?e@{?e?UtydA%{eGGF#H^nEEqYgE=k%J)_9|g5l>N>f
zwdU>`(fk9edap*YUh;8eX4z5AED_ni-~N!|cWt+;+*?~yw`MqnloS|R9^x~)a_oLc
zu#@2z*Y2y<w{|3?Y<BzGnUc9{;iI~)W8o`*)=HPkXMWk(U1ipoy<(m2X`{&}|I9G>
zQ9rFk*NjQ$$-5qntM?+hYffm-wV!a~T3q&Hp|_bw8e^TyV^_z`*)4RAcmLf0SG7{d
zkOgJC6jm}FxLBQ07QbCMP@;PO_Fb1$cmI^I{qxW7;e6$&mj^7j9sDt2)2cfc^fH-O
zS8IkWW{Kqg^2TkW&WRNZnP%JcRV<P>5l)DF>2SNaK7aO}36B18ja>#4KAR`R)latC
zXQSM?bOn0?^D>r@RlGXetFAb|D$mw^Hp{60RMwOa8{V%=lPx%A^!Yc7Y{K5)-4`y3
zC+$3aPpSFXj<}qA8wDPj|NO367(ctzJ^odNb?(ZQ2H(Q?K6Lf4o#N=&EBZEqrRUuJ
z&<K_VYmQq<mu{@TCinZ7s8X)O-DMk?mavpwU}?-bz46n(n$5>n8STqGD)c03_O#Xd
z+;bE{mt3fsc0=&Yjz9AojQHQxp56Ajc)=qL-Zy6A>lRnoZMi?=`B}#37cHM3ZROH9
zbKz#*fh`A(e;tT1IiM5q^<1at$;BSlUzpO&`lknretBzr>dB9LvC-c3v;POX{0)xD
z6FxcDcBV|Z?goK+Kh8iSTh%2eGP#$poEUADceicQUs-NmmcPOG>o(1CTRwY(&9`eQ
zE}E^A*G+6t3+Qp#ysA<}!RO}h_so^Gsc9d@0s|zC)EorUjxBn|RhX=>$-FT21S|h$
zkF2jbY^jw?H+x-nG(O42^xRa^w?4T=Z_0J^D^Vv>nU=KkUA<;fC$i?=)ksT=!-Ceb
z0auO$y@)xQ{ILDTo2;C-lb@!Ul}lamyQ4FA!hewis<)f}iKwuzV3L@d$FWVT`^No_
zXY4EH32MK&q5VJBT_*gdvpb()@|T&>-j@4VdGa0PHgvyQ8E<y0BU)j>F4;570;I+3
z>q0C3_Uylw@*}|iU`(*LD!<M<xlk|tQ-!bYZ#|OY{D86f;O;fE7U*o7A-VtB%NE8C
zecq(p6AM;{O>|$FzL@dZzf#4JzkWrw_mYg~=JiOeDDC@s)<N0rIe+z`BLUOO9vs_#
zWV)BQ#-AsrHcmUbC-;nODZlHx5SJC+=ci2YGV-fmFsJsIb#Z#Zf?XS3txtb@#D7jU
z$dV)5ib2_gjo-uLskF95CgWo#g9~Az|0jmU%uw6D?T?q9fyUu4``Kru2%gPxR#?2(
zqhxFA^1LI*k}bk7Cto&x-@9@B(o6df9$dxXx}|Cb+rf+*JRI+LL|m*sB2@8nTa&;`
z`@;IieN($qUFu)i&gx22?QiIvYttzf(c>$0t~WksLXxXcY>$rFJh`YN?<?~3EYs#^
zZBIUu{yX~RuZ+993m;sYnUbI}xAn$^_VkzO-7z|u`+j{Xx9B=x9dK$&aQ;!w%G|W+
zvucXARi(ExG{5D%vhJ0uMN9s+8ND3#wdLPx!d7i4PB_1P#)j?nqB$+gU4%AsB}?*6
zPnvl(C`<UzHSgKq?$w`sb}2o*g_}o#$MpS`^27D>IFIdXJ%8yyt?orpK3?h5%Iz!6
zRmDa2bPJvMp)-4VNjK-rL(REGj_-p5Zf^NicF@_}B`_^{bKG0*h}cKdCOleoqU-aU
z{cpnjZePCX&RQ$yub$oYN4<Wj%1OCZPx73kRttUjz+k>#i1W$9X6;$oEZb%tiL?H?
z`~UwihFgEa>>94VX4uWf_Uwh{#vQf|QkT|*Gn_jXexNhTI`qnWLEqLm#>p{%4t-qu
z_2HLY-uq5Am9y?DT=%wa`+`>rtAeMW)6O$H)lwt)xAREa!jOe5Zhv1qSY4a_x~QIQ
z&a!gRV;1szCr&t`6Me~~`i?}z-J^Tsi{8i1s&ROEt7O)k@*8HtM)ADgh0M<KJxp9W
z(O_1HE7z3IC0iPvL@j*s-db)~2j_eKSM!ulcdE`~-1^4++Ukc_rSfVjU*+9(jY-eU
zyLK>2Yh`VG{JdMG|5?2AKYNv5VVcmJ67Xq8Z2e`q6|8N{%DaU#e!jb;$Z)~@YsC3&
zDNUy9!g7}yCGt8my^{_JKmL1<&xDZGyJv2`FxCCdw)HJ1qkE<p9h@n{%A}r{Z!G)!
zuEl2ch?rP~Nx}<LqV-G;^C#K<^c7mzyC=bm<6y{4?xfcm&MVHCHa$NtTp020_7g*I
zPnWn(wxb*B&$a(?_GGPQ-jq?r_)2?5@{vD_U8XIrzU~(*!#Z#IIrCR5%YyE3v30ly
zb(iT#80W4N6MQb4Bk3Q$rzq~4;=hdx*G72<efQ2yU1+u;EN6-|;|YD4s9L9|$v+cx
zUT(-b!=h;PFX>>`i<B>%k|+B`Ig*kTZ!vVq94xyv#W(V(ZoTOo+ru-Ke+!!5toY{I
z<P;mT`roOs5AwbHoOkV+_f+IJ+mp>@eb#}`*1wo3-6VEj_*AW6(MDrmBR*|jKHW3B
z^j&UkJNdxwqAhpSBD;<cc_qE44w~z0l%#n_-CjD)Yvx~t!<XEpSd9xNDGU3ynLXhD
zyZ_biM^jaHSw6KtD*tF!ePZX!^&Xj=XC5-91)tl)Fh7{vV@uKTtdJ>3Y#c&;MaAEl
zKb&$%G5ervbfEI*MlC<xFO{yMU28v2p5a&eeAmWY#=keCmS1%j(p2L+cel*8V&?Y#
z%!m6X-w&J_%9wNfR^~RtX{~%`&5HItay0wGo%}D?f$g9}S5CVwo0@s-LEd^1A<KtX
z&PRtEihp<OsJQo7vAbxlOMt7a>3khwlSfTUf&}$_8Cu#>MH3@)j%l3u(HVHZH;|?B
z^27PnKGLQ4HTUoMe)H(Gd{5q0ZdFS)ct1amy1zDMyW;L=kC${#-Tb_e<wRCB$M&P0
z-|GW%1+V?9e&eRJMncGwgQIi8?w`{4>*repd}&@dkx#lxc0tvrr3)W#XtJ23a5<=X
zORlSF!9qpb?^`D%mLBYz{P&D%!nYL?EY2N1Gjta0cZ*PLE8FpI^3zmt;c|oXU;L7o
zv;MwmxqYROdy9hOQwhhfTz=P513DtLSH8GfQc|V8(_Y`=j2Bm%<E&Gr?7x^Iq8{+>
zS)x+EwdG`=fnbHnr=79Z#`Dvq*&^O7Osm|n-$L@;zE)4Af(1`azTE%Unbo^~@ni+N
zO??+rrU*x$pT5(Gf7Shrj`RJJ0V|(IPDy;b@A>YBTf(l!Y*-{Kv%YFpkxOU%;^Wzi
zQX})GZuD9IPIQF~Lri!>aDi!A27AGRS+1FO+gy^I!s{hDAAQz-{$YvOlLxVup;zm9
zzFrA@-cftv|IB~(jB}2fAC>ywU%0#QQvJlc%VLt-R0E9^dz{l(%7#qze&SZe-`3k!
zQaf>0Oxs7r&ti%nst-@&H187d+3RwCM^_D3?uD4kJCAkCO}gO~|NUQS>a>mzs!EUQ
z(r@nVFA)nk=HtX(FB*F%V(sNVHdhUcfbc7Fc0r4`PT<)jQhBNA(}uZ;s!2~J%P%rK
zs>_UXU$W))>+g>?8nXOVOAwN(@crVpJks#oa^<($LjCShyhp!n?XiCIZ_k`s!<`p5
z&y?J>yL$?QYmWtQD9fTZ{U6O!-HyM=D6N<?Bdpce?_L(q<LH{FX1k--X--}$RjaR}
z-x4v~rBC+mB=!uOdov_X7q9!0`_)`{n>SZw>(>o_e-CS1dv$AOZ2Hq9W$sHB9WxS>
m`h6yQ&TPIVimi8d9b0sW_nl#z&eaEs?Bdm-4U&F>6RQF09?vlV

diff --git a/lib/hx509/data/test-ke-only.crt b/lib/hx509/data/test-ke-only.crt
index 62714eda6..2355126cc 100644
--- 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 After : Apr 11 20:42:52 2019 GMT
+            Not Before: Apr 13 21:48:01 2009 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)
-                Modulus:
-                    00:c1:96:54:d4:4c:78:64:1a:aa:52:59:a7:11:1f:
-                    8b:e9:b8:10:6a:3a:be:f2:bb:00:0c:cf:82:e8:b8:
-                    e6:64:5f:7a:d4:38:f0:08:62:ee:b2:6c:75:34:f5:
-                    a1:7f:6d:25:dd:ca:82:0f:c3:42:d6:5b:eb:11:de:
-                    8b:bd:e6:e8:19:23:ae:11:38:84:a5:7e:4f:16:15:
-                    59:4d:9b:0a:4e:a4:88:fe:4e:39:9d:53:d4:25:c2:
-                    36:3a:28:f0:6c:af:55:e6:ae:f3:17:99:1a:7a:0a:
-                    50:01:b0:5d:67:84:bb:9a:84:5e:57:a6:d6:c6:f3:
-                    fb:ab:0e:6f:f6:53:e3:c7:71
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:e4:33:6d:d1:fb:6f:01:fa:6b:47:fb:3d:e7:6c:
+                    42:e6:14:ea:cb:ff:b4:2a:93:61:fc:ac:bb:ee:d0:
+                    e2:44:a6:a7:d6:a4:ce:dd:5c:a1:4d:27:5b:66:50:
+                    34:c1:b6:13:79:9d:d6:63:7e:c9:d6:02:ae:40:9e:
+                    74:a8:12:9a:2e:ff:29:03:e4:11:a4:f4:ed:97:55:
+                    85:39:9c:c0:53:f6:86:89:e7:a8:cb:8b:d9:0b:36:
+                    cf:d2:b7:c6:69:83:e7:d0:f8:ed:30:1f:c4:e9:94:
+                    b5:0b:82:5a:2b:d9:47:42:7e:1f:55:9f:d9:28:89:
+                    26:a3:9e:ef:0d:05:63:d8:f9
                 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:
-        a2:ab:04:44:90:b2:c2:3c:b1:7a:31:62:e5:e9:43:71:c4:30:
-        aa:b7:df:ee:4c:5f:5e:10:b5:6a:7c:80:a6:fb:76:4c:d4:12:
-        ba:72:32:ce:0c:ee:19:20:7d:9e:5a:4f:f7:e6:9b:ce:ab:38:
-        4a:b7:45:49:df:dc:d9:1f:ae:c8:32:61:55:b2:39:23:49:dc:
-        10:59:24:5a:82:37:8e:25:39:aa:64:4c:0c:2c:74:7e:3b:d0:
-        cf:88:63:3d:4c:aa:b0:c8:22:87:36:e5:b4:b3:3a:1d:bc:ff:
-        86:86
+        9a:42:8b:67:03:2e:fa:b0:fc:df:ab:da:65:88:85:86:26:f7:
+        ed:a2:38:c1:40:0b:41:80:a8:42:23:c6:cb:9c:c5:8a:e3:c7:
+        92:07:c9:23:3c:b6:f5:76:cf:59:3a:dd:57:e3:64:11:c8:62:
+        45:99:e3:d6:bc:ef:03:fd:a2:aa:1b:6d:fb:fa:db:7b:01:56:
+        71:b7:35:ad:7e:5d:b0:3a:ad:8b:00:74:39:f9:d1:32:77:45:
+        ec:4d:5b:d2:99:2e:bb:2c:d1:a4:51:f9:aa:60:c3:f0:d7:07:
+        65:4b:54:bf:d1:d2:9b:b5:f7:f1:89:73:f5:67:00:70:9a:da:
+        ee:b3
 -----BEGIN CERTIFICATE-----
 MIICCjCCAXOgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
-MDQxMTIwNDI1MlowMTELMAkGA1UEBhMCU0UxIjAgBgNVBAMMGVRlc3QgY2VydCBL
-ZXlFbmNpcGhlcm1lbnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGWVNRM
-eGQaqlJZpxEfi+m4EGo6vvK7AAzPgui45mRfetQ48Ahi7rJsdTT1oX9tJd3Kgg/D
-QtZb6xHei73m6BkjrhE4hKV+TxYVWU2bCk6kiP5OOZ1T1CXCNjoo8GyvVeau8xeZ
-GnoKUAGwXWeEu5qEXlem1sbz+6sOb/ZT48dxAgMBAAGjOTA3MAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgVgMB0GA1UdDgQWBBQfUYn2T+SyBvH6b+FqN2y9W65j/zANBgkq
-hkiG9w0BAQUFAAOBgQAtFJDsq1zOTikJ4dFZi4nFc3+iqwREkLLCPLF6MWLl6UNx
-xDCqt9/uTF9eELVqfICm+3ZM1BK6cjLODO4ZIH2eWk/35pvOqzhKt0VJ39zZH67I
-MmFVsjkjSdwQWSRagjeOJTmqZEwMLHR+O9DPiGM9TKqwyCKHNuW0szodvP+Ghg==
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMVoXDTE5
+MDQxMTIxNDgwMVowMTELMAkGA1UEBhMCU0UxIjAgBgNVBAMMGVRlc3QgY2VydCBL
+ZXlFbmNpcGhlcm1lbnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOQzbdH7
+bwH6a0f7PedsQuYU6sv/tCqTYfysu+7Q4kSmp9akzt1coU0nW2ZQNMG2E3md1mN+
+ydYCrkCedKgSmi7/KQPkEaT07ZdVhTmcwFP2honnqMuL2Qs2z9K3xmmD59D47TAf
+xOmUtQuCWivZR0J+H1Wf2SiJJqOe7w0FY9j5AgMBAAGjOTA3MAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgVgMB0GA1UdDgQWBBT4aK3W3l9NFLig+nk7RVceVbq/+TANBgkq
+hkiG9w0BAQUFAAOBgQCaQotnAy76sPzfq9pliIWGJvftojjBQAtBgKhCI8bLnMWK
+48eSB8kjPLb1ds9ZOt1X42QRyGJFmePWvO8D/aKqG237+tt7AVZxtzWtfl2wOq2L
+AHQ5+dEyd0XsTVvSmS67LNGkUfmqYMPw1wdlS1S/0dKbtffxiXP1ZwBwmtrusw==
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/test-ke-only.key b/lib/hx509/data/test-ke-only.key
index d2884c68e..4b9f5ac8b 100644
--- a/lib/hx509/data/test-ke-only.key
+++ b/lib/hx509/data/test-ke-only.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMGWVNRMeGQaqlJZ
-pxEfi+m4EGo6vvK7AAzPgui45mRfetQ48Ahi7rJsdTT1oX9tJd3Kgg/DQtZb6xHe
-i73m6BkjrhE4hKV+TxYVWU2bCk6kiP5OOZ1T1CXCNjoo8GyvVeau8xeZGnoKUAGw
-XWeEu5qEXlem1sbz+6sOb/ZT48dxAgMBAAECgYEAjBV8zSOI+udQ2MaHXpy1YisP
-tc9M3djz8FE5Ka6jCX8OIwQQrgDpObPCHNCiTNNu00/3TfC+LN/W+tdPx9uPl17v
-Id61MfkaBXs0kxvZ9kbrOqmQRkNxf/5tTXqiGjhkGkNiWrh/3bkIAf0kttOXr4tr
-x014jz6d2TmZKQo37QECQQDpW/wBj2x+W/+CUa7KW5ujJsFch+I94HGSX19Q5rCQ
-dknO5B4WSmnf283LHyvB6eIwVZEf5JZMnZoxSGkYgLk3AkEA1F6ECevN/zGgpsEQ
-vA5MkOwTX9fSIFxdjvJtzWqzr6NmE42aW/m/BD9fDXSJ4X0Pi4JIdrWTgihjTouN
-u2G4lwJBALAIGGCg7WmgQmzu6xhw5EW9bW08f7jHf0S4NvGTI6vF30V3JQ8RkS4x
-49qOp/Z+VIa7dV8Gky42UONOSSEXsR8CQE53qcPcq92J4bkbhuplQiceAz6biNlK
-J4uEyctnjILuFe5NmOY5DjosjBt1nuiBA/hhKBMsnhcugxrnd3Pv9HsCQDlWe6jx
-39GmCk1jcdtMrLmyCtpLmOKu3svDLbQpeTnP1v1cKuxrQ2qzpfKMrRW7OpjItEES
-M4lClsp9joWPE+I=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDkM23R+28B+mtH+z3nbELmFOrL/7Qqk2H8rLvu0OJEpqfWpM7d
+XKFNJ1tmUDTBthN5ndZjfsnWAq5AnnSoEpou/ykD5BGk9O2XVYU5nMBT9oaJ56jL
+i9kLNs/St8Zpg+fQ+O0wH8TplLULglor2UdCfh9Vn9koiSajnu8NBWPY+QIDAQAB
+AoGAH0L0XnnFYU3++GNwvY1VNNPUvpGPCu4Z1FWNgU/YT3NNNthpBmY0Kq+jk8aV
+E5xv2o9G2WZ7G/hOCsgqTwQNXvSK27rZdIs6YB3MqcZIB0PJWOe7LYkMM3sVxqhU
+7Z10eNfqkMvR1CLsDmHTw3iSmJ5mblwjFUJJpxt5jQV3o4kCQQD7mni/lInowbEz
+er0lAOIdiZLc78r6GZmrELbQ2gMwq87citbvG4A8/0g6px84S9XY+Bwe6qrL39V/
+gLVQ0FzjAkEA6DBEm1vgHiqMiVqfg2Mg/J0GEQzpaM8ceuMogJHIhFVR/xamy2sx
+48QYxNC5W6JBVQ45fMjQDJOyUV55fn6VcwJAIGvWVXGRl9GlwOl3CBamDIJWz2uC
+71lvKND9jcoaESKChH7LlYIoszN+Hji82CdFhjDqhr1churv+v8d3i0LWwJBAKx+
+r3l72BSRJ7cjTD4f9vG09jzUitMCivYArKZXp9AoUrJf8apOCNJdbMlLB2m8MS0v
+VCYQSgAN+fvZZAlFoWECQQDVWY70F0M5gAfsRznp5TR+wUdAgC7jNnfi5AGr6I45
+295Np9IgYWb3baxgy1xC05NdUZQSzfdaFWACw3iqx6U5
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/test-nopw.p12 b/lib/hx509/data/test-nopw.p12
index 8672cf1bd90a0805702f1766f09d5c669a2c7d3e..8d7597a1f003256a2a81f91f4c84b5843f7a2e57 100644
GIT binary patch
delta 1573
zcmZ20xK2>XpowD@6C<-h6Gs6Xr&gOs+jm|@cE$xw9EmJV9I*yX9FY^1=7|`ZSQr>Y
ziSrs-8kiUw8iBbJuQ=8}V(=>UWSc#2-?Y?HVaZEs&fB`vEo~gwbEcQ*bMIJm>Xyk?
z-Q7pT)sOqU|DvyRGul-<-6M4SRNgn~cGo9=(vB8p+~w@Zc1T2c+t1UJ>Js>L&z2^t
z@=9*_+B)66^_mB#jI5Z5VsYHe%Da{7rT$-4?rvIl``G-4=AkhizSI9rW2~J#l~Jd@
z-}XXJtmzrUNTK|rVfUq4bi39B8t}rs!^q0Yz}(o#uye7_%KO5M-E;3Wb%n3JUhCNW
zSz~SWEtM_SO`jSz-{xNOWWS%fe6;<?&QoQFUNE<HM8*d)u0L}ldG2|=djhH+YVk9Z
z?ut~bZK{4&Gugx3e{I(ko*C9RU;4MK>c5t8=<~&f0E7Q=&s6%P7V<<NKDqi@+3)hc
zcXz|CC-ixyrt&KMF^n)!hP#SW)KH8?#Iwp<^*3wtQrB5Io{bWV4E9{ReROg^Qvt_3
z|M@euwRY7`ta8H|`jZoxz3TVKdun~UskFiG%LUKV58BOlZ8STOC_Me8?%hq{VKJw}
z4nA~T`AE@ft&duK>T{LJZ<n84eB{FMg<Yr4C9fB#tzX%AN2gn*i}}Kvn`hK(ZTiFt
znUs}}w@z-~v6645hjyM#Yu1Owb3eBnzgTC{vnx}^SFt_UU!$pQvyZz`<hP7hK9)?(
zj0}v68)q6cPBV~YV-A(&V-aH!3AA~#+(4u!v}CGGMAoNctXaz+e>8{!Nh`Ai8w56B
zRWP}X#Tf4E$s1Yp>K7$XeeiU#dwsKb(p7z#h<Sgac-uJ2?yc@x@!+Zz-!{=1R_QB!
z>{euRhIkxgd(daId)={Ri#{i*|14=YpDfE=s<rJw%oE=g4R*dItF*p|+>naez4rdq
z30EIX+;L9A;n=iOuUU5sgiaTgV6V`Rp3eE?rq8n47a@(8cV1EYGI38K<J`&dtWx!i
z@E8MS3#LyjO-%0$nwVZ0G%-D6<A&xK9xg`41x-xV22D)mOpFZ3iI0($fu)Hl(V&Sb
zmWh#psj-oPq)by!{ajNEjx~@==E`|3ZBC3^9iy=CiThH^dnEynLg#b66WHy-{{5?n
z>Pb<(;`)BcH`k}Q3H1D&BUS$M>8}+R&Bb!;51*;7{1Em_f%SjP@gB~`l|OT3SUJzL
zTw2n+-o)*JqS>;;0gwFU*Qxhc&U`$(Ek#oFz_!@Db`CM6fNE>^O*QG6$yYt(A|hro
zIWqh+wmw{#T@`ez{kbT6_Aa*s5i{l84dK<LQyiAPyKP!O`EE6Lo~iRX)yncadvr<^
z3~%uH-v8m&#kQJ%(&W&+PlTBq86MC4*v&L`H}4VW(tq1n7xvBDCAchl+pVVC2exD#
z)~&o(FK6{sJhylKpNAFdn`Uk@3b}LP`m(fbS!;UJWrZSq^_d)O7#J_v{jw=>;ad26
z{ni~9MOXDNxZA-qPpQ6f&5>VTlC$ERkDh%qYaV+*YJL24t=>!5IGg-b?4^{gPCFW`
zUmU!e$&sNuZjq=!qUwsBIS=oe3Ef*Ixyj(vf(t9=w|)0IY*=rQVcE%+SdgZb!f=?y
zc+-7`Q|V4;j5n4oeeYM{BlOMw5;v2B>2@oQ+8tW6d?qGcjplgVnIYUBvYK6E$@Yeb
zB(Id|Dw8>tW7p@*-Fr|YsjkLDYth{sj+fr06dbIv3E|1xX7j6!_!7osay5s5(($a6
kXHCD?NPTrupZ)oZw(%*^#vB$7!T31E?cBjjn3y;i01}U$Q2+n{

delta 1544
zcmZ1{xK>cfpowE86C<-h6GuK9r&gOs+jm|@cE$xw90@E<95Dt>91#<h=7|`X7?~PH
ziSrs-8kiUw8iBbJuQ=AfYhUg2Gwk%C_eb9D{W)#^0*%5CrEwKDk*BNkYNpnxCEHl8
z*cmk?xA|*~%z_Vx3j}vx2>qvI(bTxVD=WSuW#_L0&5P=;pMCxIMLOdFo4Vw$zqRJn
z*-vj`S#YSmh`HeW0jKv&ZPBNeocyogd+z@>&Gdy?6K1>iByG$2IsJ^yOFzcq$x|71
z>PvL@b10opnxFc{_0==qX5F*X9=tW+g?opQm6d_Hv5_J8o$SJmRn8*D%dJ=ME{m1O
z$$p;ewZQOalUb}yS^V)QE9a;^;COlP`$dZhI*)%bB=0<N?fsGEwj#1S#8<T2mUyph
z3H_FI!}(X};g!q@S)1=F^St`}a^fOMjjP2{ryHKm2o9d@E7DuAV1oIpn=A@EPa;YR
zPs{LaaZ>NNI$h_Rm44!6MGj#RfB%xZ2j+;EXmgyYIR1MT-yM|$+LQa43OHt+S|_Oy
z<$iEtl^fRZo}9?+Rlm&eM|qpsm#FOfnHOF)zc9+1q`v;%cT4GqZ~ABN-6YT8@my<l
z=<@Z+lWw`Xi!{Aj@hE8bf1_iHQuFraZQiPJ;Sodhv9l~`b6@&B-)HtdLA~Tv*|mn%
z`r6+%Y&Toaa#+L5>F-<KDH(!687~_*WM{`X>#jJp?MJ3YeBY5XC68{^`YdN+W@KPo
z+&I&qahicF8*`{EABz}^NVN>dlF9d$nf!?OuNgI6hy9q4)o+6+khC&Out8u0Rt1yG
zSd8Jmp1hGouYQK|lfM=f={A{1le)We**_GC6>;6>$yleiJ?rWP=D^Q}Wr{z_GJ8w2
ztjlMvS}QZ@)9o4eCL6OZ`+SFA!$zW;srk>5)w`#5*=^R|wclf7o<`MAj|CG1AAOx<
zX)Mmdw%7KmaR1KQ<H3Suc1Cynrl;<l_4?5-{uSk2Zk2}flyXHF-%gHam8xferyNj5
zVEV|?#PrsniRq<56Vp>RZfG9i;bLT5(8N?_(8N^6#K?f0+!$FISelp;44Rl?m>3zD
z8XFl%$|m*H&nLy;SOd9a{hgN@If;?XR~y$do3qTFCNcZKpX*;f2ysN`-mklD^3C7(
zd;NS)gYI8~D;JBtJZl$_a(&l+zP~@2)|K3Ux3o#jJmsVsgYTKJlidkfd&5^uta6aO
z!}9dij{Jp_e(K$NC)M#!LBMcD)W){I?VLM8-mUw%LY=M1nR))vJqMoD{+#n%kjatZ
zk4fjRH-7TjmS-YnE@hu&9zNqv@ZQdu-YQAiJ3GIm*H?dd>=AP*`2N2&NBb_VS7kn0
zwbY#H_KX^v>C)T6XDp1I$>hlJNv<Tn=<_GPOS>dfx_5@Dt&*7L|MK9f^ZedP3fE-*
zbNpoCSDL8F7PNKMtIBI%+ZO7dvRTz?m2B((s_%4L_Vd?F4pnbi_8&idKyQwg&y0UZ
zzr1g1Ucg~;?|As}`i(mO^7#z-Jb&;W(s2Er(`;ScGF`l;NixHE)x+0oPuVpriD_Ty
zs>$RKrfwh}VWE0rT65snvr4*mmsoN)mk9Zu4d8zD?2Biv*cw;a+Ub!q_oYlrIq{6A
z{c^JFZ-*f9H!F1NH#u<5dHs>eLFn<1Gn+y*m+k5nTzOGGYiGa{&rqE`GY=jpUbUs*
z=!WIC`J5KNWZtM-T(MbQzV~5SdH5CXp2)I~oh`gi^Pd&ZdWWw_F_~P$A)vJ9u->+?
jk3BlaKj;N*xUtRo>EA!cSvag8-@Ni#Y+*4I69)qT=Jd&}

diff --git a/lib/hx509/data/test-pw.key b/lib/hx509/data/test-pw.key
index 8e589088c..837af96e9 100644
--- 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
-m4m0P9bJzzN7ZI4q2jVgmdlPel312Sa1WyDRvTi9G7NDdrn3j4Z+YaVICaZqb98J
-fWqYuUZUamj8xc9Q0ihN/cBVRs0Y435qGu/fALXy/EbjKBwQMCwNjybz2FUAaSp/
-t+pbNmZTaFf+7cHox9ccBO0tRcOnSTB2x42m8sVJQDWs6nn2YFsFKmToqdsNi9Jx
-GZmcCR3D9gABM8sSIuw4O89cSAoPZlMIfitJA3nrp/ufShqR9VTT9sYKlgyXbDQO
-SS6H+kk9GQVQAZgF5y3dloVrlE2HQSG8IQa8oWur+IpghnwIWhD5VFAWeZFyVONd
-gMAN/GrrQ+5aiCl2mQKie/9dmxPIJ7Ae3JD/JAdjeRUF+oIwThk4dOowy4Y120fA
-KTn1DsSL6nTCBjwVi8YMTvnLkJWqkOZyP6wCIicg8AOM2IA4+U6FlR0DPrwAgbXo
-k9MzXwCKXLx0BrIWL4ZUTmN+3GY5FJzWlzH8YdDy2XWh7kh2lHzSu/dEHJFYBZyS
-5Mp9U0vALImVAsA356QIeEL2or7ePXQiXmeAeRVo/rH86M8MQsQl9sPvbVwjbkQF
-xUTiPfuuQ2cxiXf3wH0+X4B5z/yO1GtZdwDp5t/MDoZXdWHK0dcOKc1kWTdyxvFQ
-Fmtgao+slMw0gKUUbNS/pwN8wDmfvBL+MmIOUGCGpv8kPgP9oGgpvszkxmph4RME
-x1d3XAQxODLm97riduUnZqwcmrYI/C3Hf0GGhvYCJJ50erIeZXmpQ9SskqAKXFoD
+QJMnvFA80I0R9Ipj+Hcq34Dy6fHv47gxoxBvIO7Z6PsT6Nj9AItzRgVwTaAzIV5A
+XtEtUhT8WUD7mQbmOvJ0m0cQWJtY46JDJWGKhmLPOmqTlXd6UK4g7zh9x6G1O9vq
+xDFjmP/i4v2+MLExLJ850txFWSSLBzFbpkDB7r7nozrMupgWqqdotjbEEwTkTDRE
+xNRlb7XsgAeYuHN7Pe+iSDDJNZfH0sxpAeMnGpQBuGpS5MgToIPfysBj9VHcvhwy
+qaygJJxNy3pLS+FrdxD8bomzC4ECSKwsGG8uZBccp2l+VXwZikXdxY+pJYXbpZQN
+Ww0dMfRfw/f/6+sadkAiU1Xtml+U8HNlJVpyeZcdMPLstnEbf881bVDwWbqqZ6zG
+qz/ikmI5S4XnJf2LskujZHLcqdhzy5yRGqm37L60BK3P6d3OHfKJmJfvYYkpzti9
+NkggO9Sje7vRNaOy9ZgkifoiFkTQjjQ3eEIXfVlMQkENHRNv71ojJ44ZJVu6ihhr
+AL7hxnlHOiwY/lF3u7Y5su9x6fpRUpcJeTqb+2b6fdtEIenb0QFYSO4c73858VQy
+K5zrihXCrx3ptJMPiyy8jGA9DGs7RQYi64CVaf4TgHBKaJOl7xBlNJSfgjOv8vDB
+9Ta+OFCeSGr/W6ACtUkAVj8mXplCt5htAmBK1yt0g5W5ucTwoOgTe3Crfectf6aQ
+MKCeIrseM1lE65mLOFTJiEjX0KSKa08P7HhceHq5lyzNgaJu0Mq8krlJFpsE/d5q
+ifEH5iZvZyFBfYm9BIb7YHDlQtwn0wNcGeQ4mXS2AS/Uy7GGyanzwrF/nKjcvefI
 -----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/test-signed-data b/lib/hx509/data/test-signed-data
index afdabb0b09efc1299de938fad69aa21d9c992a9e..c077aa83ea937aaf1d9b9d2ea31420c283c0ee7f 100644
GIT binary patch
delta 539
zcmdlj_fJ;bpo#An8>d#AN85K^Ms}tJO?<Bnn)se?6yL-xVrXJvU=StFYiMa;VrXat
z=1#uL?O6Ya!K>7hZT7r<(^5-?B`>KtZ|hFCv~gh1nO>sLy<^d-TP9m|cOMZ~KkoDX
zi@wgyXjkoYkI?N?dEcblU7!3(J6f1=m$M_=ArawiKTl7pOW@NzTbiiKE4kro>vZ?l
zYaX03vSK2N#c?w$?^ddp`hQiqyJ_9+WAh)HhsJdHPX9NJv3Bx29-aDr+Y3Fhre_Qz
zh4PPv-Ir?7?OGFPzzg>bBP%Ndb7LdJ&c!+_?+Y__&%M*s6~6X*tz+|NjkVRcRJK?*
zeQMZzn|sNV{eJ55(e@uZPn8{d!Q9pn86U{F{>+W!x##un38;Fg#m`K-D^jtxsrp&X
zWDj%ywOvzqW?0{RY0$E&|60bO&lej44F1PGQ|Xgh$P<0|<mzi>zsvjH-3_~*(C3+&
z%B%3lu!*tLpoy_{awV@L<HpImd5u^>L1{Gk6R)~J5Zt|-{D!Uu&Xd#lLhGk*X#Tg0
zsrp>0Xzbdyds(k~#SLY0C)lMXwZ5A2r@y6p^`*4n-n?YC-~RE6p2bV2zglnUbf_i8
z>J?}3f5}*xn|<@IO-s`=nDD_vX*(N7>dTr_w;6X?#rR4#t`zcob;D-mn|m_<e{WQ~
eqLty(t2VjmL35PwmdDb5D@;x$C1o-*N&^7$oao;G

delta 600
zcmew-yIW4&po!m{jZ>@5qwPB{BRkWACVmZrCVrKT;+wcd3`~qnjiSVP4J{2!3=NII
z+{t&j9qZq<ulD&FcKXo!BX9TqoHl=fM&XCjxC)!d)75!3Q)|?cZ7f&pjGB_${53{q
z!H2^Ig1aw-{!_AOYTVzI72lDv^VfmqMRnKDzJB{6o$-K8UGmr8T65~`r#G=IIMiOm
zTyXw?(|e}2=u=Bh{#Wol_kWva`ogRUvt4_Vw&nbse#YjdA7k<4c|1DxCA#}Ll+Gv3
zPkrP1>X~n|?%8P%-Wu@2J;TV#%D~*%$PoNacHzb<XA$G&)~k1y#Y*I4KhO1AVED7i
zEY_wh{`ixXbJQMiygc~*qQwNA$G;eocb>TR{>XA$5!oH$E81;KyjQk_eoMOH{44bE
zO6G*D&3Bb~UVVN!agn6K)ncjB4NqqT2ha8u=`C0=!Ti-t76qOs5haDEW%#x@sdrqR
zuJg@GKhdy>@t8pq<DtowypD|TChz7oVg&`I@#Igu>b{MAa0hep8#Xo=)ERKIaVE5R
zFs3rIFlrfau(4^iGBYu8!daro3dE2(Op`VFLhEn6=Ux0Hu=l`>DN)QHtgUq4tt;dS
z+}L3l^h}S>uQk-w!20sbIWHFWdp0s`vUEG|;N0zT^X?VJ1mAb(t{LgRy?*}WpYB)F
zM6^~c+@Le>zOm>(U&~X*`=wZa7jHNs*q7Mpb!Ni#{9Ug0*Eh8D>`I)q_t74;X%0Hf
P)1qn_9IdB4XIu*ageL$c

diff --git a/lib/hx509/data/test-signed-data-noattr b/lib/hx509/data/test-signed-data-noattr
index 6d4ea96a814fa89ef254124867c247032871e03f..7aa69232caeae53302688c6112e3e871d20c61b1 100644
GIT binary patch
delta 469
zcmX>hb3$grNp2BC6AJ@_C~;mxO9K-_LnAPE@?CDn`bP|2rJiiF=k1%8S}H7gNzHj%
zce<sG1AET&5`FF+i%#7#*{Zwyh`9Q3pZ8z%b#6wxYNvaIZlB8gCf)A(<WJhs!i>9|
z9oY_v2ygp&dQx2ipYGYxL{(nN4PRTQySHBR;FOUS6HzRVn^}3cQoYpwtIFL?>uw*L
z|Ij=%ro(soziEuMljrg1)c4z7=!rEwV;Cuve>CjAREuucnm_|yHcqWJkGAi;jEt<T
z49ty<3_BO=th_JG*gf}7Q&;%f>$Q%}pEcH2-%{CP-Snwp^KI@WPxkw%%SYRP>^xO=
z=mm3IM`U~;<N7l<lINb+yC<OPp%y<g>8?n{+NSDfHIqHe{nvI);hAB5^QA`1s{U&k
zhdy6y2r&2`_e`ZvY9UYb;ghScmHjU7dv`bNdP1LPYAUb7pUH*1;q|UQoB5eKs}6tv
z9dhgC-1HA`7e;QJx#yvr&}VncBO#Y=O};(DJ~Cr*K*4_YgF*=o>OQZ{nk|`|oeMV#
z3x-|eKkl(~om_V1scyDobC*nUHTw1Me%8yjtCt<RZ#=sqVxvC&bYuJ43pZ@63Ri_W
bExj@Q!q3<X#a^eLatlZ=V+^=4fpISYan0BP

delta 469
zcmX>hb3$grNp2AX6C+cjC~;mxO9K-_LnAPE@?CDn`giTCeSU_WKJ@;`+r2-h&0nBV
z_@Oke!Y1-`bzaTX8nt8_%N0ALrsOt%jgeXK;c$WA?hB#+lq{MW_jhH*cckq6b)b1s
z-SxAt-@Zs^JYZ9o{PnlioI3mIO)LuzwHGlLoIl|7o~bSR)RL3`6@1VA-=>+qFl)kW
z*Pf(pIX|bLv3cpoSUh<ik4}Aw?tTuX^GWkl-?+Yd=G&}$cG`ot2E1&XT5TR}-+37s
zSy>sF8ygvd-^niASmi8Yyxe;A?y^{kob2bhUJDF=HkrlRl*J!^vT}~v1CEymzhAVN
zp!4__L-NiO*WMplZYv_YLwrTMZHf2Fme6lWH=KWk9$v|ukhS@)GS92eFDEXN)VNwK
zb-Ll{jNstez9PK^3nrMqy2+xz^CY6A@U#ry7AN(NtJ8J9S?MQEF60fb*I572_n4H*
zKaPu&%f6j3sK42}yLh^p+$WKb$Ny)(5Px5J=I_6)|2;J0s{>XZ(w48i#G<%OWFDU>
z;}h0%A)oKfTr<h_(Y4(lj@L2&D$zVAqrm;4qosHsL-b8P#Z6mec{lLr@a;J~t0Qaq
ealUsy8$NfpeVJiV5H#Vojbhr9{$-mPmjD2F$K|&G

diff --git a/lib/hx509/data/test-signed-data-noattr-nocerts b/lib/hx509/data/test-signed-data-noattr-nocerts
index a0fdb3258b6a7a5b9684da1bd1e58a0615f2831e..ed2e017b9b8dff71a8db2014d3e597f862f76d9e 100644
GIT binary patch
delta 137
zcmX>maZF;vG46U-pUwPComGdw{|>qJa&G#Ew+kaT&fN1*PUy3{<&ls}w<h17VIP^X
zIG|uZ`$3@u2X&v<X3dt&&CZ1zg$2W|@gMhCx=t>;@>Dn5vAIj8xElTXcR%Z8+ttes
w-8Y_H5wTI9e!8)J?S&gQR)wp=oR;30e&J{Ag<`K$Pq_u8moWz1n83If0NR#C^Z)<=

delta 137
zcmX>maZF;vG46Ve^&fqYNvZtfxH!4&+X;jEo4vb>r<=)r68U)if94DE_myY<{@eQB
zLo>cQVC5lg`Pxe?irYly@tHC{VLcb}`QFSmlUyHN+x_8q9rLde&2use+#fnxiuW-@
w-{e!=v_+P81CI{hp2M>`vX&p`d-t>9b9dX985RXW6K>lmrakFjwwZAW06&;UmH+?%

diff --git a/lib/hx509/data/test.combined.crt b/lib/hx509/data/test.combined.crt
index d52638825..322e2fded 100644
--- 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 After : Apr 11 20:42:52 2019 GMT
+            Not Before: Apr 13 21:48:00 2009 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)
-                Modulus:
-                    00:ee:87:ab:4c:f9:56:cb:c2:ef:c4:ed:bd:f9:96:
-                    9f:a0:28:71:f0:75:5e:78:3c:59:cb:7b:6e:7c:95:
-                    7c:26:63:3c:39:a8:b9:5a:94:6d:83:f5:5c:1c:a0:
-                    f0:c3:70:11:bb:d0:55:fe:22:38:82:81:bf:8a:6a:
-                    5f:88:64:b9:fa:c0:83:a2:7e:d7:cd:eb:ed:e8:67:
-                    01:c0:3c:7e:63:f5:fb:2a:9c:7e:3f:97:82:04:a0:
-                    c2:87:72:03:70:cf:c0:42:ef:02:86:5b:ca:a4:c9:
-                    ff:20:4d:ce:ff:b6:29:67:a1:6a:90:9b:45:8c:62:
-                    b6:6c:f9:97:cc:3c:e9:4e:73
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:e2:00:4a:75:49:06:9b:9e:be:96:65:75:13:19:
+                    d2:26:43:b6:8b:67:39:3c:40:07:6c:97:74:2f:0b:
+                    b8:a2:ca:da:34:b5:2d:bb:c4:17:27:c7:4c:ef:f4:
+                    2f:2c:d9:5b:45:2b:67:48:55:b7:95:0d:ec:67:3e:
+                    d7:93:f2:2b:5b:13:01:ba:43:41:06:c2:14:13:b6:
+                    f9:cb:92:7e:60:0e:2d:cd:75:61:25:0d:19:b0:f5:
+                    85:97:47:85:d6:48:09:1c:1d:16:14:21:73:5e:99:
+                    79:dd:79:27:75:4f:f5:24:dd:b2:ae:db:c6:9f:e1:
+                    37:55:5c:88:4d:97:fe:96:7d
                 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:
-        e7:6d:4a:a0:31:f9:82:36:5d:3c:76:5f:c7:e4:a9:9c:26:e0:
-        08:e9:c1:f7:d1:38:90:2c:e3:fa:00:63:b9:c8:d6:ef:c4:a7:
-        3d:14:1d:b8:17:a8:87:3d:74:4b:a9:84:55:f6:62:d8:43:fa:
-        55:c3:a9:03:60:6a:b3:dd:23:0c:ea:f3:e9:91:a2:19:d5:73:
-        1a:cb:80:e5:98:53:53:9b:4d:14:8d:70:a0:90:37:ea:d9:04:
-        20:0c:e4:58:74:71:cb:1c:0e:b4:42:27:88:d5:97:2c:f6:3a:
-        2f:61
+        b9:a3:2c:a9:df:13:01:8b:9d:dc:82:8a:57:ad:d7:7d:41:83:
+        f3:28:ad:7b:da:24:b4:3b:82:f2:80:b3:db:0b:a4:e4:bf:4e:
+        27:1f:5b:3f:f1:89:ca:76:c2:e8:03:86:88:59:5f:51:01:af:
+        cc:d8:63:9d:cf:2e:de:10:25:48:26:5f:99:62:dd:14:78:ad:
+        82:7b:e6:7c:93:48:37:4f:ad:8a:94:0c:98:3b:d9:e9:84:aa:
+        8f:d6:68:c2:f3:d1:80:50:30:ff:5e:e6:24:8e:1a:a1:0c:5b:
+        c3:c9:ab:d6:76:fb:77:8e:ee:dd:56:d7:60:8e:49:65:65:0d:
+        20:fc
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAWOgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
-MDQxMTIwNDI1MlowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7oerTPlWy8LvxO29+ZafoChx8HVe
-eDxZy3tufJV8JmM8Oai5WpRtg/VcHKDww3ARu9BV/iI4goG/impfiGS5+sCDon7X
-zevt6GcBwDx+Y/X7Kpx+P5eCBKDCh3IDcM/AQu8ChlvKpMn/IE3O/7YpZ6FqkJtF
-jGK2bPmXzDzpTnMCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0OBBYEFHQtvwgiz2KfZexF6uZNgy3NluDtMA0GCSqGSIb3DQEBBQUAA4GBAFPu
-HaGxekMUM6c7q7t2XRhsa+dtSqAx+YI2XTx2X8fkqZwm4AjpwffROJAs4/oAY7nI
-1u/Epz0UHbgXqIc9dEuphFX2YthD+lXDqQNgarPdIwzq8+mRohnVcxrLgOWYU1Ob
-TRSNcKCQN+rZBCAM5Fh0ccscDrRCJ4jVlyz2Oi9h
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMFoXDTE5
+MDQxMTIxNDgwMFowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4gBKdUkGm56+lmV1ExnSJkO2i2c5
+PEAHbJd0Lwu4osraNLUtu8QXJ8dM7/QvLNlbRStnSFW3lQ3sZz7Xk/IrWxMBukNB
+BsIUE7b5y5J+YA4tzXVhJQ0ZsPWFl0eF1kgJHB0WFCFzXpl53XkndU/1JN2yrtvG
+n+E3VVyITZf+ln0CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0OBBYEFI890IxdNcwxWRJvxVbfGoQtiqxRMA0GCSqGSIb3DQEBBQUAA4GBALmj
+LKnfEwGLndyCilet131Bg/MorXvaJLQ7gvKAs9sLpOS/TicfWz/xicp2wugDhohZ
+X1EBr8zYY53PLt4QJUgmX5li3RR4rYJ75nyTSDdPrYqUDJg72emEqo/WaMLz0YBQ
+MP9e5iSOGqEMW8PJq9Z2+3eO7t1W12COSWVlDSD8
 -----END CERTIFICATE-----
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAO6Hq0z5VsvC78Tt
-vfmWn6AocfB1Xng8Wct7bnyVfCZjPDmouVqUbYP1XByg8MNwEbvQVf4iOIKBv4pq
-X4hkufrAg6J+183r7ehnAcA8fmP1+yqcfj+XggSgwodyA3DPwELvAoZbyqTJ/yBN
-zv+2KWehapCbRYxitmz5l8w86U5zAgMBAAECgYEAr9zpKGxhWQPVga0DNwSdlhib
-wPzX9PASCFtt337bNPZPTfefCTCL+hGpoxXpzT5QZNe6vw79+QKudN/upYIWN2TJ
-JgBNzFbJi2BqvVeokXpAHdwE5eq4b6GS+S7a7hqI/iAQMahasYb9hwm4VO6u8agn
-BnJDA5/FvMDkffmc5xECQQD8NIn67E4faznMWJmlB5I3V5jcU72JmUskYmu5ifRn
-e/DjSFzSU9/+rMWO0q8lA8V6pTcC25h8PJcbtleYoVmZAkEA8h50b3Lz8k7Suhlk
-i7lWJqoYlk/pwarPD0tiINYc/wj5BA8ikSkGUrWq6nnW9YahL8o8qoU6Yz1P6o7L
-hmvn6wJAeu0Ev8fDwC6cKkyY/sX074KDoAg03sdXx7Es/m8OMA5J+A3CKEX3bIM7
-e4SXF3yCGWhDquHrrco+gKRch6lFKQJAVicwF1g4JciWg1H1zSIt3aQ5C4N0Ek3N
-UAvq5vRJbRasRR19l1mZvmSWZMjmDIfTY0X7QFIX7Kgsf7JACZzr8QJAEuP4zLJU
-Kaa6ixGp0R9quVDkSVW8mcHAc6q0cMWwpz1vCTj6HOwnONQ8q3e94XZ3V9QLjFl2
-8YmEDeVv5nOa7g==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDiAEp1SQabnr6WZXUTGdImQ7aLZzk8QAdsl3QvC7iiyto0tS27
+xBcnx0zv9C8s2VtFK2dIVbeVDexnPteT8itbEwG6Q0EGwhQTtvnLkn5gDi3NdWEl
+DRmw9YWXR4XWSAkcHRYUIXNemXndeSd1T/Uk3bKu28af4TdVXIhNl/6WfQIDAQAB
+AoGBAJ0eSqWDYV6rXCC+5EelOd50UOJVnwruELtEB/f1FCXJFS5zjxns15RGEIz5
+nBp3+eX6qNE3Fmw/w8x7efBW+iAF/1zHjAmBqfltHAUJzwTSpIOvNEbgITamw1Di
+Tx+uJ495meObhmQZFcC2XW6HCBYiUHs7R7J8Z2lj1UgeWFiZAkEA/jM7w3FrelLa
+h+cVB2u6RmAUNiO7gFd7dZRApu7bNZPdewtuNUOuJXl33LwsdCAx2A5N3/hGigar
+D5KTVb3kEwJBAOOZ8YsClbsNxEN1/rYFoY6euhGmW7bagtvAtGrDLXnefx465Rdt
+ja/84XgnspmyMlTc0NemZrZqrI1nHRJYTS8CQDwAAdI++jx0RAqh+6+1uNEVqo+g
+3YgMniKBrMT6ShmaXkPFzeyangdQZX9flyqN0tYJgk4kPxojOstBMK+jU6sCQQCL
+XqIVEGElqLls4d02Et6qGbIwyqDQqJ+G90rDMX8waDmJBmFwZipkAMMEM7LfAMpn
+QswzsXal7054TBL2P9ILAkA1tzoIfbgqmkyRYtVbCOOJaBOHqwcopLeAWGJKZJck
+kwkjXa9snb3BKGJ+fEgqot3YQdLuZHDBfDxUDG62PPqG
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/test.crt b/lib/hx509/data/test.crt
index 02d01d98e..7ecdb4942 100644
--- 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 After : Apr 11 20:42:52 2019 GMT
+            Not Before: Apr 13 21:48:00 2009 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)
-                Modulus:
-                    00:ee:87:ab:4c:f9:56:cb:c2:ef:c4:ed:bd:f9:96:
-                    9f:a0:28:71:f0:75:5e:78:3c:59:cb:7b:6e:7c:95:
-                    7c:26:63:3c:39:a8:b9:5a:94:6d:83:f5:5c:1c:a0:
-                    f0:c3:70:11:bb:d0:55:fe:22:38:82:81:bf:8a:6a:
-                    5f:88:64:b9:fa:c0:83:a2:7e:d7:cd:eb:ed:e8:67:
-                    01:c0:3c:7e:63:f5:fb:2a:9c:7e:3f:97:82:04:a0:
-                    c2:87:72:03:70:cf:c0:42:ef:02:86:5b:ca:a4:c9:
-                    ff:20:4d:ce:ff:b6:29:67:a1:6a:90:9b:45:8c:62:
-                    b6:6c:f9:97:cc:3c:e9:4e:73
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:e2:00:4a:75:49:06:9b:9e:be:96:65:75:13:19:
+                    d2:26:43:b6:8b:67:39:3c:40:07:6c:97:74:2f:0b:
+                    b8:a2:ca:da:34:b5:2d:bb:c4:17:27:c7:4c:ef:f4:
+                    2f:2c:d9:5b:45:2b:67:48:55:b7:95:0d:ec:67:3e:
+                    d7:93:f2:2b:5b:13:01:ba:43:41:06:c2:14:13:b6:
+                    f9:cb:92:7e:60:0e:2d:cd:75:61:25:0d:19:b0:f5:
+                    85:97:47:85:d6:48:09:1c:1d:16:14:21:73:5e:99:
+                    79:dd:79:27:75:4f:f5:24:dd:b2:ae:db:c6:9f:e1:
+                    37:55:5c:88:4d:97:fe:96:7d
                 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:
-        e7:6d:4a:a0:31:f9:82:36:5d:3c:76:5f:c7:e4:a9:9c:26:e0:
-        08:e9:c1:f7:d1:38:90:2c:e3:fa:00:63:b9:c8:d6:ef:c4:a7:
-        3d:14:1d:b8:17:a8:87:3d:74:4b:a9:84:55:f6:62:d8:43:fa:
-        55:c3:a9:03:60:6a:b3:dd:23:0c:ea:f3:e9:91:a2:19:d5:73:
-        1a:cb:80:e5:98:53:53:9b:4d:14:8d:70:a0:90:37:ea:d9:04:
-        20:0c:e4:58:74:71:cb:1c:0e:b4:42:27:88:d5:97:2c:f6:3a:
-        2f:61
+        b9:a3:2c:a9:df:13:01:8b:9d:dc:82:8a:57:ad:d7:7d:41:83:
+        f3:28:ad:7b:da:24:b4:3b:82:f2:80:b3:db:0b:a4:e4:bf:4e:
+        27:1f:5b:3f:f1:89:ca:76:c2:e8:03:86:88:59:5f:51:01:af:
+        cc:d8:63:9d:cf:2e:de:10:25:48:26:5f:99:62:dd:14:78:ad:
+        82:7b:e6:7c:93:48:37:4f:ad:8a:94:0c:98:3b:d9:e9:84:aa:
+        8f:d6:68:c2:f3:d1:80:50:30:ff:5e:e6:24:8e:1a:a1:0c:5b:
+        c3:c9:ab:d6:76:fb:77:8e:ee:dd:56:d7:60:8e:49:65:65:0d:
+        20:fc
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAWOgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAqMRswGQYDVQQDDBJoeDUw
-OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIwNDI1MloXDTE5
-MDQxMTIwNDI1MlowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7oerTPlWy8LvxO29+ZafoChx8HVe
-eDxZy3tufJV8JmM8Oai5WpRtg/VcHKDww3ARu9BV/iI4goG/impfiGS5+sCDon7X
-zevt6GcBwDx+Y/X7Kpx+P5eCBKDCh3IDcM/AQu8ChlvKpMn/IE3O/7YpZ6FqkJtF
-jGK2bPmXzDzpTnMCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0OBBYEFHQtvwgiz2KfZexF6uZNgy3NluDtMA0GCSqGSIb3DQEBBQUAA4GBAFPu
-HaGxekMUM6c7q7t2XRhsa+dtSqAx+YI2XTx2X8fkqZwm4AjpwffROJAs4/oAY7nI
-1u/Epz0UHbgXqIc9dEuphFX2YthD+lXDqQNgarPdIwzq8+mRohnVcxrLgOWYU1Ob
-TRSNcKCQN+rZBCAM5Fh0ccscDrRCJ4jVlyz2Oi9h
+OSBUZXN0IFJvb3QgQ0ExCzAJBgNVBAYTAlNFMB4XDTA5MDQxMzIxNDgwMFoXDTE5
+MDQxMTIxNDgwMFowITELMAkGA1UEBhMCU0UxEjAQBgNVBAMMCVRlc3QgY2VydDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4gBKdUkGm56+lmV1ExnSJkO2i2c5
+PEAHbJd0Lwu4osraNLUtu8QXJ8dM7/QvLNlbRStnSFW3lQ3sZz7Xk/IrWxMBukNB
+BsIUE7b5y5J+YA4tzXVhJQ0ZsPWFl0eF1kgJHB0WFCFzXpl53XkndU/1JN2yrtvG
+n+E3VVyITZf+ln0CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0OBBYEFI890IxdNcwxWRJvxVbfGoQtiqxRMA0GCSqGSIb3DQEBBQUAA4GBALmj
+LKnfEwGLndyCilet131Bg/MorXvaJLQ7gvKAs9sLpOS/TicfWz/xicp2wugDhohZ
+X1EBr8zYY53PLt4QJUgmX5li3RR4rYJ75nyTSDdPrYqUDJg72emEqo/WaMLz0YBQ
+MP9e5iSOGqEMW8PJq9Z2+3eO7t1W12COSWVlDSD8
 -----END CERTIFICATE-----
diff --git a/lib/hx509/data/test.key b/lib/hx509/data/test.key
index 6f94d826b..7e527ca95 100644
--- a/lib/hx509/data/test.key
+++ b/lib/hx509/data/test.key
@@ -1,16 +1,15 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAO6Hq0z5VsvC78Tt
-vfmWn6AocfB1Xng8Wct7bnyVfCZjPDmouVqUbYP1XByg8MNwEbvQVf4iOIKBv4pq
-X4hkufrAg6J+183r7ehnAcA8fmP1+yqcfj+XggSgwodyA3DPwELvAoZbyqTJ/yBN
-zv+2KWehapCbRYxitmz5l8w86U5zAgMBAAECgYEAr9zpKGxhWQPVga0DNwSdlhib
-wPzX9PASCFtt337bNPZPTfefCTCL+hGpoxXpzT5QZNe6vw79+QKudN/upYIWN2TJ
-JgBNzFbJi2BqvVeokXpAHdwE5eq4b6GS+S7a7hqI/iAQMahasYb9hwm4VO6u8agn
-BnJDA5/FvMDkffmc5xECQQD8NIn67E4faznMWJmlB5I3V5jcU72JmUskYmu5ifRn
-e/DjSFzSU9/+rMWO0q8lA8V6pTcC25h8PJcbtleYoVmZAkEA8h50b3Lz8k7Suhlk
-i7lWJqoYlk/pwarPD0tiINYc/wj5BA8ikSkGUrWq6nnW9YahL8o8qoU6Yz1P6o7L
-hmvn6wJAeu0Ev8fDwC6cKkyY/sX074KDoAg03sdXx7Es/m8OMA5J+A3CKEX3bIM7
-e4SXF3yCGWhDquHrrco+gKRch6lFKQJAVicwF1g4JciWg1H1zSIt3aQ5C4N0Ek3N
-UAvq5vRJbRasRR19l1mZvmSWZMjmDIfTY0X7QFIX7Kgsf7JACZzr8QJAEuP4zLJU
-Kaa6ixGp0R9quVDkSVW8mcHAc6q0cMWwpz1vCTj6HOwnONQ8q3e94XZ3V9QLjFl2
-8YmEDeVv5nOa7g==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDiAEp1SQabnr6WZXUTGdImQ7aLZzk8QAdsl3QvC7iiyto0tS27
+xBcnx0zv9C8s2VtFK2dIVbeVDexnPteT8itbEwG6Q0EGwhQTtvnLkn5gDi3NdWEl
+DRmw9YWXR4XWSAkcHRYUIXNemXndeSd1T/Uk3bKu28af4TdVXIhNl/6WfQIDAQAB
+AoGBAJ0eSqWDYV6rXCC+5EelOd50UOJVnwruELtEB/f1FCXJFS5zjxns15RGEIz5
+nBp3+eX6qNE3Fmw/w8x7efBW+iAF/1zHjAmBqfltHAUJzwTSpIOvNEbgITamw1Di
+Tx+uJ495meObhmQZFcC2XW6HCBYiUHs7R7J8Z2lj1UgeWFiZAkEA/jM7w3FrelLa
+h+cVB2u6RmAUNiO7gFd7dZRApu7bNZPdewtuNUOuJXl33LwsdCAx2A5N3/hGigar
+D5KTVb3kEwJBAOOZ8YsClbsNxEN1/rYFoY6euhGmW7bagtvAtGrDLXnefx465Rdt
+ja/84XgnspmyMlTc0NemZrZqrI1nHRJYTS8CQDwAAdI++jx0RAqh+6+1uNEVqo+g
+3YgMniKBrMT6ShmaXkPFzeyangdQZX9flyqN0tYJgk4kPxojOstBMK+jU6sCQQCL
+XqIVEGElqLls4d02Et6qGbIwyqDQqJ+G90rDMX8waDmJBmFwZipkAMMEM7LfAMpn
+QswzsXal7054TBL2P9ILAkA1tzoIfbgqmkyRYtVbCOOJaBOHqwcopLeAWGJKZJck
+kwkjXa9snb3BKGJ+fEgqot3YQdLuZHDBfDxUDG62PPqG
+-----END RSA PRIVATE KEY-----
diff --git a/lib/hx509/data/test.p12 b/lib/hx509/data/test.p12
index bdb9edbef6ba599c17a9da4a7704fa18785def3e..9365bba7c37dec8fdc5d03e613003170f0ed29e9 100644
GIT binary patch
delta 2121
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

delta 2121
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