fix filenames for ds/ke files, add pkcs12 files, regen

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15780 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/hx509/data/ca.crt

@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICbDCCAdWgAwIBAgIJAMmFIAuPojvTMA0GCSqGSIb3DQEBBAUAMCoxGzAZBgNV
-BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI1MjAy
-MzU4WhcNMTUwNzIzMjAyMzU4WjAqMRswGQYDVQQDDBJoeDUwOSBUZXN0IFJvb3Qg
-Q0ExCzAJBgNVBAYTAlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtwaPh
-cjjY0eijeHymbwrMNjLsa/0oNZxaQKWCagd4GBW7k1TpNu9NV2L85tYuesYmpo1H
-zasvd0w6Cd9Ihsb6m47ygBZvvF94D4/bCDWMlGZbhH1wZV9oaW3x4HXs2I/RKGzF
-qsWI/HE8l0gdHMn7JQLbJ/dfbwCkkBhjDZYLzQIDAQABo4GZMIGWMB0GA1UdDgQW
-BBSrQ0XWyzZM3Cy+Dt8j92XWcvT4WDBaBgNVHSMEUzBRgBSrQ0XWyzZM3Cy+Dt8j
-92XWcvT4WKEupCwwKjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYD
-VQQGEwJTRYIJAMmFIAuPojvTMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0G
-CSqGSIb3DQEBBAUAA4GBAKLuR+u/BjQ6smYFtc33daO/DHworF59Wl+udgPrYRel
-EZRkMU1tgvA7hKOtPG4FSW3YeFfpE238HItMb6fFpRmEoFuIaulmZhuCkOhURWIZ
-aRazdJB+eH/OIvif6rCu6nrFlSH5Wzj7haW2+rMgU05YwIzV6TKfWWGBnZ3UboF2
+MIICbDCCAdWgAwIBAgIJAOMz1JsD8LslMA0GCSqGSIb3DQEBBAUAMCoxGzAZBgNV
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI3MTg1
+MzMyWhcNMTUwNzI1MTg1MzMyWjAqMRswGQYDVQQDDBJoeDUwOSBUZXN0IFJvb3Qg
+Q0ExCzAJBgNVBAYTAlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPcVad
+eB+0GfNoj8EVENZSPfMBNYbWtU9A+z662pmW7fBWEAaNtD3vod8nmanHvLSniVX0
+UX3HFgpPCha1sHkQ0c9ljycCS6Y/HFYhcandC5jPBfbTGSlwY8qfbSeKXcJbmAOu
+XYkVbxMLGUWvgWtebA4tyxe4bIMnm0FTEJe0+wIDAQABo4GZMIGWMB0GA1UdDgQW
+BBRsRocil3APjbqMz1V7uBdYezklFjBaBgNVHSMEUzBRgBRsRocil3APjbqMz1V7
+uBdYezklFqEupCwwKjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYD
+VQQGEwJTRYIJAOMz1JsD8LslMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0G
+CSqGSIb3DQEBBAUAA4GBAG+X2RxED6rfXlH8pGq9P2w4bFxBbhyKm/m08PsgYQH7
+vtylbId+TO/hWRGjr6+s9HUlPJavfpcQHpcyT4zFPk/SOLrYbZAGEWIuMpddopq+
+e3mvChqyF5mYbCdOumyYBzxgB4FjhEvfB7sYa0WZMMU3rJsGdGnGPQlDk8+G8XhG
 -----END CERTIFICATE-----

lib/hx509/data/ca.key

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCtwaPhcjjY0eijeHymbwrMNjLsa/0oNZxaQKWCagd4GBW7k1Tp
-Nu9NV2L85tYuesYmpo1Hzasvd0w6Cd9Ihsb6m47ygBZvvF94D4/bCDWMlGZbhH1w
-ZV9oaW3x4HXs2I/RKGzFqsWI/HE8l0gdHMn7JQLbJ/dfbwCkkBhjDZYLzQIDAQAB
-AoGAdXZCY1XkOC8vJdN98MWAdyzsoAcgzN3xJNIvEUq8YeNmTbf73uzUOWSp9m3W
-vPUin15YhAH1h9EOJu4lk9IJEKOl1g52zmVDRe2xJreLKeqYNwp405TwugfoLmDT
-Xenh2LWdfjgCUeQqnwk3h1Begj0JM+uCmgQ1NiWAh5kNjgECQQDkg1cWaB+1Tkw2
-3ECDDZAyqn5KhHaUZ4Wsc8n2oIpZb2JUpiTydTlOcPoRmJ/nNhYB6zqXLiQUJ29/
-ydpLMyhZAkEAwqgqOf5k8csezh8B7IG/m4EOHjzY0uKJAn0IJnjY8ZV2XX5miSj2
-PbEaMN5zpB3pOxBRZjhre6xmjl94P1oQlQJADWZSPgMfEN+lgnYJ5mVuNjpfK3l3
-Bp7HbORhTG//jN0GNBaGBh2vnZTsZQnBHqrCQZyMk/7lqLTjSegJP+2hCQJAEIdx
-Fn2YmsORuRT+99NIru61gTHPg5DC65gsYf/vBAyaAXRjRpBY4IIyZCXvkecMT/yh
-vNlbnyPTjZFjx5VhRQJAWFQ4T7Kd4rRbs3yZDGuCEePatjeHy3tzKZNEmcUhrGp1
-UsLHw/oYuU3Dy1N3Lq8RFd/42TcxRMMK20uBBasbrA==
+MIICXQIBAAKBgQDPcVadeB+0GfNoj8EVENZSPfMBNYbWtU9A+z662pmW7fBWEAaN
+tD3vod8nmanHvLSniVX0UX3HFgpPCha1sHkQ0c9ljycCS6Y/HFYhcandC5jPBfbT
+GSlwY8qfbSeKXcJbmAOuXYkVbxMLGUWvgWtebA4tyxe4bIMnm0FTEJe0+wIDAQAB
+AoGBAJrZNte7KKdPS9R8opvwApxHpBL9+tZhZ3TRV4Ux0r7IhMQpmErFBgrQIX01
+BniT06LQMLp87k/jkvRnSoZ74hIkwSj0xyydFGqDuYbsmwYtaSPJx/Kn3s7JzYoR
+s1fUHbxYg7xWyl9lQfRAH3cGspbw5GLuciiCCCKiDfxAcXC5AkEA8HOG2WeIAP/5
+6eui46I/d3fT0uRjKMwS3hMVLUyH42MDcFbWJ+taJLxzEz/dQxeYgVRXoqtLFLn5
+53o38j6ovwJBANzbYdeZXT9d/XE7WPdLqmhRLkHwrWfkjfXYrPP0eb6V/p+ft0af
+6aqgpG+FIIr7LSObKtPZOEu1ytM6yeQMpsUCQQDLHqxxhvXq8lHpeza02OCISV9V
+Lb1eP1ZI5xHinF3GhmPnSFPMkRIrKk6DmlWNUadwyRDmx5C7R4eGNUaBitD9AkAl
+0+mRPPJsvROAxnJ5gNtCHM14e9mnlsz908vjyPblPtmqy3dfwFoMYJFpjHrDczwL
+AjO2r1jmFtATl9kml0glAkAb/p57WPmzmVnDXPJJ3R3e2koYs1V4YEIOi81pX4E/
+epqrh4vqD71bHlIvARk6yWY9wB9OV13QEQex7gGENd4N
 -----END RSA PRIVATE KEY-----

