From c97700250f10c0748c91e00a873781cc43949122 Mon Sep 17 00:00:00 2001
From: Joni Hahkala <joni.hahkala@cern.ch>
Date: Wed, 18 Nov 2009 20:11:13 +0000
Subject: [PATCH] regenerated with new scripts

---
 test/big-ca/big.cert         |  82 +++++++++++++++---------
 test/big-ca/big.p12          | Bin 4085 -> 7621 bytes
 test/big-ca/big.priv         | 146 ++++++++++++++++++++++++++++---------------
 test/big-ca/index.txt        |  20 ------
 test/big-ca/req_conf.cnf     |  99 +++++++++++++++++++++++------
 test/big-ca/serial.txt       |   2 +-
 test/expired-ca/expired.cert |  29 +++++----
 test/expired-ca/expired.p12  | Bin 1573 -> 1797 bytes
 test/expired-ca/expired.priv |  26 ++++----
 test/expired-ca/index.txt    |  20 ------
 test/expired-ca/req_conf.cnf |  99 +++++++++++++++++++++++------
 test/expired-ca/serial.txt   |   2 +-
 test/fake-ca/fake.cert       |  29 +++++----
 test/fake-ca/fake.p12        | Bin 1565 -> 1789 bytes
 test/fake-ca/fake.priv       |  26 ++++----
 test/fake-ca/index.txt       |  20 ------
 test/fake-ca/req_conf.cnf    |  99 +++++++++++++++++++++++------
 test/fake-ca/serial.txt      |   2 +-
 test/trusted-ca/index.txt    |  24 -------
 test/trusted-ca/req_conf.cnf |  99 +++++++++++++++++++++++------
 test/trusted-ca/serial.txt   |   2 +-
 test/trusted-ca/trusted.cert |  29 +++++----
 test/trusted-ca/trusted.p12  | Bin 1573 -> 1797 bytes
 test/trusted-ca/trusted.priv |  26 ++++----
 24 files changed, 561 insertions(+), 320 deletions(-)

diff --git a/test/big-ca/big.cert b/test/big-ca/big.cert
index fd6966f..21f751d 100644
--- a/test/big-ca/big.cert
+++ b/test/big-ca/big.cert
@@ -1,30 +1,56 @@
 -----BEGIN CERTIFICATE-----
-MIIFJjCCAw4CAQAwDQYJKoZIhvcNAQEEBQAwWTELMAkGA1UEBhMCVUcxDzANBgNV
-BAcTBlRyb3BpYzEPMA0GA1UEChMGVXRvcGlhMRMwEQYDVQQLEwpSZWxheGF0aW9u
-MRMwEQYDVQQDEwp0aGUgYmlnIENBMB4XDTA0MTAyODAyNDkzM1oXDTMyMDMxNTAy
-NDkzM1owWTELMAkGA1UEBhMCVUcxDzANBgNVBAcTBlRyb3BpYzEPMA0GA1UEChMG
-VXRvcGlhMRMwEQYDVQQLEwpSZWxheGF0aW9uMRMwEQYDVQQDEwp0aGUgYmlnIENB
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0at2yBttsEeI260DTGQb
-89KzAUaCBTlPTqlR586cDb7QwgSrKbf/1h43/c2DJv2YQ15dbnOEhom6ejWKNhBv
-GHZArbj5Cq/x6U7VzJ9Pgzd8QbaZn0Q5evx78jzy2z5GpoG4/JMe1AN9aWqMh0hZ
-lkrHYF94lauf2hshLz4XHzvn72VZxJAzUntQy+XI8tcEZp1A2j7+J7hhzaBncc7y
-wu+vbN+7xhMdiina3IRuMBd5hoJJAnV9z8wh1oCtWcMFPSSHL0yMv6cNlt/Af7f4
-rSEHHvUDAUXhuVsVLFg1rOBoeiEhpECtXtS1jralkefPXdjPg1XP/TgFXeAlcANn
-TdHVLLiFNh9Vw1RfU4OHEyvsIBAGltSAD5IEUZc7yr+M8CwX3jGDIGYgAhKZJ9qS
-FaQV+S8qbf+mSvzyi9CeEKxFKyc3iS2rZ0UuuzhD6jo/Ql0wJ16abKJuYewhPYNG
-/A43u719D9a1l2zNE+yLq+5OJgAOHauZQf57AFq0wImUi3l/tHhpLWZJk0pgthHg
-6SpSyMYJ+tI3lk/NTy9BaSndTt334FtWIo9obLk8SNfzOxnkw2ehSixUSH1RpN9C
-5VhpaWrxaoT2FUwsGWL94RWXpHQFfDaYEkYOFS+PYAOWsmEPFCdcqoUiGUAVnGNu
-MpcZqGUKxTyiX7WjPU5woEkCAwEAATANBgkqhkiG9w0BAQQFAAOCAgEAD94Cf9Pi
-HTCY/S+UBcNZCS4KYxhpnjPzSpG2E5HVysCOqJ+iEqQ3gW7avcvsya1tm9jTkBNN
-RqpadY0WxIDV0ga+6768y17a34UnX9XGtq+Md5SkGiDA131pljO6dM1yECK/sngb
-ilpWGrTFfWIzW8zme3y2zZtQHpXWdKc7qZrr4MTIPygScs87brOYMJT7lmGWnPPC
-Pcqxwew3RijmYsIO/i2vzOs9xNMEBEpLbC46IE5F9xcG9IK/m+0MCXawZLVm/weh
-G9o0QYcJFKZuCqgDhwncuq1fM1PGDB0Jkrz/uaQuVJMc2PCCdmi96svLtME2nbQZ
-Rsal0AQ0EwJ5vj8rJOFeWnwOQ4MhIj+OODFoWA/oUh3po61MJeSyrRtgDCv1LMUR
-VgD+uGsbLnWbtOMakSMzTRT4aH+KiV77vu/rYX3WClng7KdJzoygG9IXQWhSBV82
-RMAOjdWv2IYB0jVic8bT1FCIsoozEfsUu6bo9TH82sKOjkxGK3on/L32sRwyiFS9
-K33s76FbeNi54Rky1W935xTQD/PmkcmiKPQ4Sfz8rsd9SfxBPcWbyTbD72Uf7dU3
-VceUhLaE5SYdgHlVHUDWvF85Fe6MNXksLS2HWamcZX0I/nrTT2WFosKXbD7DCx53
-/owoCRg1v6ejCn2amEw3rKBywrOk7QRyTiY=
+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
+tOEKBYEvhpvq0ZQgcaUWPVE7eP3I
 -----END CERTIFICATE-----
diff --git a/test/big-ca/big.p12 b/test/big-ca/big.p12
index 2c62e0c5b9888d79f6f031411653c36d3290952a..e554dea3c8e65a2b3278758855e80df3a728cc02 100644
GIT binary patch
literal 7621
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

literal 4085
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