lib/hx509/data/gen-req.sh

@@ -35,8 +35,31 @@ gen_cert()
 
 gen_cert "hx509 Test Root CA" "root" "ca" "v3_ca"
 gen_cert "Test cert" "ca" "test" "usr_cert"
-gen_cert "Test cert KeyEncipherment" "ca" "test" "usr_cert_ke"
-gen_cert "Test cert DigitalSignature" "ca" "test" "usr_cert_ds"
+gen_cert "Test cert KeyEncipherment" "ca" "test-ke-only" "usr_cert_ke"
+gen_cert "Test cert DigitalSignature" "ca" "test-ds-only" "usr_cert_ds"
 gen_cert "Sub CA" "ca" "sub-ca" "v3_ca"
 gen_cert "Test sub cert" "sub-ca" "sub-cert" "usr_cert"
 
+cat sub-ca.crt ca.crt > sub-ca-combined.crt
+
+openssl pkcs12 \
+    -export \
+    -in test.crt \
+    -inkey test.key \
+    -passout pass:foobar \
+    -out test.p12 \
+    -name "friendlyname-test" \
+    -certfile ca.crt \
+    -caname ca
+
+openssl pkcs12 \
+    -export \
+    -in sub-cert.crt \
+    -inkey sub-cert.key \
+    -passout pass:foobar \
+    -out sub-cert.p12 \
+    -name "friendlyname-sub-cert" \
+    -certfile sub-ca-combined.crt \
+    -caname sub-ca \
+    -caname ca
+

lib/hx509/data/openssl.cnf

@@ -0,0 +1,41 @@
+[ req ]
+distinguished_name	= req_distinguished_name
+x509_extensions		= v3_ca	# The extentions to add to the self signed cert
+
+string_mask = utf8only
+
+[ v3_ca ]
+
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer:always
+basicConstraints = CA:true
+keyUsage = cRLSign, keyCertSign
+
+[ usr_cert ]
+basicConstraints=CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+[ usr_cert_ke ]
+basicConstraints=CA:FALSE
+keyUsage = nonRepudiation, keyEncipherment
+
+[ usr_cert_ds ]
+basicConstraints=CA:FALSE
+keyUsage = nonRepudiation, digitalSignature
+
+
+[ req_distinguished_name ]
+countryName			= Country Name (2 letter code)
+countryName_default		= SE
+countryName_min			= 2
+countryName_max			= 2
+
+organizationalName		= Organizational Unit Name (eg, section)
+
+commonName			= Common Name (eg, YOUR name)
+commonName_max			= 64
+
+#[ req_attributes ]
+#challengePassword              = A challenge password
+#challengePassword_min          = 4
+#challengePassword_max          = 20

lib/hx509/data/sub-ca.crt

@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICYDCCAcmgAwIBAgIJAIq/kJ6AbVX/MA0GCSqGSIb3DQEBBAUAMCoxGzAZBgNV
-BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI1MjAy
-MzU5WhcNMTUwNzIzMjAyMzU5WjAeMQ8wDQYDVQQDDAZTdWIgQ0ExCzAJBgNVBAYT
-AlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDyI9BitZmBYQEY6gX2fZQB
-b7ROJuwprKOn3jFROOGteOe7dsTW/td3Bxqs+9bFUeHdFl6UuapxEwa9UbfP7Iec
-Iq/JqTihEMwkahbgCVgsgvr4Fbo+JzMdjeRP2cGSc4eINDdFl1xf3419ZZg1v5a5
-LwkxtIJaqhPY/ObJ9J+GWwIDAQABo4GZMIGWMB0GA1UdDgQWBBQKDbi8RJZQm5q8
-3E7jos/EP3+Q5zBaBgNVHSMEUzBRgBSrQ0XWyzZM3Cy+Dt8j92XWcvT4WKEupCww
-KjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYDVQQGEwJTRYIJAMmF
-IAuPojvTMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBAUA
-A4GBAEP2RY58AERpMXT2KSMugh9Rf4/BI/fvERCCEc89xJFwtts+Rxr5Ml4ordSE
-kiKOQGkDHpO2JjCkDbQN4uPNjd/EtmIvCcf/rwvcJF10nk/MkzN7eO2KGC0uhJdh
-WYwIC54EAL65Ejdhy3QKbvWcfTfvH2GW6X8XEGJ0W4G9DU7h
+MIICYDCCAcmgAwIBAgIJALVp8kub/fs+MA0GCSqGSIb3DQEBBAUAMCoxGzAZBgNV
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI3MTg1
+MzM0WhcNMTUwNzI1MTg1MzM0WjAeMQ8wDQYDVQQDDAZTdWIgQ0ExCzAJBgNVBAYT
+AlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDibIa55bdhQsprtd7ehUo
+QnevOIwG7GOCmcKleVezXssNkBXbbIiuLHaEUd3ioWRH3VqCvieggcONzobxz5xT
+YIGIFtBIi0kuYspcjFKQAcFQKYlaWiHyplIkvrBJ82wV9bfDjOuz/SNtLLiQloTe
+/EUFb0AKEIoJP4ttqBSg8QIDAQABo4GZMIGWMB0GA1UdDgQWBBSstZ+3+wf3ZpFf
+ZsoHSEQCjczYUDBaBgNVHSMEUzBRgBRsRocil3APjbqMz1V7uBdYezklFqEupCww
+KjEbMBkGA1UEAwwSaHg1MDkgVGVzdCBSb290IENBMQswCQYDVQQGEwJTRYIJAOMz
+1JsD8LslMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBAUA
+A4GBADEFo+RVb0CfiZW2TIq34HiWMMqRPW6SYaAn5mTx1Dk0LNRtP52aoyFaayCW
+QXx3sP9o9P0BwirhbRnMdltt/N2RohzcAlL0zy9C6wcIEKmMziBpQB+svdnG8q26
+n6Bj8NLtOOqYeEeaupjt1rGKf63FUVhyz1wcxvqd8OSdmZQg
 -----END CERTIFICATE-----

lib/hx509/data/sub-ca.key

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDyI9BitZmBYQEY6gX2fZQBb7ROJuwprKOn3jFROOGteOe7dsTW
-/td3Bxqs+9bFUeHdFl6UuapxEwa9UbfP7IecIq/JqTihEMwkahbgCVgsgvr4Fbo+
-JzMdjeRP2cGSc4eINDdFl1xf3419ZZg1v5a5LwkxtIJaqhPY/ObJ9J+GWwIDAQAB
-AoGAGewLmwWl8VvZKjmjecfn2F+FBfjUv4Fj48y9qtxUDKYs6LzGRd3yYyO3j11G
-mMkzTN/gMDvQK1rGFe5xpyjDO5aKu14mN0S0U/M8qMk5MQ27dNUnyDc0+07un3kC
-axTQsRm8eoJZljF6wrZ6eY3vP4DO8udDTidxzvaTRscHT8ECQQD8oU/9QImg+6nL
-teX0ze1wjOwdK/ErtaFRPf5fRWDA2trFJFLRahFiGBTs+2xz6ebo4ZeY7FYare1w
-1Eo8sUe1AkEA9V6t4/T5jlVFggq35S3r6yZvx6O0pTBUr+GiDrQXKaI+tq3LaK37
-L3xCxTGoAOsXKVAKjl6md3ad4vpeEL0/zwJAVEXjjxHGV4NcIu5s5XsEZ/U6loig
-DPqr85QAlPtpySu4qubxEZaWceiiomNEzG4Mb0dB8Ot11bSLboYCtbhVuQJBANq5
-T2EJGvxZ3uARFeRhjw/K75GSyJEICDXQeFmLB6rBSg4l1lC15ldp+Us2/H/1EGxv
-QTmv/cw4HH4cmIVrbdkCQQCU9hu8C4gzwFPzf4ahRkRBH2nlMhYMD1LitCmlnOAC
-KxbnpDHUXB86bFRsy/nhDOX0Mio0d5xggbZJYj12Hlr3
+MIICXAIBAAKBgQDDibIa55bdhQsprtd7ehUoQnevOIwG7GOCmcKleVezXssNkBXb
+bIiuLHaEUd3ioWRH3VqCvieggcONzobxz5xTYIGIFtBIi0kuYspcjFKQAcFQKYla
+WiHyplIkvrBJ82wV9bfDjOuz/SNtLLiQloTe/EUFb0AKEIoJP4ttqBSg8QIDAQAB
+AoGBAK82om6zWJ9UySTns9TEF1NFBAPxsp+9kImFiEJIkgp7hY24r603+t2/n89/
+oEikf7xZn/IJvG55+KYICymA9Dy852JI75pbEUUraOWvFhG7AuAa9Qfyy8cVTiTC
+f8yY2H3MH6uYI8ZfPU47BvvJt8U+AmViU3CAunOdtM4wazaxAkEA5SVEJhqJ9GKz
+RaMPFYQvlASqD3UdPEDXf9I4Chuy7wv+HMkTpvMs9ICSslIxzSTHYlwfuz3Tv+c6
+ewK60kUBnQJBANp0JRM0oSF3ep5J8PJarV/VG74i7PaGVTULs3TMC06wIIu+mdLa
+iaChBCAdCxJngNBdBeObzv1175aUq2+9lmUCQGKtH6HA//NrpYOxakd7uvlk4M7z
+Qfm2epaisls3/mAOrAk9VecpBQztaT69QpDy66GhxlBdmZgkPPzH+ieea8kCQFKj
+jULureXTJPesURHda6jNHWmYHLxFpQYkHwcYCU8DIcy7lcVGFrpFLyJW2lFkBj7M
+ceXgkzUe4Du+kfv7ZGECQGG4fci9tf9/wBY4EcaCwKt275CQh3VKi2aJHssANnEF
+VRzP03sVkPLBBriQB1+XanTpO6rQMDmRUVcaXwZ/Z44=
 -----END RSA PRIVATE KEY-----