diff --git a/test/big-ca/big.priv b/test/big-ca/big.priv
index 93e9cbb..c0ff3dd 100644
--- a/test/big-ca/big.priv
+++ b/test/big-ca/big.priv
@@ -1,51 +1,99 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIJKgIBAAKCAgEA0at2yBttsEeI260DTGQb89KzAUaCBTlPTqlR586cDb7QwgSr
-Kbf/1h43/c2DJv2YQ15dbnOEhom6ejWKNhBvGHZArbj5Cq/x6U7VzJ9Pgzd8QbaZ
-n0Q5evx78jzy2z5GpoG4/JMe1AN9aWqMh0hZlkrHYF94lauf2hshLz4XHzvn72VZ
-xJAzUntQy+XI8tcEZp1A2j7+J7hhzaBncc7ywu+vbN+7xhMdiina3IRuMBd5hoJJ
-AnV9z8wh1oCtWcMFPSSHL0yMv6cNlt/Af7f4rSEHHvUDAUXhuVsVLFg1rOBoeiEh
-pECtXtS1jralkefPXdjPg1XP/TgFXeAlcANnTdHVLLiFNh9Vw1RfU4OHEyvsIBAG
-ltSAD5IEUZc7yr+M8CwX3jGDIGYgAhKZJ9qSFaQV+S8qbf+mSvzyi9CeEKxFKyc3
-iS2rZ0UuuzhD6jo/Ql0wJ16abKJuYewhPYNG/A43u719D9a1l2zNE+yLq+5OJgAO
-HauZQf57AFq0wImUi3l/tHhpLWZJk0pgthHg6SpSyMYJ+tI3lk/NTy9BaSndTt33
-4FtWIo9obLk8SNfzOxnkw2ehSixUSH1RpN9C5VhpaWrxaoT2FUwsGWL94RWXpHQF
-fDaYEkYOFS+PYAOWsmEPFCdcqoUiGUAVnGNuMpcZqGUKxTyiX7WjPU5woEkCAwEA
-AQKCAgB7Y5S7nqimnPKFlQPj6OYqT0zY602JFXj+qdZxvL1JuYnRJD42hvogYBhD
-XLZaM9NvkhEZ9xF+u37qfKehuXonwy+9DKZDC9gpnSNlEDwS1Ixjf7pYaCYLopqu
-q/+f1r5tLtpWiZ4S1xru9q1Mz98o+0jqBkVIj3+7M0wMKVYiI3cTA2oYq2QInlmm
-JMxlXPRSDykjRv77ER89i7BU4Z0r6zIpuGEg6A7ySD9sluLhmm8CIZolwE8SAufG
-/GMH+CUVHnIP+9S41O7CY1s9zl6iRFWUekwSa7WzB08mkaLE4iuZ8/WAXC+rJzLR
-kdtOSkVWzUkR2WZVdqpx3H8rtFUN/gcX/Eb/rWosaKJxZBEWQUbfkG36m3faYMB3
-IsioZUtCgTuz60hx7ko2tRPiNLOJv4uiyP/uNJVrIG5eAMs/tZTK8Vgy8anUXqwu
-VwiUGFG0OrnWNz5g4Mqxnz8v1PuI/WjlB87ZZjMqaBbHsGRGVOHhyv7imdcfokHp
-Zfg9uwYyuzXzHJfMNVr3avkE0xwNRrJFGEtBPL8iyhKLqsw5CNi64kbAgA81Zjy0
-w9gpqNCrknn+M1Hmd3CtQdOmOjXiVmDGaKTuLsfIbgKWq0NxfrXqVmycEoJxF0so
-92UcSaB/w2BbZK2/nxlQiFXyM2qATSm8lGplFLL0Rhk7WLdVIQKCAQEA8cc89d4T
-2y4/34QEjK2VYohQpMUHgiezSTIxRWN/qi+UgyInfIsTkKrLRny+OL8SI+SQjZA0
-smxfjtHbOSk3D/RpHb0t654ym1crQVo1aV03saaGWbbZayicxvrBghvt+AskICev
-rzNpARx9gc+t9MQUCERNGwuLPhZp2RYyfQx1Y3haTOFpOrgS/GurgsGTlBAHIbF0
-XjFpDvBCEBFgr+IR5cEmOJpsubBtlgd+YnHJOyf/LHFKVZ34ewu6YsVY5/TVFWMB
-14/p77QJ3A3BzTwd9x3nEtjBh6xzI2GqBego3l6610aHcbCvQc0stJVpLpnucBo+
-5nFYs0HGmyVzjwKCAQEA3gC6Q+hQznhfzpriK4/78GKVVMHwHX5J9elHbv+sUzP+
-YoG09hhNCpWgJ4ijIvsdf/HiagpuepqDJ3C5MxZTrzCFrGyTKTjC+Ii6KJHNqUjD
-D3yPVEwu6eFyPdZBP0YmZo5+i9ZnLumQosz/gmQeTjvqDoLVqFTVOOwGO01/h9vy
-mu+gkKsgUcDjgsowqH+1yapiajKnbc8PnW+tnFjy1KqNjpXCbWUsKS33l/FQ53+B
-CTv9+EeQehwTdQS1IkwwA+Vwv0IcSx9kFnY5Yoy9FaZkDLWLeylVkHlQd6rzpkyA
-4eXvm79yls8ImFbPTxMRJl/oReznaU7B6vrPUCLipwKCAQEAi94/1NiRUhXSW6LK
-4vs0VVkYlglpi5Ed9bU0rbiezTxTRP1ILJNkUSeNCwz1GmzmuJ7sRQjsg1+QdFXQ
-5aODOBajjNG5M/pDunvWCSt/hKGpq3rzdAkEhCptb+r2cSdpJjqDvppW1xr9nuf1
-b1hOgS/BivrARGoMNnHO8AgYUyEW8+FXE+y+7Ho6eY5sHOuRTXFsPsCi2i7pYPv6
-q8Lx1S4KPojbbJlhVpbK/qT9J0Q+Lpu30eUEJL2LVtt1Ctix0xZfAs1Q7nxR0Bqu
-LYBD4k/p4eCJoeyFINDRluFT87DXm7Tfj9Q8XLfi20UvnJRm0c+5EV8NjlB6CNF/
-bJdg3wKCAQEAjM5LVczgi8Q/iAwmjVi6g+ITMvn68Mnr4SP/ocBaLT+aBiKcg0Yw
-fxkdxlVcm1BIiqEBaR6KqgqcSwStAmET3NbawdzvjcKprvcRk6++kLNMvOLVCbN0
-QfUy/1OIeLhmnL+eNdVcBp4vlYKOQMZ9jkNkFaYYG7cKshrJbQ2faK0xd+GqpndT
-fWbpJkhVilnOFEWUPCU6mmQtVD7ED5k/E3HFbP1Bnx7/XnMASgfNt7bgQdoiIDpL
-wZdTI/JDbKiD/8SjuTsWNPOJCNIdXYtEVpn9dS4kdI5n7cV0KyJrfTuitySez9si
-s9JGclEFFfNS+lL0QH2c3OcOCZrgqMQnmwKCAQEAuH+JNOzs30ymqUCNG8BdHW8I
-sJYglt1SSNQrp3nFtqfBgk4LaoIwA95WwTD2mbs3o16eFCJ3w6wX38oPt8TdP7ZH
-pZRBKFNG7eRjuqhUJG904RI7wk5MLKAH4YEkL7tpsGQZIiYbaadI5S9GzDgyrl7O
-lrqMJNx+4Y9vgN5BPBxATIQDVgs78pbUANab91xnm8l0JpUlFsx5mrJQfqc0dipn
-U5vwBg4jzg5UuP3CemS8F0KfKrjDqbiYuTeazqWhnTemjeXyzqTmUaY6r4QJJvk9
-DGT6qHCkkPQ+V13YXDZKUkq7yVSblVvOnG+W/R2DJsuECpYQaHdiZEjeuf1EZQ==
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/big-ca/index.txt b/test/big-ca/index.txt
index ef6959d..e69de29 100644
--- a/test/big-ca/index.txt
+++ b/test/big-ca/index.txt
@@ -1,20 +0,0 @@
-V	370320130914Z		123456	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big client
-V	370320130915Z		12345A	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big client serial/serialNumber=12341324
-V	370320130915Z		12345E	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big client email/emailAddress=test@home.org
-V	370320130916Z		123462	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big client UID/UID=testuserid
-V	370320130916Z		123466	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big flag client
-V	370320130918Z		12346A	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big bigclient
-V	370320130919Z		12346E	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big server
-V	370320130919Z		123472	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=xxx.foo.bar
-V	370320130919Z		123473	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big clientserver
-V	370320130920Z		123477	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big none
-V	091101130920Z		12347B	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big client expired
-V	091101130920Z		12347D	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big flag client expired
-V	091101130921Z		12347F	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big flag server expired
-V	091101130921Z		123481	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big clientserver expired
-V	091101130921Z		123483	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big none expired
-R	370320130922Z	091102130922Z	123485	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big client revoked
-R	370320130922Z	091102130922Z	123487	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big flag client revoked
-R	370320130922Z	091102130922Z	123489	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big server revoked
-R	370320130922Z	091102130923Z	12348B	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big clientserver revoked
-R	370320130923Z	091102130923Z	12348D	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=big none revoked
diff --git a/test/big-ca/req_conf.cnf b/test/big-ca/req_conf.cnf
index 7c30db9..2262038 100644
--- a/test/big-ca/req_conf.cnf
+++ b/test/big-ca/req_conf.cnf
@@ -1,33 +1,92 @@
+### req command
+
 [ req ]
-default_bits           = $ENV::BITS
-default_keyfile        = keyfile.pem
-distinguished_name     = req_distinguished_name
-attributes             = req_attributes
-prompt                 = no
-output_password        = $ENV::PASSWORD
-ca_cert		           = CA_cert
+default_bits		= 1024
+distinguished_name	= req_distinguished_name
 
 [ req_distinguished_name ]
-countryName                    = UG
 
-#stateOrProvinceName	       = South area
+[ ca_cert_req ]
+basicConstraints	= CA:true
+subjectKeyIdentifier	= hash
+authorityKeyIdentifier	= keyid:always,issuer:always
+keyUsage		= cRLSign, keyCertSign
+
+#[ serial_cert_req ]
+#serialNumber		= 12341324
+
+#[ email_cert_req ]
+#emailAddress		= test@home.org
+
+#[ uid_cert_req ]
+#userId			= testuserid
+
+[ proxy_cert_req ]
+
+[ proxy_proxy_cert_req ]
+
+#### ca command
 
-localityName                   = Tropic
+[ca]
+default_ca 		= CA_default
 
-organizationName		       = Utopia
+[CA_default]
+dir 			= $ENV::CASROOT/$ENV::CATYPE-ca
+database 		= $dir/index.txt
+serial 			= $dir/serial.txt
+default_md 		= sha1
 
-organizationalUnitName         = Relaxation
+certificate 		= $dir/$ENV::CATYPE.cert
+private_key 		= $dir/$ENV::CATYPE.priv
 
-commonName                     = $ENV::CN
+policy = policy_any
 
-#emailAddress                   = Email Address
+[policy_any]
+countryName		= supplied
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+userId			= optional
+serialNumber		= optional
 
-[ req_attributes ]
-#challengePassword              = $ENV::PASSWORD
+[ ca_cert ]
+basicConstraints	= CA:TRUE
 
-[ CA_cert ]
-basicConstraints = CA:true
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid:always,issuer:always
+
+[ ca_server ]
+# This is OK for an SSL server.
+nsCertType		= server
+nsComment		= "OpenSSL Generated Server Certificate"
+# For an object signing certificate this would be used.
+# nsCertType 		= objsign
+
+[ ca_altname ]
+# This is OK for an SSL server.
+nsCertType			= server
+nsComment			= "OpenSSL Generated Server Certificate"
+subjectAltName = DNS:*.hoo.org,DNS:joo.haa.org,IP:123.124.220.1,DNS:g*a.e*.com
+
+[ ca_client ]
+# For normal client use this is typical
+nsCertType 		= client, email
+nsComment		= "OpenSSL Generated Client Certificate"
+
+[ ca_clientserver ]
+# For normal client use this is typical
+nsCertType 		= server, client, email
+nsComment		= "OpenSSL Generated Client Server Certificate"
+
+[ ca_fclient ]
+# This is typical in keyUsage for a client certificate.
+keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment
+nsComment		= "OpenSSL Generated Client Certificate with key usage"
+
+[ ca_none ]
+nsComment		= "OpenSSL Generated Client Certificate without Flags"
 
 [ proxy_none ]