lib/hx509/data/sub-cert.crt

@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2zCCAUSgAwIBAgIJALRIbl3OMhFiMA0GCSqGSIb3DQEBBAUAMB4xDzANBgNV
-BAMMBlN1YiBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI1MjAyNDAwWhcNMTUwNzIz
-MjAyNDAwWjAlMRYwFAYDVQQDDA1UZXN0IHN1YiBjZXJ0MQswCQYDVQQGEwJTRTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyEVADGeYwo6pyH5NWj4AtdQuZIPg
-0SIOAnEl2kip7unmZh4esmc9ppHGo3yb09f7z06T4aZI93ZhVgKP5mLCKlwB26O1
-KlCfkudDDd+uF3qd2bfenObXZ9VvyzB1K5BIaXk7s4k7LM0hyP55CYo/50gd7HBo
-9/lQ+K64r8wGuykCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwDQYJ
-KoZIhvcNAQEEBQADgYEAkKN8+HT09qBY7IK2TxOfnOW4vtlrfwPR7asLsmULAqtB
-XMYwfrfxEti+wWswo6nIYRQY2FgVqJzqw0G7ePwOpiNMN1dsuygJprrajGfZ/+y1
-dS9JfOwRjXRkOCffPcwpFsV0BRu++Vy+GQ2+lwzM+WFStg5/RNeTQcyKRi1+QK0=
+MIIB2zCCAUSgAwIBAgIJAOi6DZWGy39aMA0GCSqGSIb3DQEBBAUAMB4xDzANBgNV
+BAMMBlN1YiBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI3MTg1MzM0WhcNMTUwNzI1
+MTg1MzM0WjAlMRYwFAYDVQQDDA1UZXN0IHN1YiBjZXJ0MQswCQYDVQQGEwJTRTCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0j19dTW/5ZqS3eEFxvYAV3n7ymz+
+iUVnQdrLyT9nFwJ2c6CX/OmDrd6rY8pT0ixvheEi6oDHyMExyEfzLnPfqamWYe2U
+Wjr6TJynfw6cT6gmWnBCx692iTlKahdao/d91NIbhPiIFZswzWvpdo7yHALHI9DK
+etkG8oaQEP/jIOUCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwDQYJ
+KoZIhvcNAQEEBQADgYEAkbAZsjzyAtOA9Mj8nF9vm3bYfxbtviid/AB6d84K4s+I
+1yh6UOZ+cMr3zwScWcGWarx5eWMxRYn+3okudtrDm6CiLBIhNOYne8Cs/9S4glNv
+Sc0jLvRn/PVcBtuPavUa2NgFxaFIm3kGv+8SqKROrkig30OZr3WlVb7UFSmXFfY=
 -----END CERTIFICATE-----

lib/hx509/data/sub-cert.key

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDIRUAMZ5jCjqnIfk1aPgC11C5kg+DRIg4CcSXaSKnu6eZmHh6y
-Zz2mkcajfJvT1/vPTpPhpkj3dmFWAo/mYsIqXAHbo7UqUJ+S50MN364Xep3Zt96c
-5tdn1W/LMHUrkEhpeTuziTsszSHI/nkJij/nSB3scGj3+VD4rrivzAa7KQIDAQAB
-AoGAW2yxpngMlpTGEU8HRPEVJeytGRnTIeWn+5lnrFSLrxN8KJYLcWoMDORzh+K0
-yGrK+4JlpBdjLAUQvlEBHC1tcVU6ncQ1a2KUf8lsggk70FzH/xdIL35erjVSXXJq
-D+VhuwfK+YMQJbmC66dFgK5j3B41GYC3xcxKB5VM8YImhQECQQD6DYf+cfBgvTJo
-iAcMR3zKMQraxD1OvNPtCxJKBHvl/44sneV5wEB7Bb874M6Du0Y99CE/nnzoYwm8
-vA1ezAmRAkEAzQidYV0JcAN9Abbfam2fzQ2BH5yvhrtwbn1OxeUFTjwNYJZ4Hc6Z
-42FJSJmiX9zck6jLiM/DrY2aV5W5c7cMGQJACB6IW+q3M2zxRhOkpvFrS+VrxM66
-buQSvY+ueFjM7RrvMuOtn9ZuQZBeNUOHcR+TmE9lBPvQcntExawVgw59AQJAQg1p
-bilj1fM5vWillwrT9WJJW97FaVlPQjkaPISobejIwnoXHjsltmvsCPh9p/ZmFSfG
-0j9koa/Brj+s7AtnWQJBAME8F0GTTcB2VP4uutJ+QYi/RUneSC24Ew8vGw3rN6Wi
-hFAGlCYFQBvt6jIKKMNVOalz4MZIiW5P6CqqUDeo+ss=
+MIICXQIBAAKBgQDSPX11Nb/lmpLd4QXG9gBXefvKbP6JRWdB2svJP2cXAnZzoJf8
+6YOt3qtjylPSLG+F4SLqgMfIwTHIR/Muc9+pqZZh7ZRaOvpMnKd/DpxPqCZacELH
+r3aJOUpqF1qj933U0huE+IgVmzDNa+l2jvIcAscj0Mp62QbyhpAQ/+Mg5QIDAQAB
+AoGBAICwyv7YK+Krv4K5nwOuyX7CWHIMTbJRHWeeOmexu7TF+SPGBcL2XXgseNTY
+oH5iXNGigfDxa1ljiMmD4UNqAlmIDhZtPjgFdOzGk7GkzE9iHVA4OTLtkHYbT9Op
+c3TGlmYlJ35RUwn1mUSxyKfxooBa9m/dWbOVv3+ZHIBvoCbxAkEA8SueerCpsODV
+zPU8PDrT/KIs3+pfWF4hPnRsZvGJI7CLviTA3wHTrxYN6YmbpZO36YNBkVb3gfR3
+5t0Vk4u+MwJBAN8q+9cGEKWVvF9uGvJ0WHrO7b02AQTaw1a3khA9nq52cQDitLpU
+VVFlf8BeUAKZKiU4Ep71nOuwtLeQt2VK3IcCQQDrRnFqIfS5sO4C8G+eFon+WTxM
+CbqQW+w0oKGsYBA4+B+sFPDv3jlkArD51xw4EP8HWNxbbKszZYqfd6l38olPAkAx
+Zkdm+o22yaVwDmRipQRs8t9HUev50h8JVAs+ExXMEqXDB2vwDvjv0qLrxzS4zoS4
+xmfAzieVOIFYXO1ru52DAkAamldM+vjbpljDPj4D0RAZCBWWfTzizIJHVx0ikQjD
+DT1RK6/9PmR3ZvSLFJVJ7RkDvff74nQmsyAMlCF/9VkW
 -----END RSA PRIVATE KEY-----

lib/hx509/data/test-ds-only.crt

@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4jCCAUqgAwIBAgIJAIq/kJ6AbVXnMA0GCSqGSIb3DQEBBAUAMCUxCzAJBgNV
-BAYTAlNFMRYwFAYDVQQDDA1oeDUwOSB0ZXN0IENBMB4XDTA1MDcyNTE4MjMwMVoX
-DTA1MDgyNDE4MjMwMVowJDELMAkGA1UEBhMCU0UxFTATBgNVBAMMDHRlc3QtZHMt
-b25seTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEBWqjovz+jzBB2NQtFoAB0
-ij5aer1rUxc9Oxw162DuBPtgvR457rHhbasP5hIMN10KrlbfzvbTkaOsLHAjhflZ
-T8i5QLdcc8bTATxBzVZ/+Gv58K2uNw45BNZL5+uUfxaiR34vfVwzg7ownqxyLq56
-AV4aO6RDMoQGJ22LJmUaGQcCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwDQYJKoZIhvcNAQEEBQADgYIAAARF4lzFB1mKwM9YL8r+McEYHJ01nM9NOeX3
-FscmhICkRYnGMXXktBLd99OQ58EaA3OmyabPEpUCOb/ojLRmau/E9XpMQEAPidxG
-1DH5qf1Tx++9etqG7J4MmA/CicgZiRtHss/s9MdXgP51b0+m/0xhn7TVDxLOrgK7
-dtKabFNq
+MIIB9DCCAV2gAwIBAgIJALVp8kub/fs9MA0GCSqGSIb3DQEBBAUAMCoxGzAZBgNV
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI3MTg1
+MzMzWhcNMTUwNzI1MTg1MzMzWjAyMSMwIQYDVQQDDBpUZXN0IGNlcnQgRGlnaXRh
+bFNpZ25hdHVyZTELMAkGA1UEBhMCU0UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBAMKVdReMNkZBL8wYWaUTKczT3470P8r7MXqqg6rv5q/612wbKWnTPe5Vny7X
+qZ4p0rDpX2hZGfD5Gggr496L2GSQ6Eec1bOTJznlSg9BHc5PCfNL+RJ0bG/n4vmG
+eJKJqFwrGI0pS6qjPIh9PhuoEINwY1J2qUjvlstxa8hj9QeBAgMBAAGjGjAYMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgbAMA0GCSqGSIb3DQEBBAUAA4GBAC9SHuwolAun
+acsx2royYktE1EfBBvlA+j3hFrOki0nHyGBDIPxI90hwOVJ+3Nr7cG0Fge8TnZSX
+aauFM307Nn0qYLHB6gwCAgrgJrKHU9hhOiq7IQGK9qxhxEwgZ/u/rPUi7IidlY4p
+reYJuZ6rDbt5qkarTIEuAUiHLQv5qEks
 -----END CERTIFICATE-----