+keyUsage		= critical,digitalSignature,keyEncipherment
+
diff --git a/test/big-ca/serial.txt b/test/big-ca/serial.txt
index 02092c1..3dcc795 100644
--- a/test/big-ca/serial.txt
+++ b/test/big-ca/serial.txt
@@ -1 +1 @@
-123490
+0176
diff --git a/test/expired-ca/expired.cert b/test/expired-ca/expired.cert
index a4c6feb..45be69b 100644
--- a/test/expired-ca/expired.cert
+++ b/test/expired-ca/expired.cert
@@ -1,14 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIICKTCCAZICAQAwDQYJKoZIhvcNAQEEBQAwXTELMAkGA1UEBhMCVUcxDzANBgNV
-BAcTBlRyb3BpYzEPMA0GA1UEChMGVXRvcGlhMRMwEQYDVQQLEwpSZWxheGF0aW9u
-MRcwFQYDVQQDEw50aGUgZXhwaXJlZCBDQTAeFw0wNDEwMjgwMjQ5MzNaFw0wNDEw
-MjcwMjQ5MzNaMF0xCzAJBgNVBAYTAlVHMQ8wDQYDVQQHEwZUcm9waWMxDzANBgNV
-BAoTBlV0b3BpYTETMBEGA1UECxMKUmVsYXhhdGlvbjEXMBUGA1UEAxMOdGhlIGV4
-cGlyZWQgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDalz1sD+Ds5CR1
-AvST5CUKoOUoKBfnaqbYhGivGv9QK34ynYYONoBZcZGjIh/9D7n5l/lxq8NZ+4HV
-GU6fDOT7mBALiiM3tyKztpD7rBxLCZ3PxsNeHxP3J5obXz44XaSBxgk3FEfX0DJJ
-D4Fv7Res5FTRWUTmK+RZ8jSTflnzAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAOaoU
-J+ZWcteYj09ntn58OnjbL4jRW5TYE4+vfrja9cUuKiOdjqWfHdi8fY5C58tUqFnk
-iFKPzqEienR4apchZjoqWPVA2coaRAm6wwAvkePrv0hk+cuTNCVAFGo2i3PGbRo/
-BfpZaDcEgwpYn5PzLNwTEB2bK2QRbsNKX1JtR5M=
+MIIDCDCCAnGgAwIBAgIJAJO9tXDLWAPpMA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNV
+BAYTAlVHMQ8wDQYDVQQHEwZUcm9waWMxDzANBgNVBAoTBlV0b3BpYTETMBEGA1UE
+CxMKUmVsYXhhdGlvbjEXMBUGA1UEAxMOdGhlIGV4cGlyZWQgQ0EwHhcNMDkxMTE4
+MjAwOTU3WhcNMDkxMTE3MjAwOTU3WjBdMQswCQYDVQQGEwJVRzEPMA0GA1UEBxMG
+VHJvcGljMQ8wDQYDVQQKEwZVdG9waWExEzARBgNVBAsTClJlbGF4YXRpb24xFzAV
+BgNVBAMTDnRoZSBleHBpcmVkIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQC1CZ0a6cakhd8Ql58VXnzy23ToUOp77bRTmR1M1iwiy8+h4faW+B2Gm4oGJrhD
+oYp7cEVpnrlQuWQdYs+sT01GZmdzCfQ4fznc0VTMsGtpavWVOo5cZYUVfz48zu0B
+bgB7W08EL88uGMBubaFDLB5Rb/yHkP+5fmis+ugKpdiffQIDAQABo4HPMIHMMAwG
+A1UdEwQFMAMBAf8wHQYDVR0OBBYEFBTlEzymeVaSezNLUZA1dHU0E8wcMIGPBgNV
+HSMEgYcwgYSAFBTlEzymeVaSezNLUZA1dHU0E8wcoWGkXzBdMQswCQYDVQQGEwJV
+RzEPMA0GA1UEBxMGVHJvcGljMQ8wDQYDVQQKEwZVdG9waWExEzARBgNVBAsTClJl
+bGF4YXRpb24xFzAVBgNVBAMTDnRoZSBleHBpcmVkIENBggkAk721cMtYA+kwCwYD
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBABnlqhW3QU6WZcLsBMHjRn23ruQ8
+8CKYxN/LAl+7QraMQ1bE8rlqQLzKdnaFHq6R3P6adhnLgnyaAhYt3GozRBwsSJ1d
+K0EAmbl0Lk2rdRC+53lHOC++byK1pSZM4KkwVZt33z9WkR4gpb6wyQb527g7vSZK
+BLXE+M5wgxtjUXV2
 -----END CERTIFICATE-----