lib/hx509/data/test-ds-only.key

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQFaqOi/P6PMEHY1C0WgAHSKPlp6vWtTFz07HDXrYO4E+2C9Hjnu
-seFtqw/mEgw3XQquVt/O9tORo6wscCOF+VlPyLlAt1xzxtMBPEHNVn/4a/nwra43
-DjkE1kvn65R/FqJHfi99XDODujCerHIurnoBXho7pEMyhAYnbYsmZRoZBwIDAQAB
-AoGBASVXY0RatN98Wpq+RBeF6xgEdYoBea0hMCYx1AquxhsfIJhH2Jv8mBa2N0jn
-osDCkcQ/LTo0MYm/J3WfGuBGxOObQKH06/O8W313w1ZiwotyQB/kTpURklKHvFoY
-v57xIyEx4QcuuvaB1axFHdzhJR0Ti/C3wSX7QcokICy7hXnpAkEBsj4POByKaUjk
-HE+jmy4KjjHQHiNAf/hyZ9UcHgPcBa6sBmYt4pIkoRWKGx4NTnFhJaS9TddQ2M7B
-fYeabAJcxQJBAMxeARR1i0bb78BH7ADrK/3wqnjUOGVKfeFE60CrxIs/ejoI2h0+
-8thBuNOWu5aPZis+I7pSK6oZr8KSFNzmk1sCQQD66PkKRxOC+mc0JKA4TkYzG31R
-rLTcPMZ+UJlKjphXgDJOEER7Ik6f9T4zpQ2zQbgMdEAd9kf0vqL20Z/cwRCxAkAr
-oPnsCzgDlZp2WyRYAdyvZryN9QhhH2kGOXdbpA/ehluqng8qZTDk2AsEKM69UrnG
-C4sHENm/g6JREGyhyBu3AkEBUbST8Yk/HJhXZxbyu2VcAnUDz30R/0KxhQ113rOk
-H7PQa71apPB3WdrMS12FFwXXuWg0jaC9Os+zxIeDzkSo7g==
+MIICXAIBAAKBgQDClXUXjDZGQS/MGFmlEynM09+O9D/K+zF6qoOq7+av+tdsGylp
+0z3uVZ8u16meKdKw6V9oWRnw+RoIK+Pei9hkkOhHnNWzkyc55UoPQR3OTwnzS/kS
+dGxv5+L5hniSiahcKxiNKUuqozyIfT4bqBCDcGNSdqlI75bLcWvIY/UHgQIDAQAB
+AoGAdXupm9MTPe3DvxWAopNkbIAL/ZLpJVPutuJW5xE7lkr8YBAyO+vH+6uEldKu
+XYlg5WGyMh2B9SVhm0dsqISE3H14k384hLyITpnsaD6N52gDotkQoKbos111buVS
+xqJ3nc2ithp3igDF8OsZCLvt6BD/FnBveXD35Fx1VC6sN7ECQQDpvWWXROhjc5ZV
+AL6WLqr8fs7xl/QrzKk50AyNX0vjxUXMIvr5ukF/0S/+EDxqgjZZoxvdVj7yWNrG
+qDZRpjLVAkEA1R1uvUDn7lGLVuteCnVdhkTCR9cvljGVCxcb+iEprniClOnPkBQ5
+p7ZbhjzqSnwTc2pezgb2ZWVLEOjljNkf/QJAE0uBMWWM0XjfNhEjqn4bu1A0gRkM
+HPl+Frmn75uoRhso0dspYKgRdB2umoh4lEo/dlLSoAjYlWTkWnXUVhUkKQJAf+J0
+lG7BfrpCMjt1KDN7ltnl97RCYw+Hz6rjZ/rEh2Tbfz67BkuMuX5td6VQNrgz99tJ
+3rpA22GoZRJMxXN5hQJBALFgvcFLvT+pUDGYuhyQB8f3aNmmDyDyMnQdUkHEX/j+
+g9vXCpWOvOn7IorE9eScuSHrOCwJbeW4zqdeAD3UElc=
 -----END RSA PRIVATE KEY-----

lib/hx509/data/test-ke-only.crt

@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4jCCAUqgAwIBAgIJAIq/kJ6AbVXoMA0GCSqGSIb3DQEBBAUAMCUxCzAJBgNV
-BAYTAlNFMRYwFAYDVQQDDA1oeDUwOSB0ZXN0IENBMB4XDTA1MDcyNTE4MjQxMloX
-DTA1MDgyNDE4MjQxMlowJDELMAkGA1UEBhMCU0UxFTATBgNVBAMMDHRlc3Qta2Ut
-b25seTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEBZ290x/w0nhucKZGmp+7c
-ahn5be5FWS9rMBx3+o0cSkNwD1gBs//eXOWHwG6tr8PDydO04nKGs1Cy18sorWZG
-QEGyurIoxDhI631aOe9XKb4Fca+sXcXfQaSRt3AOTvC6m5Nl5PJivcYLb2CokcEr
-T1Vxsr7OHc0f9APf56lqlVsCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BWAwDQYJKoZIhvcNAQEEBQADgYIAAHAXif0W9UNZwmuJnu8Ozrx7Xzv4Fli56Pjt
-FeT1B/ay/VWDgGQRYfN4myrvha02AEfkZD+xlbO3Ez1KzmQAdLMiPuEt5Vrk+bQD
-8+G8ZKb5v746raNSDG0rdA2AJaQwJSZ3QigPLACN6dT4sovzjHJoOL3SeaD1qDN0
-JYP7bf4X
+MIIB8zCCAVygAwIBAgIJALVp8kub/fs8MA0GCSqGSIb3DQEBBAUAMCoxGzAZBgNV
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI3MTg1
+MzMzWhcNMTUwNzI1MTg1MzMzWjAxMSIwIAYDVQQDDBlUZXN0IGNlcnQgS2V5RW5j
+aXBoZXJtZW50MQswCQYDVQQGEwJTRTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
+gYEAvjMopip15yzjulTf3QYmf4ETapHYHfLb+QYpbQSaSnCR5NwqYAvDKQpEj/6A
+Qqo/2TLiLJ8O19Ulss1byT0/kczXoHvQiZkjPwh44xE4sTV4gFDOFYicyavfCRis
+x1Xu/4jk+RLu+9SGaA4TdKHfiL0EVsIjBusXeiS8paPgrpkCAwEAAaMaMBgwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBWAwDQYJKoZIhvcNAQEEBQADgYEANeC3isbZ3KBX
+/HtxF8CZdgbiQQJ8rltUcSy9n/WK8tpwgKFW/sa5teMLQ6XjSjPLoTei3qjHYiPG
+aW5XK+EzlbaOKetWdjAkNEsAAN4rmHpKuVnqxvzG9vvoK8+pD/eRrNBcTnPPlWkZ
++fzsMOCvORzrvxrbFGMzD8//qRHRNlI=
 -----END CERTIFICATE-----