diff --git a/test/expired-ca/expired.p12 b/test/expired-ca/expired.p12
index 1b67c409ec4dfcca66f160416de9da6db67ffdd6..7716e8edd65a12a15fd1460aec45189db916a98a 100644
GIT binary patch
delta 1724
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
SpacjU=c;cHHiwP^0tf)QS2`^K

delta 1498
zcmV<01tt204y6o0FoFgl0s#Xsf(7RW2`Yw2hW8Bt2LYgh1=s|F1=KKt1<){p0?!5s
zDuzgg_YDCD2B3lhz%YUWyaE9LFoFWLkw6`PTy5m@Q#@wj0s;sCfPw;uCLz5y;4i$~
z0N@r3LRUB$S_|?hF)IHgkO9Ta0!+c7khKh1fYS>Sc?=`JqR9`201g$5!{;Vztsa7a
z0E+^qxI>_hw|=bWP<THx!<IBh9%xCv$Wm?!^JQK~jQm}rOe+4LRvCI16os-dH~SZV
z_<b1?7kZiS>~&Cz5)$aUNS?y6Ugi|9{~>^55M;sE0+T=-cE7xzbx_lW^LkA-@4GM(
zOD?ecfqQL+Rxn(PA$WNtZsB8L^uS<eLh&gi=G!|1e|=a)bQ*LQdkB|2Gy6<!BhoQ}
z-e~AlJ)e~N1=L_G-Wp5fg|6zhv#@P{G##p${sKDq-^FifpXJB#DR8!R$ou|gv)UBn
z;d3we?%0jd3WIYbsny@H9{so=*g&tTaWMo^>at$l;J>jJo=ls&yo~jp*I5{DU$GS5
zlCnBoG?j}>$h-RN=<F!3#JyNsW9<QKIqq|}y;gQ6Fj+2*d>aq;9My|CYPe>9$p1{j
zqQJYVnwy6KTfRO}ulUcG#IRB=Bb!3#tpyleJQRTAiUB%YKFwqBU53v>xz(4p@xKLU
z3Z+Cy?^AxDHwG^D%`^^x{Xkwv_HD<Eco6WCO92F_PGMKf{9B|W`CECK9)7vub@+%c
zsPzVJ;|t@KnOlz09|x$ub%P6k1-GS`6o>w?*>O5fYJ=Q*%%v>`G<Az#sNadn$01F(
z95qoMD`FE2@$J}||J?4C2+t*O$=m+XU@;kLL__4gfmeK?5_f*y%RRt!$vBq=^JVwr
zL=zdJ!HC(_tt;p=;4MC&DND8=pBdKL+-h|4eza!ornIuJ=2PvS)D{yR)}%dXg(Ie=
zuvhc;kzW56L2wwmux!o&YY==p=9AR}Mt_fbllmL1^N#`o2ml0v0)RE2vD_q^%YI-&
zzmXErZeEekd&vqap!LhKt>9aH)E2fST4_<+c9>ScJ?q>QYll4ipotY-pGrEuv-N_$
z?ML1^4(=1o6sM^X?&zdp;Cp)f61NqN8c<Z}c{da(`&Lv9B86y^oUfpi0W1fK_kUl-
zHQWWN>^*oy>xM@#R<@S+yIC18ym_%mi!UcOKaDMWZw(ot&LZ#IBqeYnb5{3Pl+L#&
z6GfH-`>|EnxbfEBF10z}^9xmZRwc>->mR*y?d{Tv{l98{r?toKT^avtY<d*{DXXIM
zd5M`n($-(}!OTwwqQ>E4QTS13O@Fwhok<Sg==^FU&>g0uzfFtvv6AdcA7M)kUa^D>
z2xsT9(G(pIUb-K!!Y2j%kGK_A;p;i(JuI;k`gJ!?tXi2uo9ruRM%8bzV@sm$ng}*Z
zM%9Xw#Tb}(&vdVJ&(m1Z9xr;b?Tp{{!VY48;|Ebl%ayrNxWFm?lEAP>>3^1m!Iq$v
z^GyV7GeX9zk}(>+6F`RHTqVn#F2fRAAh}|@<Kr&Z2&c?6RvCWjM+frg!jBGnNN;%^
z8p*A_nTLND&$8PAcE0UyF5|j9eye-d#sX=n4hJ}7%(0b6E@Xk7{c=LN2K-MLa{b@R
zyQkpRqH;<@q#@I@d@shZyMNv?Y6W)M#*JOKg0>DP(+VCmlJlT2oBLdL7W;J)oSm%>
zj4s~yJhL`qoOKlHGMoXjc|o_ap+KxKijGE84P~704evlgI~%H43TbQv%~kcsF`zhC
zOu5d5GqNSe+$$}-=6_koqB~dMz5qDXNXiF(Adbf%-Ej~@)f))=dv7erN;g$V2Ylij
z&W$Jc^XecUS$v=|B`_lf2`Yw2hW8Bt2^BFG1QhH0&j;0ZOplR&g{-2(Z1nhw%dIdm
zFd;Ar1_dh)0|FWa00b1;z%9hZ@x|0s=0=D?^=G)rXBesk2pGlnurolcW&#2T022|*
AQ~&?~

diff --git a/test/expired-ca/expired.priv b/test/expired-ca/expired.priv
index 8e4ec44..3563372 100644
--- a/test/expired-ca/expired.priv
+++ b/test/expired-ca/expired.priv
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCg2pc9bA/g7OQkdQL0k+QlCqDlKCgX52qm2IRorxr/UCt+Mp2G
-DjaAWXGRoyIf/Q+5+Zf5cavDWfuB1RlOnwzk+5gQC4ojN7cis7aQ+6wcSwmdz8bD
-Xh8T9yeaG18+OF2kgcYJNxRH19AySQ+Bb+0XrORU0VlE5ivkWfI0k35Z8wIDAQAB
-AoGABANQEJ04jDD8xBgTOczSvUXVm8Hzthz04TK3ovDzaHk0jJJwsZ57J5qTpcF/
-IXMryET80KFQWrBNAQEy/24iYS3uN5n7GBZUxkL+115t/Ol5d0CUXE9EM4rCmW6c
-O/K1NaUxvmwQto/zN0iZdzj1qMVUUyvopYAKkexiir5K8bkCQQDVm8fT/RtRiuR/
-sWOoGYrbHEmwLNjY+rvpGJg+v4X9fGAoFAF6a8RWrttvsLKreW+kYieDUtFkU6tg
-m6tw+VZ/AkEAwMamcbAXzZy6Px70coS8bERFPeF8+d3qTUryA9HkjL5zurYBMNDP
-zyOmuzDNcrz5xGIoQf9XX2McK9bAHldKjQJBAMCHvp8GHV9r7vRhMM/M5ekEIC7Y
-3UMFC+XXMzIrclu9hPXawlJTXA49YK/U9dW0iLoDdlXZib4B5BAZf3c+ZYUCQANH
-ne9TOqRx5S1LvobwQTBqXO83leO+Zc0Y2FM+T/AhEWD81bpZ4x84EQ8gPm6UTn+L
-1/l/eaIS0pjgV3Zsr8UCQQCas5CoE4zmN4qbdpi4QS8nrmNUZC1LdAH1TDqT7tPG
-QAnIxtPostO3tFOTcV7k6WDknahhff3CtN1GENRxXeCy
+MIICXAIBAAKBgQC1CZ0a6cakhd8Ql58VXnzy23ToUOp77bRTmR1M1iwiy8+h4faW
++B2Gm4oGJrhDoYp7cEVpnrlQuWQdYs+sT01GZmdzCfQ4fznc0VTMsGtpavWVOo5c
+ZYUVfz48zu0BbgB7W08EL88uGMBubaFDLB5Rb/yHkP+5fmis+ugKpdiffQIDAQAB
+AoGAbYlMkm0iMIeDaQGkUoSiKzsXaD0VMzim4/H/pW7ss30HuxYCYmPrUXeosoIY
++WqzZG6QwRA1Zh9V8OXJa6NryAkFjwIzrBpNKRXNFBnOGtJIRzmQtr97WeNTDv2o
+bPFDcdRMLhd3/VPC/8SEziy6TrOmmYM7HDBnpys3QfuZlU0CQQDhIWAJqHEUnTo+
+NRPQQW4b/ECh8rkbSBvQlInrft4zRmScvwv4CpO0Iump0fuXEb7BEFCIKh8F4hsW
+39i+peE3AkEAzdx5H7GRoAvohPIKRGsApSXn6Qfj3+aSfDCvdKR5VCXt6xOUR/jX
+B4l2fMBNvOEqnoQcX07+MynRtzYvrT0u6wJBAKOhcH5UkaxcAwNH7NjHVdK9a/TJ
+yMUNijn2XLBwC+zU0zgim/5zIZwibBdkaisJWM5Wn1H424eZKftcQ9t+Ec0CQCtA
+6co4+woPtnlIidO6T9ZjUojp+X0v6xNg/1yYuk1t8sFzybIdnMCep2Cq3yqSfOv1
+giicZljFrqS6I+ZYdqUCQHpcJQdZO4iRcmtJEA5zqVOjtx/l6+BBnd95ZuZ38Ph8
+mWzzAMCUZ2Fw8ZYsJIi3MmnKqEagzH6AnpgW0z/3ntk=
 -----END RSA PRIVATE KEY-----
diff --git a/test/expired-ca/index.txt b/test/expired-ca/index.txt
index 08bd49f..e69de29 100644
--- a/test/expired-ca/index.txt
+++ b/test/expired-ca/index.txt
@@ -1,20 +0,0 @@
-V	370320130923Z		123456	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired client
-V	370320130923Z		12345A	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired client serial/serialNumber=12341324
-V	370320130924Z		12345E	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired client email/emailAddress=test@home.org
-V	370320130924Z		123462	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired client UID/UID=testuserid
-V	370320130925Z		123466	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired flag client
-V	370320130928Z		12346A	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired bigclient
-V	370320130928Z		12346E	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired server
-V	370320130929Z		123472	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=xxx.foo.bar
-V	370320130929Z		123473	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired clientserver
-V	370320130930Z		123477	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired none
-V	091101130930Z		12347B	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired client expired
-V	091101130930Z		12347D	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired flag client expired
-V	091101130931Z		12347F	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired flag server expired
-V	091101130931Z		123481	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired clientserver expired
-V	091101130931Z		123483	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired none expired
-R	370320130931Z	091102130931Z	123485	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired client revoked
-R	370320130932Z	091102130932Z	123487	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired flag client revoked
-R	370320130932Z	091102130932Z	123489	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired server revoked
-R	370320130932Z	091102130932Z	12348B	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired clientserver revoked
-R	370320130932Z	091102130933Z	12348D	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=expired none revoked
diff --git a/test/expired-ca/req_conf.cnf b/test/expired-ca/req_conf.cnf
index 7c30db9..2262038 100644
--- a/test/expired-ca/req_conf.cnf
+++ b/test/expired-ca/req_conf.cnf
@@ -1,33 +1,92 @@
+### req command
+
 [ req ]
-default_bits           = $ENV::BITS
-default_keyfile        = keyfile.pem
-distinguished_name     = req_distinguished_name
-attributes             = req_attributes
-prompt                 = no
-output_password        = $ENV::PASSWORD
-ca_cert		           = CA_cert
+default_bits		= 1024
+distinguished_name	= req_distinguished_name
 
 [ req_distinguished_name ]
-countryName                    = UG
 
-#stateOrProvinceName	       = South area
+[ ca_cert_req ]
+basicConstraints	= CA:true
+subjectKeyIdentifier	= hash
+authorityKeyIdentifier	= keyid:always,issuer:always
+keyUsage		= cRLSign, keyCertSign
+
+#[ serial_cert_req ]
+#serialNumber		= 12341324
+
+#[ email_cert_req ]
+#emailAddress		= test@home.org
+
+#[ uid_cert_req ]
+#userId			= testuserid
+
+[ proxy_cert_req ]
+
+[ proxy_proxy_cert_req ]
+
+#### ca command
 
-localityName                   = Tropic
+[ca]
+default_ca 		= CA_default
 
-organizationName		       = Utopia
+[CA_default]
+dir 			= $ENV::CASROOT/$ENV::CATYPE-ca
+database 		= $dir/index.txt
+serial 			= $dir/serial.txt
+default_md 		= sha1
 
-organizationalUnitName         = Relaxation
+certificate 		= $dir/$ENV::CATYPE.cert
+private_key 		= $dir/$ENV::CATYPE.priv
 
-commonName                     = $ENV::CN
+policy = policy_any
 
-#emailAddress                   = Email Address
+[policy_any]
+countryName		= supplied
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+userId			= optional
+serialNumber		= optional
 
-[ req_attributes ]
-#challengePassword              = $ENV::PASSWORD
+[ ca_cert ]
+basicConstraints	= CA:TRUE
 
-[ CA_cert ]
-basicConstraints = CA:true
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid:always,issuer:always
+
+[ ca_server ]
+# This is OK for an SSL server.
+nsCertType		= server
+nsComment		= "OpenSSL Generated Server Certificate"
+# For an object signing certificate this would be used.
+# nsCertType 		= objsign
+
+[ ca_altname ]
+# This is OK for an SSL server.
+nsCertType			= server
+nsComment			= "OpenSSL Generated Server Certificate"
+subjectAltName = DNS:*.hoo.org,DNS:joo.haa.org,IP:123.124.220.1,DNS:g*a.e*.com
+
+[ ca_client ]
+# For normal client use this is typical
+nsCertType 		= client, email
+nsComment		= "OpenSSL Generated Client Certificate"
+
+[ ca_clientserver ]
+# For normal client use this is typical
+nsCertType 		= server, client, email
+nsComment		= "OpenSSL Generated Client Server Certificate"
+
+[ ca_fclient ]
+# This is typical in keyUsage for a client certificate.
+keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment
+nsComment		= "OpenSSL Generated Client Certificate with key usage"
+
+[ ca_none ]
+nsComment		= "OpenSSL Generated Client Certificate without Flags"
 
 [ proxy_none ]
+keyUsage		= critical,digitalSignature,keyEncipherment
+
diff --git a/test/expired-ca/serial.txt b/test/expired-ca/serial.txt
index 02092c1..3dcc795 100644
--- a/test/expired-ca/serial.txt
+++ b/test/expired-ca/serial.txt
@@ -1 +1 @@
-123490
+0176
diff --git a/test/fake-ca/fake.cert b/test/fake-ca/fake.cert
index b686366..7503541 100644
--- a/test/fake-ca/fake.cert
+++ b/test/fake-ca/fake.cert
@@ -1,14 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIICIzCCAYwCAQAwDQYJKoZIhvcNAQEEBQAwWjELMAkGA1UEBhMCVUcxDzANBgNV
-BAcTBlRyb3BpYzEPMA0GA1UEChMGVXRvcGlhMRMwEQYDVQQLEwpSZWxheGF0aW9u
-MRQwEgYDVQQDEwt0aGUgZmFrZSBDQTAeFw0wNDEwMjgwMjQ5MjNaFw0zMjAzMTUw
-MjQ5MjNaMFoxCzAJBgNVBAYTAlVHMQ8wDQYDVQQHEwZUcm9waWMxDzANBgNVBAoT
-BlV0b3BpYTETMBEGA1UECxMKUmVsYXhhdGlvbjEUMBIGA1UEAxMLdGhlIGZha2Ug
-Q0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN2cPdeBM7VJMfI9Gm6wCK6Z
-VTVU2MgLkx+SVAt0Q7j4+m/iO2VAFNa4IAVAX/DG71D/yqCmvjzmQkXrbnZ48VFJ
-GHQyIEq9uxGVSKefH1AP03+UOcO53KoyfXoRU9BVxV2Py9hHevVJ9+X352E4TXlm
-O5EQCF5dljjU4hH1O3TVAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAr9q34tLFrY4Z
-DD5JxlwuEzTnlC6x2Or7FL52Mup2uo8M8gXJXEReZmfjJi326ASQUEdsZD4adcCJ
-aUB85qWHaQy94uO1KR0uNPGZkyTWffoYf8Jv91mENSQ+TjQA18JKUFsuWsdOebk5
-CY48OtNkkt5rDVFqutHqphwOGGbC02w=
+MIIC/zCCAmigAwIBAgIJAJOODvhASivmMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
+BAYTAlVHMQ8wDQYDVQQHEwZUcm9waWMxDzANBgNVBAoTBlV0b3BpYTETMBEGA1UE
+CxMKUmVsYXhhdGlvbjEUMBIGA1UEAxMLdGhlIGZha2UgQ0EwHhcNMDkxMTE4MjAw
+OTMwWhcNMzcwNDA1MjAwOTMwWjBaMQswCQYDVQQGEwJVRzEPMA0GA1UEBxMGVHJv
+cGljMQ8wDQYDVQQKEwZVdG9waWExEzARBgNVBAsTClJlbGF4YXRpb24xFDASBgNV
+BAMTC3RoZSBmYWtlIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCzJg2Y
+4PEy7IHjJtnAUoHsJTFiwH3upubJ21J1xIwbuwCCvUrBpj/OzEzaPdxU6fzjPXD2
+wVDzE2vqLF6hvxyzUlLKXmuB10lOfly8vkMHO7T/P1pO4vrZIpzo3pGFgx3fw4E4
+ZCdlsbjV/yHjVpO6+pnWdpka+S7rOIKMJfjfMwIDAQABo4HMMIHJMAwGA1UdEwQF
+MAMBAf8wHQYDVR0OBBYEFGASma3GAhhYIPGOPve5MAxg7ce2MIGMBgNVHSMEgYQw
+gYGAFGASma3GAhhYIPGOPve5MAxg7ce2oV6kXDBaMQswCQYDVQQGEwJVRzEPMA0G
+A1UEBxMGVHJvcGljMQ8wDQYDVQQKEwZVdG9waWExEzARBgNVBAsTClJlbGF4YXRp
+b24xFDASBgNVBAMTC3RoZSBmYWtlIENBggkAk44O+EBKK+YwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4GBABt1ebIzQl2S2vu8nuGgssYpBHdUyTCiZNg6RFBx
+GRmxPvd7/F6Ag60/xbz3rKtpQqeDoZg/FtpBHlAbIuOc3+kGDl3UatNV1VVozC6q
+gocDvafELWoH0Xqmiv/WRoi7vzqsB7k387QkKCnYeahmQPS75pwE99A0HwhhaM/A
+T9ia
 -----END CERTIFICATE-----
diff --git a/test/fake-ca/fake.p12 b/test/fake-ca/fake.p12
index e4fe823b6a74e7501ad216c7c747b4212be97980..f0c2ed21042267152638fe1df2a3766aeb530040 100644
GIT binary patch
delta 1724
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
SiUbH#7;7+GPXUVp0tf)VVlt2b

delta 1490
zcmV;@1ugph4V?@?FoFgd0s#Xsf(73O2`Yw2hW8Bt2LYgh1<(Y71<Wvl1;{Xh0>=gk
zDuzgg_YDCD2B3lhxG;hOv;qMDFoFWDkw6`P=d3v&cx)4g0s;sCfPw;m3T55k-cU}D
zr40oVwIg7*bnsYPssmry#nj;r!@qHr&nZh4UzU~-r2M091oH6I=V#{P4SQ$!fw_PH
z1+=S!8#PEMB|I&ZZ)hNWTl1D6C6Kf#(G$ZNMbu0ivS*9Y>PxzQOgq?BX6eDZ!59#K
zYkBLxz|P@2RcewOEgSNIiU;wP$TozaJcT8rv`Wa5MShh)FGYo57I(pr>BX<_SVeuy
z3*XgFX7rvh$cQdnID_Cb`4^6~g46^Ofm#{|0v^(JO=)eU5A2L0PGf-*;stNyHM_)?
zIv6a3zAYZCwqzMs)=~Z*$b;~&ctjq5QjR}rXnY7PhN`}r6>m9q8hDtVr`H@w&8owt
zr<AA<wR_J#knpI?(7ZaxQr<R04>|QdudB7pqsgl1@}s}V$YM4|f&{uER~s7r2&TYd
zI)|8(C?`M~-Kt~+AlF1q7n9PAd~^gy(NDM8dzC+tdJ>=3E9%<?YCoOu^hOtd`Qlq9
zJj@OxNZ+#}{I-8r<`WO(GpAsLHjGzHMW%mB?q}{)Jm|p)*lr!x?X~g+nqN&zPfl>_
zuWZE(w%1xf1lAhrpm5j<INb43ae=syM7A)F_UHwEEC^@qZdP3Ebj=X0*ZjOzPQ1;T
zjEwIX)gcAB;Ntk2Wem=(n*Ke1xlSwh+r(4Ex+H;^mDT)^;(W|aQ*k>}2BaW5p^b|Q
z%t@KDZwC1xD#|V6ks0#|!49@RF~_LmJ0tYaK{H|lV633ks@ArAkc`hbN|2ow7yeW(
zESarE678cH{}E~2W}&|0KmK@cM>7TXTr1-d1r@*54)ng9!?ei70z5?(Cd3jW{c0Y0
zHgBNH>B3WU{=^Uox|7WVMt{3>uYCLF%R2%B2ml0v0)TpWD(EM$)}<feFXZLA<BRK(
z!r`suN3U&dFIuQI@U)KBiC&9W0|vcx8_WbCI}kqZUNHxF&#%V-Me|KDMZ%H#9IKB)
z<MlQxh5u2gJUwM&1<PFv<T58aeHieR!M=9{F;%Q(_#Od~q?^1H4u4P_8-Se@=pO>C
zF=J20XC{YTB{fnaN92BGV~DYgp{(Kj=62T9Rc>!XYXrFyBslP=ZSP~=+aH#vTcV}F
zJ!RNG_dr{M9PZJ^nvE$h)T<$-^@8Yfo8SirJ<`KbY9vDVbOBb+bw7js*B!i-z?<#B
zP^#EA&U!Xa!((tOWq$`Pj?`n~idrgIj*B%_3FsYrv1aT=L~pm8Zh8(6Wi-o`6HJCy
z%}XBTPX}GVfOCy?&k#!p>OAO^z5sbmkBD)Y5M0*h9QzFjQx~3(He(o&E+7wa8Kbmz
zVSRxRec$x<gge%L0eSq!TlX_(-|x)NVV0sDKz8F78ANuyWPkJ)Qkbq62yzJ9(P4c~
z)l&B(D~B^>qqa}vr6bAG#P)?y8q`~oBDAdUN)dk)oTLP@Db|ec;UTnaq*fK{?ql!1
zn;8_^iK@62GaTqm)RN;-NOCeD(y74kIHMwb9+ZEqlP9s1U~qm8PnRFfj-quV&+LIr
zyzx!zU4kAbL4OmRkC*n@4Gz;LGW=(5TaHP%%ObJe3N8se;_G%8Z?E6c6YqK>0}ap-
z-m*fH=gtLJ7};C+<fLX1@P1iW+?kIPPm_(yz{ucox(j0}m6jmn7=oS3ePk1RI`9lT
z1>FqV;4DHmbUWW4N((>9t~Du3Fa!8{$aLisSx%>Vv~RHu(pOo>?)zu8fpMOEf;1Ea
zI9$UqB`_lf2`Yw2hW8Bt2^BFG1Qb8uQk})i3gie)#UdmWd2BXYl9n(rFd;Ar1_dh)
s0|FWa00a~bNvwD3SVn$Of0S&qXUYX*A|bj22t5tq%p}7|U;+XN03*?_p8x;=

diff --git a/test/fake-ca/fake.priv b/test/fake-ca/fake.priv
index fd459d5..3c8fcfc 100644
--- a/test/fake-ca/fake.priv
+++ b/test/fake-ca/fake.priv
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQDdnD3XgTO1STHyPRpusAiumVU1VNjIC5MfklQLdEO4+Ppv4jtl
-QBTWuCAFQF/wxu9Q/8qgpr485kJF6252ePFRSRh0MiBKvbsRlUinnx9QD9N/lDnD
-udyqMn16EVPQVcVdj8vYR3r1Sffl9+dhOE15ZjuREAheXZY41OIR9Tt01QIDAQAB
-AoGBAM/1mqLs/9UTRueHJ5LPZpZSFX/iizvOgNWTv4KwLA0cuAbeSdaN+AA28PV8
-n4uXY2SjZUa0srj7ax2p/RL4E5rw0bwDImfZh1Sbf7jTNviU/sKwqW6MGuCAQhHS
-j+wA3oCBda7p1v+FMQccbsM5CDTVYrPbhEouUi1Pg8SW23aBAkEA88Y/Ojj7bCf3
-RYAYgRCkhSV4eljrJDOwnzxX7WIuGf6A30UJ1epXWU2NQA3AmLq+X6gAKFqsyP2/
-/6buGgeXSQJBAOi5b5uEXFbsPXtwfmNfsRpkZqS+AAGhy8pKO4NTqR+cTEObb0nc
-xS8vdx2gUXOVzZnVpXWBi9+BGKt3oWw19S0CQQCF8roNWQA2FuPVSaStTqLIEqXX
-vIJAWzLC3JqH8rnYSLMxe7MC2whyJp3lw2i/w2UWFK85fVGSA3R7mpMctG0ZAkEA
-rAI7Oo/nDBwKCU2JLPvSU7Z3ozYHnS0wCfE58YQJUaLdP28IH2i8mXaUrOIMsci8
-MQKXC7XXYzfwuvNt7SQodQJBANQChuUPRyft5ygT0sXDCujl1YtHKWtCysUetn7J
-JPRzuTr82WyF29EKK7V0Z0X2pCCq7vXtjbj8b8WeBEBw7rw=
+MIICXAIBAAKBgQCzJg2Y4PEy7IHjJtnAUoHsJTFiwH3upubJ21J1xIwbuwCCvUrB
+pj/OzEzaPdxU6fzjPXD2wVDzE2vqLF6hvxyzUlLKXmuB10lOfly8vkMHO7T/P1pO
+4vrZIpzo3pGFgx3fw4E4ZCdlsbjV/yHjVpO6+pnWdpka+S7rOIKMJfjfMwIDAQAB
+AoGAEw7tS2JCxqQafUvYxnkAkVqzkkngG89tpfPLJfQu45RVTZNNrKQ/DYT2eBE0
+q2PpH1Od/OI79mAOju8BcjueldeO7bWM7ujW3o8zt/k/enq+Y/qcP6tWx8ulm4Ij
+ALno9t5Zcp8B1Zq2LV/mqRvC25BbFsX7K6nLKVnnUkobfiECQQDYOaR6Ml5jrnXZ
+a/EgAbx0wYnpOFO1ZU1i/wk2ffK6P8vWpuvL5Ad5QF1dBxWo/mtifTzNimuk6BYG
+rwJPsU+nAkEA1BpsX3/qGx8ze5XpQEa8hbUVidLhMldNrcskQXd9KSd8YJPDsTcC
+HG0DDu+7hhNaWEV2hLVTWeapiMAk4fbFlQJAL6ekpHnta7LLrnunzRIU4va02n3b
+lSMahzMGaMghcwMUfd6UIX/EVejlqtcg4voP2MkZWYOkbdfo4tg3fjDqCQJBAKV2
+r5CYw1LBNnJ08m/YPv231MOeJVwWS10HGpOP2a4fRaI54/H9zcHLMRWX45ymwFYY
+amsA4bNChINQEfXNgzkCQE0lhV6MD0R9geM32+pCQlImfVIhsLYQJs+D2lsjlvSW
+S4nS6t2M8CFVJlOvOpdZL3x7eHuan2dhHHP1sz3jCx4=
 -----END RSA PRIVATE KEY-----
diff --git a/test/fake-ca/index.txt b/test/fake-ca/index.txt
index 3a96fbc..e69de29 100644
--- a/test/fake-ca/index.txt
+++ b/test/fake-ca/index.txt
@@ -1,20 +0,0 @@
-V	370320130903Z		123456	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake client
-V	370320130903Z		12345A	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake client serial/serialNumber=12341324
-V	370320130904Z		12345E	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake client email/emailAddress=test@home.org
-V	370320130904Z		123462	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake client UID/UID=testuserid
-V	370320130904Z		123466	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake flag client
-V	370320130909Z		12346A	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake bigclient
-V	370320130910Z		12346E	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake server
-V	370320130910Z		123472	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=xxx.foo.bar
-V	370320130911Z		123473	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake clientserver
-V	370320130911Z		123477	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake none
-V	091101130911Z		12347B	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake client expired
-V	091101130912Z		12347D	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake flag client expired
-V	091101130912Z		12347F	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake flag server expired
-V	091101130912Z		123481	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake clientserver expired
-V	091101130913Z		123483	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake none expired
-R	370320130913Z	091102130913Z	123485	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake client revoked
-R	370320130913Z	091102130913Z	123487	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake flag client revoked
-R	370320130913Z	091102130914Z	123489	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake server revoked
-R	370320130914Z	091102130914Z	12348B	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake clientserver revoked
-R	370320130914Z	091102130914Z	12348D	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=fake none revoked
diff --git a/test/fake-ca/req_conf.cnf b/test/fake-ca/req_conf.cnf
index 7c30db9..2262038 100644
--- a/test/fake-ca/req_conf.cnf
+++ b/test/fake-ca/req_conf.cnf
@@ -1,33 +1,92 @@
+### req command
+
 [ req ]
-default_bits           = $ENV::BITS
-default_keyfile        = keyfile.pem
-distinguished_name     = req_distinguished_name
-attributes             = req_attributes
-prompt                 = no
-output_password        = $ENV::PASSWORD
-ca_cert		           = CA_cert
+default_bits		= 1024
+distinguished_name	= req_distinguished_name
 
 [ req_distinguished_name ]
-countryName                    = UG
 
-#stateOrProvinceName	       = South area
+[ ca_cert_req ]
+basicConstraints	= CA:true
+subjectKeyIdentifier	= hash
+authorityKeyIdentifier	= keyid:always,issuer:always
+keyUsage		= cRLSign, keyCertSign
+
+#[ serial_cert_req ]
+#serialNumber		= 12341324
+
+#[ email_cert_req ]
+#emailAddress		= test@home.org
+
+#[ uid_cert_req ]
+#userId			= testuserid
+
+[ proxy_cert_req ]
+
+[ proxy_proxy_cert_req ]
+
+#### ca command
 
-localityName                   = Tropic
+[ca]
+default_ca 		= CA_default
 
-organizationName		       = Utopia
+[CA_default]
+dir 			= $ENV::CASROOT/$ENV::CATYPE-ca
+database 		= $dir/index.txt
+serial 			= $dir/serial.txt
+default_md 		= sha1
 
-organizationalUnitName         = Relaxation
+certificate 		= $dir/$ENV::CATYPE.cert
+private_key 		= $dir/$ENV::CATYPE.priv
 
-commonName                     = $ENV::CN
+policy = policy_any
 
-#emailAddress                   = Email Address
+[policy_any]
+countryName		= supplied
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+userId			= optional
+serialNumber		= optional
 
-[ req_attributes ]
-#challengePassword              = $ENV::PASSWORD
+[ ca_cert ]
+basicConstraints	= CA:TRUE
 
-[ CA_cert ]
-basicConstraints = CA:true
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid:always,issuer:always
+
+[ ca_server ]
+# This is OK for an SSL server.
+nsCertType		= server
+nsComment		= "OpenSSL Generated Server Certificate"
+# For an object signing certificate this would be used.
+# nsCertType 		= objsign
+
+[ ca_altname ]
+# This is OK for an SSL server.
+nsCertType			= server
+nsComment			= "OpenSSL Generated Server Certificate"
+subjectAltName = DNS:*.hoo.org,DNS:joo.haa.org,IP:123.124.220.1,DNS:g*a.e*.com
+
+[ ca_client ]
+# For normal client use this is typical
+nsCertType 		= client, email
+nsComment		= "OpenSSL Generated Client Certificate"
+
+[ ca_clientserver ]
+# For normal client use this is typical
+nsCertType 		= server, client, email
+nsComment		= "OpenSSL Generated Client Server Certificate"
+
+[ ca_fclient ]
+# This is typical in keyUsage for a client certificate.
+keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment
+nsComment		= "OpenSSL Generated Client Certificate with key usage"
+
+[ ca_none ]
+nsComment		= "OpenSSL Generated Client Certificate without Flags"
 
 [ proxy_none ]
+keyUsage		= critical,digitalSignature,keyEncipherment
+
diff --git a/test/fake-ca/serial.txt b/test/fake-ca/serial.txt
index 02092c1..3dcc795 100644
--- a/test/fake-ca/serial.txt
+++ b/test/fake-ca/serial.txt
@@ -1 +1 @@
-123490
+0176
diff --git a/test/trusted-ca/index.txt b/test/trusted-ca/index.txt
index dd5040c..e69de29 100644
--- a/test/trusted-ca/index.txt
+++ b/test/trusted-ca/index.txt
@@ -1,24 +0,0 @@
-V	370320130851Z		123456	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=hahkala
-V	370320130851Z		123457	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=pchip10
-V	370320130851Z		123458	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted client
-V	370320130852Z		12345C	unknown	/C=UK/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted client serial/serialNumber=12341324
-V	370320130852Z		123460	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted client email/emailAddress=test@home.org
-V	370320130853Z		123464	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted client UID/UID=testuserid
-V	370320130853Z		123468	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted flag client
-V	370320130858Z		12346C	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted bigclient
-V	370320130858Z		123470	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted server
-V	370320130859Z		123474	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted/xxx.foo.bar
-V	370320130859Z		123475	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=xxx.foo.bar
-V	370320130859Z		123476	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=xxx.foo.bar
-V	370320130859Z		123477	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted clientserver
-V	370320130859Z		12347B	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted none
-V	091101130900Z		12347F	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted client expired
-V	091101130900Z		123481	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted flag client expired
-V	091101130900Z		123483	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted flag server expired
-V	091101130901Z		123485	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted clientserver expired
-V	091101130901Z		123487	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted none expired
-R	370320130901Z	091102130901Z	123489	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted client revoked
-R	370320130901Z	091102130902Z	12348B	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted flag client revoked
-R	370320130902Z	091102130902Z	12348D	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted server revoked
-R	370320130902Z	091102130902Z	12348F	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted clientserver revoked
-R	370320130902Z	091102130903Z	123491	unknown	/C=UG/L=Tropic/O=Utopia/OU=Relaxation/CN=trusted none revoked
diff --git a/test/trusted-ca/req_conf.cnf b/test/trusted-ca/req_conf.cnf
index 7c30db9..2262038 100644
--- a/test/trusted-ca/req_conf.cnf
+++ b/test/trusted-ca/req_conf.cnf
@@ -1,33 +1,92 @@
+### req command
+
 [ req ]
-default_bits           = $ENV::BITS
-default_keyfile        = keyfile.pem
-distinguished_name     = req_distinguished_name
-attributes             = req_attributes
-prompt                 = no
-output_password        = $ENV::PASSWORD
-ca_cert		           = CA_cert
+default_bits		= 1024
+distinguished_name	= req_distinguished_name
 
 [ req_distinguished_name ]
-countryName                    = UG
 
-#stateOrProvinceName	       = South area
+[ ca_cert_req ]
+basicConstraints	= CA:true
+subjectKeyIdentifier	= hash
+authorityKeyIdentifier	= keyid:always,issuer:always
+keyUsage		= cRLSign, keyCertSign
+
+#[ serial_cert_req ]
+#serialNumber		= 12341324
+
+#[ email_cert_req ]
+#emailAddress		= test@home.org
+
+#[ uid_cert_req ]
+#userId			= testuserid
+
+[ proxy_cert_req ]
+
+[ proxy_proxy_cert_req ]
+
+#### ca command
 
-localityName                   = Tropic
+[ca]
+default_ca 		= CA_default
 
-organizationName		       = Utopia
+[CA_default]
+dir 			= $ENV::CASROOT/$ENV::CATYPE-ca
+database 		= $dir/index.txt
+serial 			= $dir/serial.txt
+default_md 		= sha1
 
-organizationalUnitName         = Relaxation
+certificate 		= $dir/$ENV::CATYPE.cert
+private_key 		= $dir/$ENV::CATYPE.priv
 
-commonName                     = $ENV::CN
+policy = policy_any
 
-#emailAddress                   = Email Address
+[policy_any]
+countryName		= supplied
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+userId			= optional
+serialNumber		= optional
 
-[ req_attributes ]
-#challengePassword              = $ENV::PASSWORD
+[ ca_cert ]
+basicConstraints	= CA:TRUE
 
-[ CA_cert ]
-basicConstraints = CA:true
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid:always,issuer:always
+
+[ ca_server ]
+# This is OK for an SSL server.
+nsCertType		= server
+nsComment		= "OpenSSL Generated Server Certificate"
+# For an object signing certificate this would be used.
+# nsCertType 		= objsign
+
+[ ca_altname ]
+# This is OK for an SSL server.
+nsCertType			= server
+nsComment			= "OpenSSL Generated Server Certificate"
+subjectAltName = DNS:*.hoo.org,DNS:joo.haa.org,IP:123.124.220.1,DNS:g*a.e*.com
+
+[ ca_client ]
+# For normal client use this is typical
+nsCertType 		= client, email
+nsComment		= "OpenSSL Generated Client Certificate"
+
+[ ca_clientserver ]
+# For normal client use this is typical
+nsCertType 		= server, client, email
+nsComment		= "OpenSSL Generated Client Server Certificate"
+
+[ ca_fclient ]
+# This is typical in keyUsage for a client certificate.
+keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment
+nsComment		= "OpenSSL Generated Client Certificate with key usage"
+
+[ ca_none ]
+nsComment		= "OpenSSL Generated Client Certificate without Flags"
 
 [ proxy_none ]
+keyUsage		= critical,digitalSignature,keyEncipherment
+
diff --git a/test/trusted-ca/serial.txt b/test/trusted-ca/serial.txt
index 6ea8183..3dcc795 100644
--- a/test/trusted-ca/serial.txt
+++ b/test/trusted-ca/serial.txt
@@ -1 +1 @@
-123494
+0176
diff --git a/test/trusted-ca/trusted.cert b/test/trusted-ca/trusted.cert
index 2c47081..184c8a1 100644
--- a/test/trusted-ca/trusted.cert
+++ b/test/trusted-ca/trusted.cert
@@ -1,14 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIICKTCCAZICAQAwDQYJKoZIhvcNAQEEBQAwXTELMAkGA1UEBhMCVUcxDzANBgNV
-BAcTBlRyb3BpYzEPMA0GA1UEChMGVXRvcGlhMRMwEQYDVQQLEwpSZWxheGF0aW9u
-MRcwFQYDVQQDEw50aGUgdHJ1c3RlZCBDQTAeFw0wNDEwMjgwMjQ5MjJaFw0zMjAz
-MTUwMjQ5MjJaMF0xCzAJBgNVBAYTAlVHMQ8wDQYDVQQHEwZUcm9waWMxDzANBgNV
-BAoTBlV0b3BpYTETMBEGA1UECxMKUmVsYXhhdGlvbjEXMBUGA1UEAxMOdGhlIHRy
-dXN0ZWQgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALgEMG9x0czvTKUS
-28+4YZhuSnVTCf8+OyfoD+7rLOdK1YzXlbtt2A8wSwbGsRlYv7J/NvogSTIU9tj3
-EL9pVfcIaiYWL12VgJpeAkQ4gqA7WikXLlnD1tShtR1tGGANpr3ZvpKaq/ge/k9E
-dhbdyQqikif36o7+c+Msqz0XfmfNAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAWkKu
-hUC4D3SWfg3JBZceMU4TNE7K0Nt6gdFypJA2ikR0lMLy+ai9vtwU+QF1Ch4zDM9a
-lWXHw8RmFgUDdvndWQV8JcwhaUSqxrKvNvfzoZAxGZxUOuwETy8MhpNiwD+gBeae
-aL4peenUEfIa6mPRbGOoD8kOxjyACwr0r0+DUAY=
+MIIDCDCCAnGgAwIBAgIJANziUWMgmUwRMA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNV
+BAYTAlVHMQ8wDQYDVQQHEwZUcm9waWMxDzANBgNVBAoTBlV0b3BpYTETMBEGA1UE
+CxMKUmVsYXhhdGlvbjEXMBUGA1UEAxMOdGhlIHRydXN0ZWQgQ0EwHhcNMDkxMTE4
+MjAwOTMwWhcNMzcwNDA1MjAwOTMwWjBdMQswCQYDVQQGEwJVRzEPMA0GA1UEBxMG
+VHJvcGljMQ8wDQYDVQQKEwZVdG9waWExEzARBgNVBAsTClJlbGF4YXRpb24xFzAV
+BgNVBAMTDnRoZSB0cnVzdGVkIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQDTgxhpXPFdUAZ6vdOUeDhNNq7O+CCeYnOv/sMIoauTNxRSlMOIGwIB8d4VlgsK
+U/JKNhmV2Bx1jCAB4nBsoY3mIryPWvt86emR+5lWcfJfG9Q2HHMed0oNwUf7i3g9
+DX22x/B69Kq4KR5C24QlZEwloPi97ltg+ILWp5WULD2v+wIDAQABo4HPMIHMMAwG
+A1UdEwQFMAMBAf8wHQYDVR0OBBYEFFLVqrGqen8FRIdghQ2W5M5+VLFfMIGPBgNV
+HSMEgYcwgYSAFFLVqrGqen8FRIdghQ2W5M5+VLFfoWGkXzBdMQswCQYDVQQGEwJV
+RzEPMA0GA1UEBxMGVHJvcGljMQ8wDQYDVQQKEwZVdG9waWExEzARBgNVBAsTClJl
+bGF4YXRpb24xFzAVBgNVBAMTDnRoZSB0cnVzdGVkIENBggkA3OJRYyCZTBEwCwYD
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAJz6xkG3SctVcVOlRrgdGSpqlE2v
+Fw1j8tasKRYrhHWZYQT32oiP34ov6ZFTxZ0lBtgjNfRhI0VxXDvr5tamt819hTUL
+F5F8yPoabSvBbpWjeDJa4ma74N4jn3Rmdp8K7i1Xno+Eslbx60QYy+Zk8GlFtEsX
+CR53OZzZdYBWFa5W
 -----END CERTIFICATE-----
diff --git a/test/trusted-ca/trusted.p12 b/test/trusted-ca/trusted.p12
index 0b068efc27b4620d9b0576069f7e3552f3d95043..a3d9c2861036b3a94fe236a51a2821b3431201b6 100644
GIT binary patch
delta 1724
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
SeFO+Y=(JuI7*c8i0tf&SCniY%

delta 1498
zcmV<01tt204y6o0FoFgl0s#Xsf(7RW2`Yw2hW8Bt2LYgh1=s|F1=KKt1<){p0?!5s
zDuzgg_YDCD2B3lhz%YUWyaE9LFoFWLkw6`PQfys%?^d&j0s;sCfPw;uFslYsXe|Od
zT%MUdx}3`^Dn7S2P6`2A1beEq2Ett~&OWv?({4!00;@p;mCl@;L#)HG{Rw6C+ZbI;
zAXB*h0D3oB)3`t^V$tI%LwYQWSu#%#wVz1B3E-<D54Ni3+y|wml=pZpjeZbS!_A<7
z=(wqMFPxYYvk!b;BHD&`piKju!x^P16c2e{+i_9sHurY$v<ZCKmXbcvD`YSHBS$<|
z7LP1U;hXjGncbL4k7Wf!B3n#gpN&y87hgTxbTr;b9Ptv;HW+Z|S>%xa^B$XbPrAFN
z;aGdFxER>;CRB>|tk+FaD`Ed%Np16gE(3#(og!9nd?<SIYNcg<ABH}mzb`L<yxpu=
z_;@j}Lq{Ts^xcX3>QZ6WR9nlVu**J+5S7x@9({5yU{ed*-jWDYIUs%mNG*&#qH$G2
z!^b8b<l*Wi!>#Q|=3)ONRVp@u_}iuI&VB|9t1T$N&E?vqGkuhh)%zo5U$;wt!9kGt
z7nfK@AD<?}-7RPDsJ>cwpkQeS|0ycE<++F6!;S1hKo%Lp2aS~iU~=sOBq~_v#%Y6g
zx!}M1+By^#22wcm()3oCDt`RjrmB+Jfdo77E;Q^*a==xwcRJX)*q!|uq6+e9YxD;4
z%8YTw1&O7a5w;w*H&E|s8cn}{sPK8`C{W3z5(YW@vCkJ7TA{7IGxzC==o~RwvVrMz
z>qlx9^bQ)4lo>t*RS?9mgwGjKE?Ewa4VcN~AVpK&aW|vvx@C9je%n6yH!X;G2dC}j
ztu2^5y9sSSuoo#}Y_4gw+PSMy69K%lJPM#XoKq(UG_}$J!u|q6F+SQIoR>!8s*3t#
zp>5b~teTO@0q58I?oqV(Y#e&_latj0Mt@+kV};jQAJ75<2ml0v0)Va_oxF8rG?iyl
zHvE)f4V%eg)p7ky`*cwF@}io_ipFkNLUbi)<e8h4_N<UdW_;Y76kcvYiGA~GDxZ_$
zg}~y301l$4V_U*WBjwE@xS6eQZ;&l0@JaA_Yyf!2<XAxp9h(1GKK+w==dip=^?!rE
zim#}(QR4_<)>At8b_P6wy}|N}{#hs&uK%xPB8_!>)Kb0%fHqGC!5XDfh%=EVhF>4-
zH#6mVTYf-asU@+Nb@kRqPxGNCRxr~TBp*ROZhq~;zC;Ar>du|~7{Bujh8yGV7q3=U
zKhNzOrg207oztCz|24r3NhhJ<&wnk0`Nepj60+@w%f!waW#qOh?9Of}(ra1WAsc|B
zfamtmF#N##;1TI&h)q31_$-%FVzCYGp{|rlXP_;o$Zl`!loxP2n(@nRbpXbc5Z@41
zOVf(H&Ohy|RGn@QBTYRnQd>HDXf+psala#Sxl|__DfcqYoT`vA3EwL?8Go3rf@8op
z<?BCnk!eDyCcWxQ*=-I}17sYK)bI-dF#2n)4GB5VOodIyNWITCJ9`}fMRVW6Qn62&
zGw~b`Q4wuSiX(iD$kL?nj;a$4gz}c^^y6+R%81Elj?Ex_6N8=w1f9-e{iHM#Juyb$
zU@i;N$@}{iLXLm!mZz;lsef`}yd>4?uq9AnvS|(PcXDIB8(i+noA(o-`gV3~ALHin
zLLSnAMN{0hfSe%ja~#>rb%-ric{oO4WrE&YpoeDLsc|tf)i$UMjd^%3G__a-NmUkp
zxO`(lTacUviZG@B%MvdFp4^XQe-vFQC5jSJ!OVT=2-(K8XYv4|qHl52yVgPDpB)rT
zw13Wyqqc!Ew?8Z~B`_lf2`Yw2hW8Bt2^BFG1Qa*YOBCzu``HoV(>~x2vgKt^&RsAu
zFd;Ar1_dh)0|FWa00b1>Au|dEMQFvUOIh@BiKGteeE|Uk2oYoSYzSNTyaECU0CyR^
A761SM

diff --git a/test/trusted-ca/trusted.priv b/test/trusted-ca/trusted.priv
index 2a1c60d..e698708 100644
--- a/test/trusted-ca/trusted.priv
+++ b/test/trusted-ca/trusted.priv
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC4BDBvcdHM70ylEtvPuGGYbkp1Uwn/Pjsn6A/u6yznStWM15W7
-bdgPMEsGxrEZWL+yfzb6IEkyFPbY9xC/aVX3CGomFi9dlYCaXgJEOIKgO1opFy5Z
-w9bUobUdbRhgDaa92b6Smqv4Hv5PRHYW3ckKopIn9+qO/nPjLKs9F35nzQIDAQAB
-AoGAPRb+8XCK4wsqmb66BKrEk7NButN3hSomv2fWKk4e2SZJ4PkNN20PBnPU5In/
-71c8RMjg+obPZfX5wSu8fp88rzZ7u4kPZp5r2c4nlhV7GqmdlJNj7GUFgGtxVLBC
-+qBh9H1v5MwEhEj1ae+uQEwJYrA+JAA+AJTRQymFDx0l4u0CQQDuIuZmoOcxK+Nd
-QJvOnrJbUwq+/kgRJXObGERUFF9ZsOI9/smZxoykmUkcciWo8noTo3a3kNbUg3PO
-gDQp//tPAkEAxdH8Pl17p0+kEiR6/qxg8PrwKXg2BXVdlDYsa31frTAaSHNoPP6w
-uqdyOpqfQCM2ug7YziV9oOMIjmVLVZ00IwJBAMy3zAJmSNoItMkyBb+2xfWkihRv
-XV0AKUYnsnXlnaLpYVWSd5VvDvFhpWyC5MU8zp2bZS+hoE3JRAE+TZndqhkCQHZU
-T1B21tqT9w6rJ69jKXG8iSAlOhs1w04+wX9itXKBTZd9ASNLLifYtal8iDnzVm8h
-JmrZXjZ418tlqBSEPoUCQBW/tY26rUVhjbyUk+hhayuOS3PcEU5TrZogAtD1OWbz
-7pDJo48aupE/Svc59smwXQjaZjwlNA76X75ioaSSaSI=
+MIICXQIBAAKBgQDTgxhpXPFdUAZ6vdOUeDhNNq7O+CCeYnOv/sMIoauTNxRSlMOI
+GwIB8d4VlgsKU/JKNhmV2Bx1jCAB4nBsoY3mIryPWvt86emR+5lWcfJfG9Q2HHMe
+d0oNwUf7i3g9DX22x/B69Kq4KR5C24QlZEwloPi97ltg+ILWp5WULD2v+wIDAQAB
+AoGAI0CnUfBOvjm3Sr/WwtkisSPbEN3kOeG43G1+vjKL8TZt6bGnwUiXFhHk7P4c
+CvWg3WOU8heZ7rGTKB1Alap7hsEeVC6kVZHz4PmvjkJbIyBKlFfeUm3UY7kq+eyD
+148CGk9gSCtRs/vOHygpJwEvIac6toKE64gCh3xn9NZo/UkCQQD6dr93AX3hh7qb
+Ht3ep2TD5nKdiRfNtW5uieXGm2wG4jinKziQHOeURJ8kFjzbmIo58zGLjbeUD42C
+eAjkr3D1AkEA2C/wQeYp6lNh7AIx2GAPSTGlKHa1x016j69pVUMXyPQBht7o66WG
+lGEC4v22axMFogbj8Ln5Pj84k6IGyGRHLwJAeR4rgJUMFp/YMWM/z4gLRmCOVHgT
+Nrrh6DpvDxfhqYKD+vL/q1EO+7gjbQQD8f1V+qgL8XxaphLPT6RUSKI+cQJBAM9I
+t78X5xyssnlOaWikQkPV/BveJtFgMqHOeNqtqAKgI06kMQSxA2cF1XS7+8qSxJXk
+sW3Bg3/xslerxYEi1TUCQQDYo/EVIhFigU3ONRguQxZ4rHCF5zwl3rdw2wXcIdS0
+4nREE6He1zwNrTlS3bRU+asmD4dtYxuUgSTqvvyArsCe
 -----END RSA PRIVATE KEY-----
-- 
1.8.2.3