lib/hx509/data/test-ke-only.key

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQFnb3TH/DSeG5wpkaan7txqGflt7kVZL2swHHf6jRxKQ3APWAGz
-/95c5YfAbq2vw8PJ07TicoazULLXyyitZkZAQbK6sijEOEjrfVo571cpvgVxr6xd
-xd9BpJG3cA5O8Lqbk2Xk8mK9xgtvYKiRwStPVXGyvs4dzR/0A9/nqWqVWwIDAQAB
-AoGBAU+qa6HzquPYnv7HEZ8U12ySszhxYvwF55D3lSg8LaZA0l7R7k0971hL1nnk
-InnZVXefKPasw5SkEVCrXmKI96Hhl2OBbS3PbiYbkL8W6ynJK41oK8mz6eKMv+sZ
-gNBcHvDbhkYa6795h/HjekDLMNJLCysO9O0pLqUi25YP6U8JAkEBsRw51tIb1B3B
-J0ad4wOrnGodOtxgd17zziAnBePlwhE7RaM+ANBVh3SjoKWi3/IrPD20s9cTkE6g
-0Zqs/Z0dNQJBANRz5gxDChlWpcSJYLZbIKcTCPuk7ZWxtqsnYfzvtLDDITmj+h0Y
-NY1Mm6RSGqNtmHKkWsIfH4+gGsj2ENlwik8CQBtrUwoTkSlznMfUw6gckl+7pBAW
-5ZCJFVxGUtIfpGsN1jfJZuJ8Tf3eV4GTGuWcmjodGfSMuDNZlvrOFQeVS8UCQAMG
-R18jUTB9KEz8+7B86aEXR0h116AK8KPNIrr8GqFtlbqBWB0z7Ac/8PNM6+4psELp
-jhU3ZjagO+Fih2jhDkcCQQExIHyQkQ7ypO3N9yyKgAKp7duihgUeaaVpALQxsjAk
-y+ZXV+XRfOWHizI8alQHquXRmf1fDE98VqeGdlhI1J3K
+MIICWwIBAAKBgQC+MyimKnXnLOO6VN/dBiZ/gRNqkdgd8tv5BiltBJpKcJHk3Cpg
+C8MpCkSP/oBCqj/ZMuIsnw7X1SWyzVvJPT+RzNege9CJmSM/CHjjETixNXiAUM4V
+iJzJq98JGKzHVe7/iOT5Eu771IZoDhN0od+IvQRWwiMG6xd6JLylo+CumQIDAQAB
+AoGANBvKADRT1wEKZwtHxcMgmwAe9Kx+XD4kHAafJNoE92392oijJ2sxjbXdcOHV
+++2uzm/NXVI6e9FOobz3b5vTJUIGwh44hhGOXX5tCxZWO7pLVmBnK8VUfrprmaGC
+ZFKKqpXLErDXSZxA1gpbQsz2NMGhVzwR3WMUeNzulY8PowECQQD4qMG6hrL35/x2
++aydV3R3mAOqoiH9YH3yw4MzJNfQf8o1oQAfOnYbsQQ5BHZmRLP4u81KRA5TfOnd
+0uIymuThAkEAw9CYVfIw8CDaj2hZm200sVfjEStOqKVN3Oso3Mpk2aQ7Q6TOFG1i
+J7mRlUAUqEOQD3a0tN1eH43132/64dJIuQJAeX5S8aUgypnRs/v3yATUBh8DI5sG
+Snub7kJy10lYHSpjDWL14Uw6KvuJmaZBh2RoHs771h58dXRh/B0uohUmYQJAPvEs
+JmRFSsqktngqZYWC7IZ9nKU5EYihMKP+bIo6RKM/0YyGGZbXeEF0BG+mtDeTdQUJ
+LSIDAU2WfQ33rOL1MQJAX7rW0vtkLoaAKO1wA1/NZasZY+LXTbt5sHkkrpRznrHm
+TIiriBRGtVHg1J2Mv7cGe4RvN92adZFumHnILQZ+zg==
 -----END RSA PRIVATE KEY-----

lib/hx509/data/test.crt

@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB9DCCAV2gAwIBAgIJAIq/kJ6AbVX+MA0GCSqGSIb3DQEBBAUAMCoxGzAZBgNV
-BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI1MjAy
-MzU5WhcNMTUwNzIzMjAyMzU5WjAyMSMwIQYDVQQDDBpUZXN0IGNlcnQgRGlnaXRh
-bFNpZ25hdHVyZTELMAkGA1UEBhMCU0UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAL1HJ/Sny1GEKQazrI+oC0RqhEGyDLOvvYZExZ3aJiJfabkYjASsZjZ8RgB4
-CSE4e0iDESZUWMG0f9/ylMaygYQHyKBA73S+6xa5Q0Mj+ssqmrbIbqglEJBy7kAo
-zwPnysKHo0JLJfIwetOlK0bUqR6+L15q4bDqtmOoEKZDF0fnAgMBAAGjGjAYMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgbAMA0GCSqGSIb3DQEBBAUAA4GBAHFn4U2QLMAK
-xJJFQr+fT5gFSyJWZlmxwHapjxBTdFIPlWTVapxj3uCmiWyxOESFj8z2VTbwWIlC
-nHQAAmwBSZyM4PRMOiU1UI4ieuCb2iQ+osgpkn/vSCubIB3cZT4iMxJjDXLwCMnN
-ygmnBl69S8sJvbzMXWR46A56O9oSjvML
+MIIB4zCCAUygAwIBAgIJALVp8kub/fs7MA0GCSqGSIb3DQEBBAUAMCoxGzAZBgNV
+BAMMEmh4NTA5IFRlc3QgUm9vdCBDQTELMAkGA1UEBhMCU0UwHhcNMDUwNzI3MTg1
+MzMzWhcNMTUwNzI1MTg1MzMzWjAhMRIwEAYDVQQDDAlUZXN0IGNlcnQxCzAJBgNV
+BAYTAlNFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDM3b2EMYGRiwhGPlqJ
+fg/ZTcQyNqw4HBW0w9DVQvapgw1AxPo+VcZdAcL778WB/lunODg8rYVOuJGnNx3m
+iIfv2qn8y8JWDtx4xzN7TOKhx0J10zJ/iz2Yfg5CNPgV4kJca34fpYXv9B+1lMZy
+cjcezFNbOvVr3uHYEi/dQQEGbQIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQE
+AwIF4DANBgkqhkiG9w0BAQQFAAOBgQA03TpR/zxVKM1P9in9TtyGDhK0YToKCepQ
+s5KTrYXRFyCP1nT13OcY01sZxS6KhXcwkTNTCKvU9h2V6Al2BCQpBBtI8Tz6JPO5
+JUzkW6PMNd0zAv4hH0TQhk0ibEWr+HvbMVCyEDAHOlHip30IP8L9UUTnGaXKw9H/
+IjZkp54/PA==
 -----END CERTIFICATE-----

lib/hx509/data/test.key

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC9Ryf0p8tRhCkGs6yPqAtEaoRBsgyzr72GRMWd2iYiX2m5GIwE
-rGY2fEYAeAkhOHtIgxEmVFjBtH/f8pTGsoGEB8igQO90vusWuUNDI/rLKpq2yG6o
-JRCQcu5AKM8D58rCh6NCSyXyMHrTpStG1Kkevi9eauGw6rZjqBCmQxdH5wIDAQAB
-AoGADiPiuERQzCYzamzB13mWXeYXO1Ex4bqfTgiVOtWxQ6AdJdbPnwnCGQ/vqtlM
-1U6C50fjYBmtB8uUQga9Vpq/UhzXbu3BtQa68PEP+zIkdw9vqd+ud/3DgPWK3FJe
-t3jCOudZu/asGLfqq9L7RCo1IkBcN86g0ZIME4YmTrlpxAECQQDloT1og4bobEEO
-PQs+2EX3tyiZAttUDcDfpnszG7fn/K9NqUFcbKIwvnXM9JsOGkjzC5VxwPhie0Fj
-kSx17zKxAkEA0wOiJ92PsoX2gSVeRIZuaBRtl49fay5hge4n0tKSuC/EFcKdWw+D
-qI1SQUEsU3UV7K8SBuYl+iG+mHsJth/aFwJAD4vkEXBeMNwrZ2Bgo4eW7Rd8ayeT
-W9R2i23FB4fH4q/r2nEsGKrOLEioxxCEcub6q2HMY2AyMNCxc6E/hliEcQJBAMu7
-+lhbR16qkTJoDfhDg13iO13WA97MTUDR3Ilk3lwPYldQK/W7qPaYXA69CjsaFS0M
-a29Vzt0Or6MxSFMbtckCQH2UHSjCXfdueFK7XKRVA6pVu77/1Yey2BOLFEzIh9EG
-+T0vYVwZUQQP7LFF/Pc97B23Lp2EYad5ZPjJ391YAys=
+MIICXAIBAAKBgQDM3b2EMYGRiwhGPlqJfg/ZTcQyNqw4HBW0w9DVQvapgw1AxPo+
+VcZdAcL778WB/lunODg8rYVOuJGnNx3miIfv2qn8y8JWDtx4xzN7TOKhx0J10zJ/
+iz2Yfg5CNPgV4kJca34fpYXv9B+1lMZycjcezFNbOvVr3uHYEi/dQQEGbQIDAQAB
+AoGARg/reWMo6ap/uO4oLm9jYjC7UWTrPwEz1y9EozqUeuJrzOPQpTLWdQZeNaUJ
+ieyAUc7jRLUfKw3qGiK6YhX9TshkO1DhvSjpalEMyK8Fg9s+GzqvgdM6L7pLKxIZ
+elI9suRUKi0qS4cEr6O88CRHeDsuaQ1bynuPvBm1rPcOow0CQQDsYX/NhZu74gOW
+WrIB4WypkCRow5DsaQZIH+NS0VnqtY+lTqimonTbEJEuPF7t5pH+ACfm2oPnP8wt
+c/VZzd0XAkEA3d6iDldujhGkRzW34HJ4B0xtzTmHWKRzdRKkf0D9DWw8AxwB6r8P
+TjEL4luoqX9c3FIre/sb96dCO+ipJ24TGwJAP1FinZfjfnFtSpIiypQqukTtK87u
+/BSp5Rn9l4qSjmdyAfLPBEvSB3gpm3v6Zbl0c9hw18rCuGgDdk1wdEzLowJBANyG
+kSUYGjbzqglth1p77Hm0qd62M6UTr/7JjN8/RUa2MeAVUoJ1bU0Wyu0ulbIDedUz
+hy0wJlg900OguaELc8kCQAp3eP5b7NmvEOZaRi+U0M60ENK9SKCGDGBHv40sS7Zw
+gW/rcbCSkdTLYiLeA+xeiImtRYQDh0BX0XFYdiG7NAw=
 -----END RSA PRIVATE KEY-----