Gitweb:
http://git.exim.org/exim.git/commitdiff/89f2a2697c74fde51754770ae3b3971e5c3e6082
Commit: 89f2a2697c74fde51754770ae3b3971e5c3e6082
Parent: 20be27b23eeb08cc51ed3ce16c1627d882cb2b27
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Dec 15 22:17:42 2013 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Dec 15 22:17:42 2013 +0000
Increase test CA key sizes from 512 to 1024 to handle TLS1.2 digest sizes.
---
test/aux-fixed/exim-ca/example.com/BLANK/CA.pem | 19 +-
.../aux-fixed/exim-ca/example.com/BLANK/Signer.pem | 17 +-
test/aux-fixed/exim-ca/example.com/BLANK/cert8.db | Bin 65536 -> 65536 bytes
test/aux-fixed/exim-ca/example.com/BLANK/key3.db | Bin 16384 -> 16384 bytes
test/aux-fixed/exim-ca/example.com/BLANK/secmod.db | Bin 16384 -> 16384 bytes
test/aux-fixed/exim-ca/example.com/CA/CA.pem | 19 +-
test/aux-fixed/exim-ca/example.com/CA/OCSP.key | 24 +-
test/aux-fixed/exim-ca/example.com/CA/OCSP.p12 | Bin 2210 -> 2898 bytes
test/aux-fixed/exim-ca/example.com/CA/OCSP.pem | 18 +-
test/aux-fixed/exim-ca/example.com/CA/Signer.pem | 17 +-
test/aux-fixed/exim-ca/example.com/CA/ca.conf | 4 +-
test/aux-fixed/exim-ca/example.com/CA/cert8.db | Bin 65536 -> 65536 bytes
test/aux-fixed/exim-ca/example.com/CA/crl.empty | Bin 175 -> 240 bytes
.../exim-ca/example.com/CA/crl.empty.in.txt | 2 +-
.../aux-fixed/exim-ca/example.com/CA/crl.empty.pem | 9 +-
test/aux-fixed/exim-ca/example.com/CA/crl.v2 | Bin 223 -> 289 bytes
.../aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt | 6 +-
test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem | 12 +-
test/aux-fixed/exim-ca/example.com/CA/key3.db | Bin 16384 -> 24576 bytes
test/aux-fixed/exim-ca/example.com/CA/noise.file | 532 +++++++++-----------
test/aux-fixed/exim-ca/example.com/CA/secmod.db | Bin 16384 -> 16384 bytes
.../example.com/expired1.example.com/ca_chain.pem | 61 ++-
.../example.com/expired1.example.com/cert8.db | Bin 65536 -> 65536 bytes
.../expired1.example.com.chain.pem | 42 +-
.../expired1.example.com/expired1.example.com.key | 26 +-
.../expired1.example.com.ocsp.dated.resp | Bin 725 -> 923 bytes
.../expired1.example.com.ocsp.good.resp | Bin 706 -> 904 bytes
.../expired1.example.com.ocsp.req | Bin 105 -> 105 bytes
.../expired1.example.com.ocsp.revoked.resp | Bin 728 -> 926 bytes
.../expired1.example.com/expired1.example.com.p12 | Bin 2380 -> 3076 bytes
.../expired1.example.com/expired1.example.com.pem | 25 +-
.../expired1.example.com.unlocked.key | 20 +-
.../example.com/expired1.example.com/key3.db | Bin 16384 -> 16384 bytes
.../example.com/expired1.example.com/secmod.db | Bin 16384 -> 16384 bytes
.../example.com/expired2.example.com/ca_chain.pem | 61 ++-
.../example.com/expired2.example.com/cert8.db | Bin 65536 -> 65536 bytes
.../expired2.example.com.chain.pem | 42 +-
.../expired2.example.com/expired2.example.com.key | 26 +-
.../expired2.example.com.ocsp.dated.resp | Bin 726 -> 924 bytes
.../expired2.example.com.ocsp.good.resp | Bin 707 -> 905 bytes
.../expired2.example.com.ocsp.req | Bin 106 -> 106 bytes
.../expired2.example.com.ocsp.revoked.resp | Bin 707 -> 905 bytes
.../expired2.example.com/expired2.example.com.p12 | Bin 2388 -> 3076 bytes
.../expired2.example.com/expired2.example.com.pem | 25 +-
.../expired2.example.com.unlocked.key | 20 +-
.../example.com/expired2.example.com/key3.db | Bin 16384 -> 16384 bytes
.../example.com/expired2.example.com/secmod.db | Bin 16384 -> 16384 bytes
.../example.com/revoked1.example.com/ca_chain.pem | 61 ++-
.../example.com/revoked1.example.com/cert8.db | Bin 65536 -> 65536 bytes
.../example.com/revoked1.example.com/key3.db | Bin 16384 -> 16384 bytes
.../revoked1.example.com.chain.pem | 42 +-
.../revoked1.example.com/revoked1.example.com.key | 26 +-
.../revoked1.example.com.ocsp.dated.resp | Bin 725 -> 923 bytes
.../revoked1.example.com.ocsp.good.resp | Bin 706 -> 904 bytes
.../revoked1.example.com.ocsp.req | Bin 105 -> 105 bytes
.../revoked1.example.com.ocsp.revoked.resp | Bin 728 -> 926 bytes
.../revoked1.example.com/revoked1.example.com.p12 | Bin 2380 -> 3076 bytes
.../revoked1.example.com/revoked1.example.com.pem | 25 +-
.../revoked1.example.com.unlocked.key | 20 +-
.../example.com/revoked1.example.com/secmod.db | Bin 16384 -> 16384 bytes
.../example.com/revoked2.example.com/ca_chain.pem | 61 ++-
.../example.com/revoked2.example.com/cert8.db | Bin 65536 -> 65536 bytes
.../example.com/revoked2.example.com/key3.db | Bin 16384 -> 16384 bytes
.../revoked2.example.com.chain.pem | 42 +-
.../revoked2.example.com/revoked2.example.com.key | 26 +-
.../revoked2.example.com.ocsp.dated.resp | Bin 726 -> 924 bytes
.../revoked2.example.com.ocsp.good.resp | Bin 707 -> 905 bytes
.../revoked2.example.com.ocsp.req | Bin 106 -> 106 bytes
.../revoked2.example.com.ocsp.revoked.resp | Bin 707 -> 905 bytes
.../revoked2.example.com/revoked2.example.com.p12 | Bin 2388 -> 3076 bytes
.../revoked2.example.com/revoked2.example.com.pem | 25 +-
.../revoked2.example.com.unlocked.key | 20 +-
.../example.com/revoked2.example.com/secmod.db | Bin 16384 -> 16384 bytes
.../example.com/server1.example.com/ca_chain.pem | 61 ++-
.../example.com/server1.example.com/cert8.db | Bin 65536 -> 65536 bytes
.../example.com/server1.example.com/key3.db | Bin 16384 -> 16384 bytes
.../example.com/server1.example.com/secmod.db | Bin 16384 -> 16384 bytes
.../server1.example.com.chain.pem | 42 +-
.../server1.example.com/server1.example.com.key | 26 +-
.../server1.example.com.ocsp.dated.resp | Bin 725 -> 923 bytes
.../server1.example.com.ocsp.good.resp | Bin 706 -> 904 bytes
.../server1.example.com.ocsp.req | Bin 105 -> 105 bytes
.../server1.example.com.ocsp.revoked.resp | Bin 728 -> 926 bytes
.../server1.example.com/server1.example.com.p12 | Bin 2370 -> 3066 bytes
.../server1.example.com/server1.example.com.pem | 25 +-
.../server1.example.com.unlocked.key | 20 +-
.../example.com/server2.example.com/ca_chain.pem | 61 ++-
.../example.com/server2.example.com/cert8.db | Bin 65536 -> 65536 bytes
.../example.com/server2.example.com/key3.db | Bin 16384 -> 16384 bytes
.../example.com/server2.example.com/secmod.db | Bin 16384 -> 16384 bytes
.../server2.example.com.chain.pem | 42 +-
.../server2.example.com/server2.example.com.key | 26 +-
.../server2.example.com.ocsp.dated.resp | Bin 726 -> 924 bytes
.../server2.example.com.ocsp.good.resp | Bin 707 -> 905 bytes
.../server2.example.com.ocsp.req | Bin 106 -> 106 bytes
.../server2.example.com.ocsp.revoked.resp | Bin 707 -> 905 bytes
.../server2.example.com/server2.example.com.p12 | Bin 2378 -> 3066 bytes
.../server2.example.com/server2.example.com.pem | 25 +-
.../server2.example.com.unlocked.key | 20 +-
test/aux-fixed/exim-ca/example.net/BLANK/CA.pem | 19 +-
.../aux-fixed/exim-ca/example.net/BLANK/Signer.pem | 21 +-
test/aux-fixed/exim-ca/example.net/BLANK/cert8.db | Bin 65536 -> 65536 bytes
test/aux-fixed/exim-ca/example.net/BLANK/key3.db | Bin 16384 -> 16384 bytes
test/aux-fixed/exim-ca/example.net/BLANK/secmod.db | Bin 16384 -> 16384 bytes
test/aux-fixed/exim-ca/example.net/CA/CA.pem | 19 +-
test/aux-fixed/exim-ca/example.net/CA/OCSP.key | 24 +-
test/aux-fixed/exim-ca/example.net/CA/OCSP.p12 | Bin 2218 -> 2906 bytes
test/aux-fixed/exim-ca/example.net/CA/OCSP.pem | 18 +-
test/aux-fixed/exim-ca/example.net/CA/Signer.pem | 21 +-
test/aux-fixed/exim-ca/example.net/CA/ca.conf | 4 +-
test/aux-fixed/exim-ca/example.net/CA/cert8.db | Bin 65536 -> 65536 bytes
test/aux-fixed/exim-ca/example.net/CA/crl.empty | Bin 175 -> 240 bytes
.../exim-ca/example.net/CA/crl.empty.in.txt | 2 +-
.../aux-fixed/exim-ca/example.net/CA/crl.empty.pem | 9 +-
test/aux-fixed/exim-ca/example.net/CA/crl.v2 | Bin 223 -> 289 bytes
.../aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt | 6 +-
test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem | 12 +-
test/aux-fixed/exim-ca/example.net/CA/key3.db | Bin 16384 -> 24576 bytes
test/aux-fixed/exim-ca/example.net/CA/noise.file | 532 +++++++++-----------
test/aux-fixed/exim-ca/example.net/CA/secmod.db | Bin 16384 -> 16384 bytes
.../example.net/expired1.example.net/ca_chain.pem | 65 ++-
.../example.net/expired1.example.net/cert8.db | Bin 65536 -> 65536 bytes
.../expired1.example.net.chain.pem | 46 +-
.../expired1.example.net/expired1.example.net.key | 26 +-
.../expired1.example.net.ocsp.dated.resp | Bin 725 -> 923 bytes
.../expired1.example.net.ocsp.good.resp | Bin 706 -> 904 bytes
.../expired1.example.net.ocsp.req | Bin 105 -> 105 bytes
.../expired1.example.net.ocsp.revoked.resp | Bin 728 -> 926 bytes
.../expired1.example.net/expired1.example.net.p12 | Bin 2388 -> 3076 bytes
.../expired1.example.net/expired1.example.net.pem | 25 +-
.../expired1.example.net.unlocked.key | 20 +-
.../example.net/expired1.example.net/key3.db | Bin 16384 -> 16384 bytes
.../example.net/expired1.example.net/secmod.db | Bin 16384 -> 16384 bytes
.../example.net/expired2.example.net/ca_chain.pem | 65 ++-
.../example.net/expired2.example.net/cert8.db | Bin 65536 -> 65536 bytes
.../expired2.example.net.chain.pem | 46 +-
.../expired2.example.net/expired2.example.net.key | 26 +-
.../expired2.example.net.ocsp.dated.resp | Bin 726 -> 924 bytes
.../expired2.example.net.ocsp.good.resp | Bin 707 -> 905 bytes
.../expired2.example.net.ocsp.req | Bin 106 -> 106 bytes
.../expired2.example.net.ocsp.revoked.resp | Bin 707 -> 905 bytes
.../expired2.example.net/expired2.example.net.p12 | Bin 2388 -> 3076 bytes
.../expired2.example.net/expired2.example.net.pem | 25 +-
.../expired2.example.net.unlocked.key | 20 +-
.../example.net/expired2.example.net/key3.db | Bin 16384 -> 16384 bytes
.../example.net/expired2.example.net/secmod.db | Bin 16384 -> 16384 bytes
.../example.net/revoked1.example.net/ca_chain.pem | 65 ++-
.../example.net/revoked1.example.net/cert8.db | Bin 65536 -> 65536 bytes
.../example.net/revoked1.example.net/key3.db | Bin 16384 -> 16384 bytes
.../revoked1.example.net.chain.pem | 46 +-
.../revoked1.example.net/revoked1.example.net.key | 26 +-
.../revoked1.example.net.ocsp.dated.resp | Bin 725 -> 923 bytes
.../revoked1.example.net.ocsp.good.resp | Bin 706 -> 904 bytes
.../revoked1.example.net.ocsp.req | Bin 105 -> 105 bytes
.../revoked1.example.net.ocsp.revoked.resp | Bin 728 -> 926 bytes
.../revoked1.example.net/revoked1.example.net.p12 | Bin 2388 -> 3076 bytes
.../revoked1.example.net/revoked1.example.net.pem | 25 +-
.../revoked1.example.net.unlocked.key | 20 +-
.../example.net/revoked1.example.net/secmod.db | Bin 16384 -> 16384 bytes
.../example.net/revoked2.example.net/ca_chain.pem | 65 ++-
.../example.net/revoked2.example.net/cert8.db | Bin 65536 -> 65536 bytes
.../example.net/revoked2.example.net/key3.db | Bin 16384 -> 16384 bytes
.../revoked2.example.net.chain.pem | 46 +-
.../revoked2.example.net/revoked2.example.net.key | 26 +-
.../revoked2.example.net.ocsp.dated.resp | Bin 726 -> 924 bytes
.../revoked2.example.net.ocsp.good.resp | Bin 707 -> 905 bytes
.../revoked2.example.net.ocsp.req | Bin 106 -> 106 bytes
.../revoked2.example.net.ocsp.revoked.resp | Bin 707 -> 905 bytes
.../revoked2.example.net/revoked2.example.net.p12 | Bin 2388 -> 3076 bytes
.../revoked2.example.net/revoked2.example.net.pem | 25 +-
.../revoked2.example.net.unlocked.key | 20 +-
.../example.net/revoked2.example.net/secmod.db | Bin 16384 -> 16384 bytes
.../example.net/server1.example.net/ca_chain.pem | 65 ++-
.../example.net/server1.example.net/cert8.db | Bin 65536 -> 65536 bytes
.../example.net/server1.example.net/key3.db | Bin 16384 -> 16384 bytes
.../example.net/server1.example.net/secmod.db | Bin 16384 -> 16384 bytes
.../server1.example.net.chain.pem | 46 +-
.../server1.example.net/server1.example.net.key | 26 +-
.../server1.example.net.ocsp.dated.resp | Bin 725 -> 923 bytes
.../server1.example.net.ocsp.good.resp | Bin 706 -> 904 bytes
.../server1.example.net.ocsp.req | Bin 105 -> 105 bytes
.../server1.example.net.ocsp.revoked.resp | Bin 728 -> 926 bytes
.../server1.example.net/server1.example.net.p12 | Bin 2378 -> 3066 bytes
.../server1.example.net/server1.example.net.pem | 25 +-
.../server1.example.net.unlocked.key | 20 +-
.../example.net/server2.example.net/ca_chain.pem | 65 ++-
.../example.net/server2.example.net/cert8.db | Bin 65536 -> 65536 bytes
.../example.net/server2.example.net/key3.db | Bin 16384 -> 16384 bytes
.../example.net/server2.example.net/secmod.db | Bin 16384 -> 16384 bytes
.../server2.example.net.chain.pem | 46 +-
.../server2.example.net/server2.example.net.key | 26 +-
.../server2.example.net.ocsp.dated.resp | Bin 726 -> 924 bytes
.../server2.example.net.ocsp.good.resp | Bin 707 -> 905 bytes
.../server2.example.net.ocsp.req | Bin 106 -> 106 bytes
.../server2.example.net.ocsp.revoked.resp | Bin 707 -> 905 bytes
.../server2.example.net/server2.example.net.p12 | Bin 2386 -> 3066 bytes
.../server2.example.net/server2.example.net.pem | 25 +-
.../server2.example.net.unlocked.key | 20 +-
test/aux-fixed/exim-ca/example.org/BLANK/CA.pem | 19 +-
.../aux-fixed/exim-ca/example.org/BLANK/Signer.pem | 21 +-
test/aux-fixed/exim-ca/example.org/BLANK/cert8.db | Bin 65536 -> 65536 bytes
test/aux-fixed/exim-ca/example.org/BLANK/key3.db | Bin 16384 -> 16384 bytes
test/aux-fixed/exim-ca/example.org/BLANK/secmod.db | Bin 16384 -> 16384 bytes
test/aux-fixed/exim-ca/example.org/CA/CA.pem | 19 +-
test/aux-fixed/exim-ca/example.org/CA/OCSP.key | 24 +-
test/aux-fixed/exim-ca/example.org/CA/OCSP.p12 | Bin 2218 -> 2906 bytes
test/aux-fixed/exim-ca/example.org/CA/OCSP.pem | 18 +-
test/aux-fixed/exim-ca/example.org/CA/Signer.pem | 21 +-
test/aux-fixed/exim-ca/example.org/CA/ca.conf | 4 +-
test/aux-fixed/exim-ca/example.org/CA/cert8.db | Bin 65536 -> 65536 bytes
test/aux-fixed/exim-ca/example.org/CA/crl.empty | Bin 175 -> 240 bytes
.../exim-ca/example.org/CA/crl.empty.in.txt | 2 +-
.../aux-fixed/exim-ca/example.org/CA/crl.empty.pem | 9 +-
test/aux-fixed/exim-ca/example.org/CA/crl.v2 | Bin 223 -> 289 bytes
.../aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt | 6 +-
test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem | 12 +-
test/aux-fixed/exim-ca/example.org/CA/key3.db | Bin 16384 -> 24576 bytes
test/aux-fixed/exim-ca/example.org/CA/noise.file | 532 +++++++++-----------
test/aux-fixed/exim-ca/example.org/CA/secmod.db | Bin 16384 -> 16384 bytes
.../example.org/expired1.example.org/ca_chain.pem | 65 ++-
.../example.org/expired1.example.org/cert8.db | Bin 65536 -> 65536 bytes
.../expired1.example.org.chain.pem | 46 +-
.../expired1.example.org/expired1.example.org.key | 26 +-
.../expired1.example.org.ocsp.dated.resp | Bin 725 -> 923 bytes
.../expired1.example.org.ocsp.good.resp | Bin 706 -> 904 bytes
.../expired1.example.org.ocsp.req | Bin 105 -> 105 bytes
.../expired1.example.org.ocsp.revoked.resp | Bin 728 -> 926 bytes
.../expired1.example.org/expired1.example.org.p12 | Bin 2388 -> 3076 bytes
.../expired1.example.org/expired1.example.org.pem | 25 +-
.../expired1.example.org.unlocked.key | 20 +-
.../example.org/expired1.example.org/key3.db | Bin 16384 -> 16384 bytes
.../example.org/expired1.example.org/secmod.db | Bin 16384 -> 16384 bytes
.../example.org/expired2.example.org/ca_chain.pem | 65 ++-
.../example.org/expired2.example.org/cert8.db | Bin 65536 -> 65536 bytes
.../expired2.example.org.chain.pem | 46 +-
.../expired2.example.org/expired2.example.org.key | 26 +-
.../expired2.example.org.ocsp.dated.resp | Bin 726 -> 924 bytes
.../expired2.example.org.ocsp.good.resp | Bin 707 -> 905 bytes
.../expired2.example.org.ocsp.req | Bin 106 -> 106 bytes
.../expired2.example.org.ocsp.revoked.resp | Bin 707 -> 905 bytes
.../expired2.example.org/expired2.example.org.p12 | Bin 2388 -> 3076 bytes
.../expired2.example.org/expired2.example.org.pem | 25 +-
.../expired2.example.org.unlocked.key | 20 +-
.../example.org/expired2.example.org/key3.db | Bin 16384 -> 16384 bytes
.../example.org/expired2.example.org/secmod.db | Bin 16384 -> 16384 bytes
.../example.org/revoked1.example.org/ca_chain.pem | 65 ++-
.../example.org/revoked1.example.org/cert8.db | Bin 65536 -> 65536 bytes
.../example.org/revoked1.example.org/key3.db | Bin 16384 -> 16384 bytes
.../revoked1.example.org.chain.pem | 46 +-
.../revoked1.example.org/revoked1.example.org.key | 26 +-
.../revoked1.example.org.ocsp.dated.resp | Bin 725 -> 923 bytes
.../revoked1.example.org.ocsp.good.resp | Bin 706 -> 904 bytes
.../revoked1.example.org.ocsp.req | Bin 105 -> 105 bytes
.../revoked1.example.org.ocsp.revoked.resp | Bin 728 -> 926 bytes
.../revoked1.example.org/revoked1.example.org.p12 | Bin 2380 -> 3076 bytes
.../revoked1.example.org/revoked1.example.org.pem | 25 +-
.../revoked1.example.org.unlocked.key | 20 +-
.../example.org/revoked1.example.org/secmod.db | Bin 16384 -> 16384 bytes
.../example.org/revoked2.example.org/ca_chain.pem | 65 ++-
.../example.org/revoked2.example.org/cert8.db | Bin 65536 -> 65536 bytes
.../example.org/revoked2.example.org/key3.db | Bin 16384 -> 16384 bytes
.../revoked2.example.org.chain.pem | 46 +-
.../revoked2.example.org/revoked2.example.org.key | 26 +-
.../revoked2.example.org.ocsp.dated.resp | Bin 726 -> 924 bytes
.../revoked2.example.org.ocsp.good.resp | Bin 707 -> 905 bytes
.../revoked2.example.org.ocsp.req | Bin 106 -> 106 bytes
.../revoked2.example.org.ocsp.revoked.resp | Bin 707 -> 905 bytes
.../revoked2.example.org/revoked2.example.org.p12 | Bin 2388 -> 3076 bytes
.../revoked2.example.org/revoked2.example.org.pem | 25 +-
.../revoked2.example.org.unlocked.key | 20 +-
.../example.org/revoked2.example.org/secmod.db | Bin 16384 -> 16384 bytes
.../example.org/server1.example.org/ca_chain.pem | 65 ++-
.../example.org/server1.example.org/cert8.db | Bin 65536 -> 65536 bytes
.../example.org/server1.example.org/key3.db | Bin 16384 -> 16384 bytes
.../example.org/server1.example.org/secmod.db | Bin 16384 -> 16384 bytes
.../server1.example.org.chain.pem | 46 +-
.../server1.example.org/server1.example.org.key | 26 +-
.../server1.example.org.ocsp.dated.resp | Bin 725 -> 923 bytes
.../server1.example.org.ocsp.good.resp | Bin 706 -> 904 bytes
.../server1.example.org.ocsp.req | Bin 105 -> 105 bytes
.../server1.example.org.ocsp.revoked.resp | Bin 728 -> 926 bytes
.../server1.example.org/server1.example.org.p12 | Bin 2378 -> 3066 bytes
.../server1.example.org/server1.example.org.pem | 25 +-
.../server1.example.org.unlocked.key | 20 +-
.../example.org/server2.example.org/ca_chain.pem | 65 ++-
.../example.org/server2.example.org/cert8.db | Bin 65536 -> 65536 bytes
.../example.org/server2.example.org/key3.db | Bin 16384 -> 16384 bytes
.../example.org/server2.example.org/secmod.db | Bin 16384 -> 16384 bytes
.../server2.example.org.chain.pem | 46 +-
.../server2.example.org/server2.example.org.key | 26 +-
.../server2.example.org.ocsp.dated.resp | Bin 726 -> 924 bytes
.../server2.example.org.ocsp.good.resp | Bin 707 -> 905 bytes
.../server2.example.org.ocsp.req | Bin 106 -> 106 bytes
.../server2.example.org.ocsp.revoked.resp | Bin 707 -> 905 bytes
.../server2.example.org/server2.example.org.p12 | Bin 2386 -> 3066 bytes
.../server2.example.org/server2.example.org.pem | 25 +-
.../server2.example.org.unlocked.key | 20 +-
test/aux-fixed/exim-ca/genall | 8 +-
298 files changed, 2864 insertions(+), 2425 deletions(-)
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
index d51c5d0..729db79 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
@@ -1,10 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAwWhcNMzgw
-MTAxMTIzNDAwWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxYR8NYQvEd7/e4MvOj9dh2+o
-mnywT9ajMo1589DWt2z14ouRKhSZWlx4O4AicPZc6n4uvt7++t0tTHhmm5JIbwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBALjVd1KMBadFJFIzTEspoPYxJvXKvLMclekQs5QY0lmmUj5+
-ugITEG6ywu3s+REUB+8Dj+ofQz3tgIm9NBpkfsA=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
+MTAxMTIzNDAxWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALw3TIYMk4w2ob6o1TFb
+FT5sDY4HL+9uHWZfPh6dF1ILu04KVgEb0SqP/LnHLcviH6NG0G9EsiDTdG31Svuq
+xx5CrqyW+rs1pYb5NjS8mpnp3A0e2YvoWhBrfwY3+OQo193JnNDDxC5fD+bkq1P6
+LIwI72HF4/YBqGuOSGm2G34TAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAC1/IueycXMDP6mSC862
+YU584GqXCxUaxO+5X9J7qnqsBEuNCvBwnfCuPAjo+MVftpV9rghBNUvujyisBQ62
+u/q7iuEsm2Oo7LlfZ/tQbAPqBbHCSnsS4+q+rdkNz0xPpiF87p9HbG5xA0motcUT
+cIF38qe4aoHWHF7EsPgKUDbr
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
index fc29ebb..a5b4479 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
@@ -1,11 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
index f82510f..54ab120 100644
Binary files a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db and b/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db b/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
index cb031c0..44cb0a7 100644
Binary files a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db and b/test/aux-fixed/exim-ca/example.com/BLANK/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/secmod.db b/test/aux-fixed/exim-ca/example.com/BLANK/secmod.db
index 8a83193..b709dd8 100644
Binary files a/test/aux-fixed/exim-ca/example.com/BLANK/secmod.db and b/test/aux-fixed/exim-ca/example.com/BLANK/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.pem b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
index d51c5d0..729db79 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
@@ -1,10 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAwWhcNMzgw
-MTAxMTIzNDAwWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxYR8NYQvEd7/e4MvOj9dh2+o
-mnywT9ajMo1589DWt2z14ouRKhSZWlx4O4AicPZc6n4uvt7++t0tTHhmm5JIbwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBALjVd1KMBadFJFIzTEspoPYxJvXKvLMclekQs5QY0lmmUj5+
-ugITEG6ywu3s+REUB+8Dj+ofQz3tgIm9NBpkfsA=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
+MTAxMTIzNDAxWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALw3TIYMk4w2ob6o1TFb
+FT5sDY4HL+9uHWZfPh6dF1ILu04KVgEb0SqP/LnHLcviH6NG0G9EsiDTdG31Svuq
+xx5CrqyW+rs1pYb5NjS8mpnp3A0e2YvoWhBrfwY3+OQo193JnNDDxC5fD+bkq1P6
+LIwI72HF4/YBqGuOSGm2G34TAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAC1/IueycXMDP6mSC862
+YU584GqXCxUaxO+5X9J7qnqsBEuNCvBwnfCuPAjo+MVftpV9rghBNUvujyisBQ62
+u/q7iuEsm2Oo7LlfZ/tQbAPqBbHCSnsS4+q+rdkNz0xPpiF87p9HbG5xA0motcUT
+cIF38qe4aoHWHF7EsPgKUDbr
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
index 7a361dc..7b6c1e2 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
@@ -1,14 +1,20 @@
Bag Attributes
friendlyName: OCSP Signer
- localKeyID: A6 E7 21 3B BE A3 47 BE 58 6F 34 77 E2 AA D5 22 91 AA 0F D6
+ localKeyID: 57 7F C5 0B E2 97 B1 72 3C 6E 4C C6 26 AF CA E4 95 7D 55 09
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEAuGANFQATQUtX6l1r
-tDa/TimQ722a/2wGSmty/n9Va36t7O9S0Uxi7yQMN11I284FekjzP82THLWv4TJZ
-x7AvywIDAQABAkAhrko1f+IEl4Lj6VT3gtjHqogzdM5PwqgTiDVlkFVGYXp6a8o6
-ySmMofHeEjDgPFI7sz12eQOoofjhjTCnTcJhAiEA3Afe796M2vm5+V6t1ayFhgP0
-9QnSVde6mLvqHFHAKHUCIQDWhAVspNc3bw2PIBqlK2ibANwi9BFurBlATBHhKP3v
-PwIgTiwttKMpABOBU2uj7ypgNgDp4rUemYkPrnv07SLOVpECIAVXhEsQT8uxmETY
-J9G1IwW5H8I/EbAP2REg09EnlCtBAiBgZn9NxSr05na0P+NjyIPQ44Y9L5R9P3PL
-2PceGVDcQw==
+MIICcwIBADANBgkqhkiG9w0BAQEFAASCAl0wggJZAgEAAoGBALfUxpTogdTcpNP+
+/bsqESZzbx9D2r8iYSS7O7+nt0P3gQYhY5bF4a48t6tepcb/vK8Ol4Q3F/YsOmGD
+znOZJk9PuYTMgfVEUQpPaEF1Tk+9eNOhRzW+eZDkAkPoOCTyx6wT2Tp8wsU76aPe
+Z2dWxSKwsQHpgiAzr1UykuruZlV5AgMBAAECf2Dw08ey1MRrloA095i7lk+wj+js
+323rs06rbdajmwE8g823zcy0jU5UtoaoYsOOGPI3v675XqlyqVbDKxvKp2hFN9Pw
+/7m5Ai6B8BMOYZp9y/WEw946puqcyXS/9waSG7vQ2kvPHNA8GognCaV+vhWCl+Db
+ZUCN/J1sTmcDLoECQQD0USNF+rdZ76eTUeb3xUjKyC2sHeJfDhzuyKDpMLzVMLrT
+Ysjo6x7t9nxU/MHh+DZMQ0zGv9Q67K8zsEmJWvzJAkEAwJ8v61xCPGzx3+PyNJyi
+r4+OmqmKYFRr3wgz/jsISPNIoA/U04qeD4eCEsQnSlgmssnjsHY85VgiX77uidzb
+MQJAB2Vta/DrHA3lRNB17YpLadglidBdygLjXVc1h9mx3cJb5YpYCrUTeqC7otcE
+B5M8EZL4AAxOoHoJ08bCcyYOAQJAdrzqXiyGDBegVkJ+mJ4BzzUwU/i0+0KvKFI3
+Mr2TEt0dZMW9jRWC79G5hfXyvmpumIHJYIrSaRIWRm09QDCr0QJAbOCn/Pw+ghlH
+Dr7evryq3qcNmEimC/L4MmyURht6v3GObp79vzvGApYy5kYffL3y+U5/iAjHlXM/
+bOyXYf4UsA==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
index 208dc69..628fa0e 100644
Binary files a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12 and b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
index f78456d..8cbbbc2 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
@@ -1,11 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBgDCCASqgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICBTCCAW6gAwIBAgIBAzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTM4MDEwMTEyMzQwMVowMjEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAY
-BgNVBAMTEWNsaWNhIE9DU1AgU2lnbmVyMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJB
-ALhgDRUAE0FLV+pda7Q2v04pkO9tmv9sBkprcv5/VWt+rezvUtFMYu8kDDddSNvO
-BXpI8z/Nkxy1r+EyWcewL8sCAwEAAaMqMCgwDgYDVR0PAQH/BAQDAgeAMBYGA1Ud
-JQEB/wQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBBQUAA0EAQalK8cinGimBjryO
-q8scOPr7Zkv2RlhnUUTtpPfFKkTne9yXyXxBVDfy8wwPTz7ZTOzMVtPTgFT9g0Kf
-tXze7g==
+MzQwMloXDTM4MDEwMTEyMzQwMlowMjEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAY
+BgNVBAMTEWNsaWNhIE9DU1AgU2lnbmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQC31MaU6IHU3KTT/v27KhEmc28fQ9q/ImEkuzu/p7dD94EGIWOWxeGuPLer
+XqXG/7yvDpeENxf2LDphg85zmSZPT7mEzIH1RFEKT2hBdU5PvXjToUc1vnmQ5AJD
+6Dgk8sesE9k6fMLFO+mj3mdnVsUisLEB6YIgM69VMpLq7mZVeQIDAQABoyowKDAO
+BgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwkwDQYJKoZIhvcN
+AQEFBQADgYEA2bKeMnFg9HVCD818Y3uRwnh/ufX5EnZ5iUGD8BxVyd9CuxQcqgfp
+z4uq0S3gM9Je38o4jyNWpAByHmkdoh2tcWtqfFrJk0Q5K/h+5tOXqts26wm+7/D1
+dI7oWKDF/q8e+WIkeOOfj8ADOeELQ0Ei3dvTvcRYUiKl7W4uyrHq81U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
index fc29ebb..a5b4479 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
@@ -1,11 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/ca.conf b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
index 9087589..4a4e080 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
@@ -1,5 +1,5 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:00 2012
+; Thu Nov 1 12:34:01 2012
[CLICA]
crl_url=
http://crl.example.com/latest.crl
@@ -13,6 +13,6 @@ ocsp_url=
http://oscp/example.com/
org=example.com
subject=clica CA
name=Certificate Authority
-bits=512
+bits=1024
diff --git a/test/aux-fixed/exim-ca/example.com/CA/cert8.db b/test/aux-fixed/exim-ca/example.com/CA/cert8.db
index 5ae1201..192714f 100644
Binary files a/test/aux-fixed/exim-ca/example.com/CA/cert8.db and b/test/aux-fixed/exim-ca/example.com/CA/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty b/test/aux-fixed/exim-ca/example.com/CA/crl.empty
index 7814b80..157cc3c 100644
Binary files a/test/aux-fixed/exim-ca/example.com/CA/crl.empty and b/test/aux-fixed/exim-ca/example.com/CA/crl.empty differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
index 250311c..c77ccca 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20130127152434Z
+update=20131215221458Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
index fdc506d..4bbd576 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
@@ -1,6 +1,7 @@
-----BEGIN X509 CRL-----
-MIGsMFgCAQEwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhhbXBsZS5jb20x
-GzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydBgPMjAxMzAxMjcxNTI0MzRaMA0G
-CSqGSIb3DQEBBQUAA0EAjClqFKe0w0T5ARNSMOSfuDtbOA0iN2yOrUwJfidgQdVQ
-YPW+5TwKhe+Vm6skgHSIWNcuMVzojsuDZcBZnNimPA==
+MIHtMFgCAQEwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhhbXBsZS5jb20x
+GzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydBgPMjAxMzEyMTUyMjE0NThaMA0G
+CSqGSIb3DQEBBQUAA4GBABkvLQ60/I7jMicpiR7Br58lLqbX8Vxtk3k6l1bIRp1M
+6mkO7+/nnCS9HtldGXOk8fmvB79wLA3PjJgcqqzpDPJHtOaoxh07a1+JaLTxVAds
+v8qnSRYfPcSAoIw1pjRQkquwH4V7/dg09zAm8bT0c6xuvU4/kO4vsAIQWJRdqJEZ
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2 b/test/aux-fixed/exim-ca/example.com/CA/crl.v2
index 66fb34d..38b421b 100644
Binary files a/test/aux-fixed/exim-ca/example.com/CA/crl.v2 and b/test/aux-fixed/exim-ca/example.com/CA/crl.v2 differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
index 434045f..5bb688b 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20130127152437Z
-addcert 102 20130127152437Z
-addcert 202 20130127152437Z
+update=20131215221500Z
+addcert 102 20131215221500Z
+addcert 202 20131215221500Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
index da781d7..3aeb4da 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
@@ -1,7 +1,9 @@
-----BEGIN X509 CRL-----
-MIHcMIGHAgEBMA0GCSqGSIb3DQEBBQUAMDMxFDASBgNVBAoTC2V4YW1wbGUuY29t
-MRswGQYDVQQDExJjbGljYSBTaWduaW5nIENlcnQYDzIwMTMwMTI3MTUyNDM3WjAt
-MBQCAWYYDzIwMTMwMTI3MTUyNDM3WjAVAgIAyhgPMjAxMzAxMjcxNTI0MzdaMA0G
-CSqGSIb3DQEBBQUAA0EAS5A0/pStULkfIhBRMt+DfehLBbppc6FftG3TpBMvBW4k
-xGwMPKUN8lk3uMuQxk/cvbaFqPtiR/WnkAFc3i1bpA==
+MIIBHTCBhwIBATANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFtcGxlLmNv
+bTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0GA8yMDEzMTIxNTIyMTUwMFow
+LTAUAgFmGA8yMDEzMTIxNTIyMTUwMFowFQICAMoYDzIwMTMxMjE1MjIxNTAwWjAN
+BgkqhkiG9w0BAQUFAAOBgQCz4jYtvpk2yUlVyEBr5bV1QeWjX4vrAHbVjFV7u/ju
+pdlzacbLkZEKon3KTxSrqehUT+BFNBBdHkussUwh/fku0B66P6n4hv0+vsHRBBEa
+5FagO/Tr5SzpVIgKOZjIV5nHJfmLN9pEFsQJOVE8+3wSlBt+GTz+M8Lu/reSukcr
+QA==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/key3.db b/test/aux-fixed/exim-ca/example.com/CA/key3.db
index 30718a9..74a4bfc 100644
Binary files a/test/aux-fixed/exim-ca/example.com/CA/key3.db and b/test/aux-fixed/exim-ca/example.com/CA/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/noise.file b/test/aux-fixed/exim-ca/example.com/CA/noise.file
index 0003cbb..923ceea 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.com/CA/noise.file
@@ -1,301 +1,243 @@
processor : 0
vendor_id : GenuineIntel
cpu family : 6
-model : 26
-model name : Intel(R) Xeon(R) CPU E5520 @ 2.27GHz
-stepping : 5
-cpu MHz : 2260.628
-cache size : 8192 KB
+model : 13
+model name : QEMU Virtual CPU version (cpu64-rhel6)
+stepping : 3
+cpu MHz : 1994.999
+cache size : 4096 KB
fpu : yes
fpu_exception : yes
-cpuid level : 11
+cpuid level : 4
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts mmx fxsr sse sse2 ss syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts xtopology tsc_reliable nonstop_tsc aperfmperf unfair_spinlock pni ssse3 cx16 sse4_1 sse4_2 x2apic popcnt hypervisor lahf_lm ida dts
-bogomips : 4521.25
+flags : fpu de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm up unfair_spinlock pni cx16 hypervisor lahf_lm
+bogomips : 3989.99
clflush size : 64
cache_alignment : 64
-address sizes : 40 bits physical, 48 bits virtual
+address sizes : 38 bits physical, 48 bits virtual
power management:
-processor : 1
-vendor_id : GenuineIntel
-cpu family : 6
-model : 26
-model name : Intel(R) Xeon(R) CPU E5520 @ 2.27GHz
-stepping : 5
-cpu MHz : 2260.628
-cache size : 8192 KB
-fpu : yes
-fpu_exception : yes
-cpuid level : 11
-wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts mmx fxsr sse sse2 ss syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts xtopology tsc_reliable nonstop_tsc aperfmperf unfair_spinlock pni ssse3 cx16 sse4_1 sse4_2 x2apic popcnt hypervisor lahf_lm ida dts
-bogomips : 4521.25
-clflush size : 64
-cache_alignment : 64
-address sizes : 40 bits physical, 48 bits virtual
-power management:
-
- CPU0 CPU1
- 0: 2481 0 IO-APIC-edge timer
- 1: 21441 346 IO-APIC-edge i8042
- 3: 1 0 IO-APIC-edge
- 4: 1 0 IO-APIC-edge
- 7: 0 0 IO-APIC-edge parport0
- 8: 1 0 IO-APIC-edge rtc0
- 9: 0 0 IO-APIC-fasteoi acpi
- 12: 78986 1718 IO-APIC-edge i8042
- 14: 0 0 IO-APIC-edge ata_piix
- 15: 2423330 1435 IO-APIC-edge ata_piix
- 16: 1025 0 IO-APIC-fasteoi Ensoniq AudioPCI
- 17: 239842 2559 IO-APIC-fasteoi ehci_hcd:usb1, ioc0
- 18: 246 0 IO-APIC-fasteoi uhci_hcd:usb2
- 19: 1868676 51479 IO-APIC-fasteoi eth0
- 24: 0 0 PCI-MSI-edge pciehp
- 25: 0 0 PCI-MSI-edge pciehp
- 26: 0 0 PCI-MSI-edge pciehp
- 27: 0 0 PCI-MSI-edge pciehp
- 28: 0 0 PCI-MSI-edge pciehp
- 29: 0 0 PCI-MSI-edge pciehp
- 30: 0 0 PCI-MSI-edge pciehp
- 31: 0 0 PCI-MSI-edge pciehp
- 32: 0 0 PCI-MSI-edge pciehp
- 33: 0 0 PCI-MSI-edge pciehp
- 34: 0 0 PCI-MSI-edge pciehp
- 35: 0 0 PCI-MSI-edge pciehp
- 36: 0 0 PCI-MSI-edge pciehp
- 37: 0 0 PCI-MSI-edge pciehp
- 38: 0 0 PCI-MSI-edge pciehp
- 39: 0 0 PCI-MSI-edge pciehp
- 40: 0 0 PCI-MSI-edge pciehp
- 41: 0 0 PCI-MSI-edge pciehp
- 42: 0 0 PCI-MSI-edge pciehp
- 43: 0 0 PCI-MSI-edge pciehp
- 44: 0 0 PCI-MSI-edge pciehp
- 45: 0 0 PCI-MSI-edge pciehp
- 46: 0 0 PCI-MSI-edge pciehp
- 47: 0 0 PCI-MSI-edge pciehp
- 48: 0 0 PCI-MSI-edge pciehp
- 49: 0 0 PCI-MSI-edge pciehp
- 50: 0 0 PCI-MSI-edge pciehp
- 51: 0 0 PCI-MSI-edge pciehp
- 52: 0 0 PCI-MSI-edge pciehp
- 53: 0 0 PCI-MSI-edge pciehp
- 54: 0 0 PCI-MSI-edge pciehp
- 55: 0 0 PCI-MSI-edge pciehp
- 56: 1 0 PCI-MSI-edge vmci
- 57: 0 0 PCI-MSI-edge vmci
-NMI: 0 0 Non-maskable interrupts
-LOC: 12397935 14240444 Local timer interrupts
-SPU: 0 0 Spurious interrupts
-PMI: 0 0 Performance monitoring interrupts
-IWI: 0 0 IRQ work interrupts
-RES: 282548 308972 Rescheduling interrupts
-CAL: 1955 163540 Function call interrupts
-TLB: 17884 15542 TLB shootdowns
-TRM: 0 0 Thermal event interrupts
-THR: 0 0 Threshold APIC interrupts
-MCE: 0 0 Machine check exceptions
-MCP: 2310 2310 Machine check polls
+ CPU0
+ 0: 249 IO-APIC-edge timer
+ 1: 7 IO-APIC-edge i8042
+ 4: 1 IO-APIC-edge
+ 8: 0 IO-APIC-edge rtc0
+ 9: 0 IO-APIC-fasteoi acpi
+ 10: 953 IO-APIC-fasteoi virtio3
+ 11: 78 IO-APIC-fasteoi uhci_hcd:usb1, snd_hda_intel
+ 12: 102 IO-APIC-edge i8042
+ 14: 0 IO-APIC-edge ata_piix
+ 15: 106 IO-APIC-edge ata_piix
+ 24: 0 PCI-MSI-edge virtio2-config
+ 25: 561161 PCI-MSI-edge virtio2-requests
+ 26: 0 PCI-MSI-edge virtio0-config
+ 27: 7973081 PCI-MSI-edge virtio0-input
+ 28: 2 PCI-MSI-edge virtio0-output
+ 29: 0 PCI-MSI-edge virtio1-config
+ 30: 571569 PCI-MSI-edge virtio1-input
+ 31: 1 PCI-MSI-edge virtio1-output
+NMI: 0 Non-maskable interrupts
+LOC: 18455058 Local timer interrupts
+SPU: 0 Spurious interrupts
+PMI: 0 Performance monitoring interrupts
+IWI: 0 IRQ work interrupts
+RES: 0 Rescheduling interrupts
+CAL: 0 Function call interrupts
+TLB: 0 TLB shootdowns
+TRM: 0 Thermal event interrupts
+THR: 0 Threshold APIC interrupts
+MCE: 0 Machine check exceptions
+MCP: 8673 Machine check polls
ERR: 0
MIS: 0
-MemTotal: 1914844 kB
-MemFree: 135496 kB
-Buffers: 142048 kB
-Cached: 951840 kB
-SwapCached: 108 kB
-Active: 980724 kB
-Inactive: 540136 kB
-Active(anon): 287056 kB
-Inactive(anon): 143480 kB
-Active(file): 693668 kB
-Inactive(file): 396656 kB
+MemTotal: 488092 kB
+MemFree: 86648 kB
+Buffers: 93996 kB
+Cached: 141496 kB
+SwapCached: 1900 kB
+Active: 123780 kB
+Inactive: 141808 kB
+Active(anon): 8300 kB
+Inactive(anon): 22668 kB
+Active(file): 115480 kB
+Inactive(file): 119140 kB
Unevictable: 0 kB
Mlocked: 0 kB
-SwapTotal: 4194296 kB
-SwapFree: 4193560 kB
-Dirty: 928 kB
+SwapTotal: 524280 kB
+SwapFree: 511568 kB
+Dirty: 736 kB
Writeback: 0 kB
-AnonPages: 427064 kB
-Mapped: 70976 kB
-Shmem: 3400 kB
-Slab: 190892 kB
-SReclaimable: 125404 kB
-SUnreclaim: 65488 kB
-KernelStack: 2304 kB
-PageTables: 23476 kB
+AnonPages: 28720 kB
+Mapped: 13328 kB
+Shmem: 924 kB
+Slab: 108896 kB
+SReclaimable: 58064 kB
+SUnreclaim: 50832 kB
+KernelStack: 760 kB
+PageTables: 3704 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 5151716 kB
-Committed_AS: 973184 kB
+CommitLimit: 768324 kB
+Committed_AS: 109440 kB
VmallocTotal: 34359738367 kB
-VmallocUsed: 280772 kB
-VmallocChunk: 34359441168 kB
+VmallocUsed: 12116 kB
+VmallocChunk: 34359711712 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 249856 kB
+AnonHugePages: 0 kB
HugePages_Total: 0
HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 8192 kB
-DirectMap2M: 2088960 kB
+DirectMap4k: 7156 kB
+DirectMap2M: 1492992 kB
slabinfo - version: 2.1
# name <active_objs> <num_objs> <objsize> <objperslab> <pagesperslab> : tunables <limit> <batchcount> <sharedfactor> : slabdata <active_slabs> <num_slabs> <sharedavail>
-bridge_fdb_cache 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-fuse_request 0 0 632 6 1 : tunables 54 27 8 : slabdata 0 0 0
-fuse_inode 0 0 768 5 1 : tunables 54 27 8 : slabdata 0 0 0
-rpc_buffers 8 8 2048 2 1 : tunables 24 12 8 : slabdata 4 4 0
-rpc_tasks 8 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-rpc_inode_cache 8 8 832 4 1 : tunables 54 27 8 : slabdata 2 2 0
-hgfsInodeCache 1 6 640 6 1 : tunables 54 27 8 : slabdata 1 1 0
-AF_VMCI 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-nf_conntrack_expect 0 0 240 16 1 : tunables 120 60 8 : slabdata 0 0 0
-nf_conntrack_ffffffff8200cec0 22 26 304 13 1 : tunables 54 27 8 : slabdata 2 2 0
-fib6_nodes 22 59 64 59 1 : tunables 120 60 8 : slabdata 1 1 0
-ip6_dst_cache 13 30 384 10 1 : tunables 54 27 8 : slabdata 3 3 0
-ndisc_cache 1 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-ip6_mrt_cache 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-RAWv6 67 68 1024 4 1 : tunables 54 27 8 : slabdata 17 17 0
-UDPLITEv6 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-UDPv6 4 4 1024 4 1 : tunables 54 27 8 : slabdata 1 1 0
-tw_sock_TCPv6 0 0 320 12 1 : tunables 54 27 8 : slabdata 0 0 0
-request_sock_TCPv6 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-TCPv6 9 10 1856 2 1 : tunables 24 12 8 : slabdata 5 5 0
-jbd2_1k 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-avtab_node 502203 502416 24 144 1 : tunables 120 60 8 : slabdata 3489 3489 0
-ext4_inode_cache 74762 74820 1024 4 1 : tunables 54 27 8 : slabdata 18705 18705 0
-ext4_xattr 9 44 88 44 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_free_block_extents 32 67 56 67 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_alloc_context 28 28 136 28 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_prealloc_space 18 37 104 37 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_system_zone 0 0 40 92 1 : tunables 120 60 8 : slabdata 0 0 0
-jbd2_journal_handle 32 144 24 144 1 : tunables 120 60 8 : slabdata 1 1 0
-jbd2_journal_head 74 102 112 34 1 : tunables 120 60 8 : slabdata 3 3 0
-jbd2_revoke_table 4 202 16 202 1 : tunables 120 60 8 : slabdata 1 1 0
-jbd2_revoke_record 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-dm_crypt_io 50 50 152 25 1 : tunables 120 60 8 : slabdata 2 2 0
-sd_ext_cdb 2 112 32 112 1 : tunables 120 60 8 : slabdata 1 1 0
-scsi_sense_cache 25 60 128 30 1 : tunables 120 60 8 : slabdata 2 2 0
-scsi_cmd_cache 28 45 256 15 1 : tunables 120 60 8 : slabdata 3 3 0
-dm_raid1_read_record 0 0 1064 7 2 : tunables 24 12 8 : slabdata 0 0 0
-kcopyd_job 0 0 3240 2 2 : tunables 24 12 8 : slabdata 0 0 0
-io 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-dm_uevent 0 0 2608 3 2 : tunables 24 12 8 : slabdata 0 0 0
-dm_rq_clone_bio_info 0 0 16 202 1 : tunables 120 60 8 : slabdata 0 0 0
-dm_rq_target_io 0 0 392 10 1 : tunables 54 27 8 : slabdata 0 0 0
-dm_target_io 844 864 24 144 1 : tunables 120 60 8 : slabdata 6 6 0
-dm_io 828 828 40 92 1 : tunables 120 60 8 : slabdata 9 9 0
-flow_cache 0 0 96 40 1 : tunables 120 60 8 : slabdata 0 0 0
-uhci_urb_priv 6 67 56 67 1 : tunables 120 60 8 : slabdata 1 1 0
-cfq_io_context 4 28 136 28 1 : tunables 120 60 8 : slabdata 1 1 0
-cfq_queue 5 16 240 16 1 : tunables 120 60 8 : slabdata 1 1 0
-bsg_cmd 0 0 312 12 1 : tunables 54 27 8 : slabdata 0 0 0
-mqueue_inode_cache 1 4 896 4 1 : tunables 54 27 8 : slabdata 1 1 0
-isofs_inode_cache 0 0 640 6 1 : tunables 54 27 8 : slabdata 0 0 0
-hugetlbfs_inode_cache 1 6 608 6 1 : tunables 54 27 8 : slabdata 1 1 0
-dquot 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-kioctx 0 0 384 10 1 : tunables 54 27 8 : slabdata 0 0 0
-kiocb 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-inotify_event_private_data 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-inotify_inode_mark_entry 186 204 112 34 1 : tunables 120 60 8 : slabdata 6 6 0
-dnotify_mark_entry 1 34 112 34 1 : tunables 120 60 8 : slabdata 1 1 0
-dnotify_struct 1 112 32 112 1 : tunables 120 60 8 : slabdata 1 1 0
-fasync_cache 6 144 24 144 1 : tunables 120 60 8 : slabdata 1 1 0
-khugepaged_mm_slot 83 92 40 92 1 : tunables 120 60 8 : slabdata 1 1 0
-ksm_mm_slot 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-ksm_stable_node 0 0 40 92 1 : tunables 120 60 8 : slabdata 0 0 0
-ksm_rmap_item 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-utrace_engine 0 0 56 67 1 : tunables 120 60 8 : slabdata 0 0 0
-utrace 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-pid_namespace 0 0 2120 3 2 : tunables 24 12 8 : slabdata 0 0 0
-nsproxy 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-posix_timers_cache 0 0 176 22 1 : tunables 120 60 8 : slabdata 0 0 0
-uid_cache 10 60 128 30 1 : tunables 120 60 8 : slabdata 2 2 0
-UNIX 459 480 768 5 1 : tunables 54 27 8 : slabdata 96 96 0
-ip_mrt_cache 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-UDP-Lite 0 0 832 9 2 : tunables 54 27 8 : slabdata 0 0 0
-tcp_bind_bucket 15 59 64 59 1 : tunables 120 60 8 : slabdata 1 1 0
-inet_peer_cache 4 59 64 59 1 : tunables 120 60 8 : slabdata 1 1 0
-secpath_cache 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-xfrm_dst_cache 0 0 384 10 1 : tunables 54 27 8 : slabdata 0 0 0
-ip_fib_alias 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-ip_fib_hash 10 106 72 53 1 : tunables 120 60 8 : slabdata 2 2 0
-ip_dst_cache 29 50 384 10 1 : tunables 54 27 8 : slabdata 5 5 0
-arp_cache 4 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-RAW 65 72 832 9 2 : tunables 54 27 8 : slabdata 8 8 0
-UDP 6 18 832 9 2 : tunables 54 27 8 : slabdata 2 2 0
-tw_sock_TCP 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-request_sock_TCP 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-TCP 20 24 1664 4 2 : tunables 24 12 8 : slabdata 6 6 0
-eventpoll_pwq 126 212 72 53 1 : tunables 120 60 8 : slabdata 4 4 0
-eventpoll_epi 126 180 128 30 1 : tunables 120 60 8 : slabdata 6 6 0
-sgpool-128 2 2 4096 1 1 : tunables 24 12 8 : slabdata 2 2 0
-sgpool-64 2 2 2048 2 1 : tunables 24 12 8 : slabdata 1 1 0
-sgpool-32 2 4 1024 4 1 : tunables 54 27 8 : slabdata 1 1 0
-sgpool-16 2 8 512 8 1 : tunables 54 27 8 : slabdata 1 1 0
-sgpool-8 15 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-scsi_data_buffer 0 0 24 144 1 : tunables 120 60 8 : slabdata 0 0 0
-blkdev_integrity 0 0 112 34 1 : tunables 120 60 8 : slabdata 0 0 0
-blkdev_queue 29 30 2856 2 2 : tunables 24 12 8 : slabdata 15 15 0
-blkdev_requests 42 66 352 11 1 : tunables 54 27 8 : slabdata 5 6 0
-blkdev_ioc 5 48 80 48 1 : tunables 120 60 8 : slabdata 1 1 0
-fsnotify_event_holder 0 0 24 144 1 : tunables 120 60 8 : slabdata 0 0 0
-fsnotify_event 0 0 104 37 1 : tunables 120 60 8 : slabdata 0 0 0
-bio-0 180 180 192 20 1 : tunables 120 60 8 : slabdata 9 9 0
-biovec-256 66 66 4096 1 1 : tunables 24 12 8 : slabdata 66 66 0
-biovec-128 0 0 2048 2 1 : tunables 24 12 8 : slabdata 0 0 0
-biovec-64 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-biovec-16 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
+nf_conntrack_expect 0 0 240 16 1 : tunables 120 60 0 : slabdata 0 0 0
+nf_conntrack_ffffffff81b165c0 8 24 312 12 1 : tunables 54 27 0 : slabdata 2 2 0
+fib6_nodes 39 118 64 59 1 : tunables 120 60 0 : slabdata 2 2 0
+ip6_dst_cache 26 40 384 10 1 : tunables 54 27 0 : slabdata 4 4 0
+ndisc_cache 18 45 256 15 1 : tunables 120 60 0 : slabdata 3 3 0
+ip6_mrt_cache 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+RAWv6 4 4 1024 4 1 : tunables 54 27 0 : slabdata 1 1 0
+UDPLITEv6 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+UDPv6 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+tw_sock_TCPv6 0 0 320 12 1 : tunables 54 27 0 : slabdata 0 0 0
+request_sock_TCPv6 0 0 192 20 1 : tunables 120 60 0 : slabdata 0 0 0
+TCPv6 9 10 1856 2 1 : tunables 24 12 0 : slabdata 5 5 0
+jbd2_1k 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+avtab_node 551034 551232 24 144 1 : tunables 120 60 0 : slabdata 3828 3828 0
+ext4_inode_cache 19096 19096 1024 4 1 : tunables 54 27 0 : slabdata 4774 4774 0
+ext4_xattr 12 44 88 44 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_free_block_extents 16 67 56 67 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_alloc_context 16 28 136 28 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_prealloc_space 4 37 104 37 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_system_zone 0 0 40 92 1 : tunables 120 60 0 : slabdata 0 0 0
+jbd2_journal_handle 16 144 24 144 1 : tunables 120 60 0 : slabdata 1 1 0
+jbd2_journal_head 102 102 112 34 1 : tunables 120 60 0 : slabdata 3 3 0
+jbd2_revoke_table 4 202 16 202 1 : tunables 120 60 0 : slabdata 1 1 0
+jbd2_revoke_record 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+scsi_sense_cache 2 30 128 30 1 : tunables 120 60 0 : slabdata 1 1 0
+scsi_cmd_cache 2 15 256 15 1 : tunables 120 60 0 : slabdata 1 1 0
+dm_raid1_read_record 0 0 1064 7 2 : tunables 24 12 0 : slabdata 0 0 0
+kcopyd_job 0 0 3240 2 2 : tunables 24 12 0 : slabdata 0 0 0
+io 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+dm_uevent 0 0 2608 3 2 : tunables 24 12 0 : slabdata 0 0 0
+dm_rq_clone_bio_info 0 0 16 202 1 : tunables 120 60 0 : slabdata 0 0 0
+dm_rq_target_io 0 0 392 10 1 : tunables 54 27 0 : slabdata 0 0 0
+dm_target_io 528 720 24 144 1 : tunables 120 60 0 : slabdata 5 5 0
+dm_io 528 736 40 92 1 : tunables 120 60 0 : slabdata 8 8 0
+flow_cache 0 0 96 40 1 : tunables 120 60 0 : slabdata 0 0 0
+uhci_urb_priv 0 0 56 67 1 : tunables 120 60 0 : slabdata 0 0 0
+cfq_io_context 0 0 136 28 1 : tunables 120 60 0 : slabdata 0 0 0
+cfq_queue 0 0 240 16 1 : tunables 120 60 0 : slabdata 0 0 0
+bsg_cmd 0 0 312 12 1 : tunables 54 27 0 : slabdata 0 0 0
+mqueue_inode_cache 1 4 896 4 1 : tunables 54 27 0 : slabdata 1 1 0
+isofs_inode_cache 0 0 640 6 1 : tunables 54 27 0 : slabdata 0 0 0
+hugetlbfs_inode_cache 1 6 608 6 1 : tunables 54 27 0 : slabdata 1 1 0
+dquot 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+kioctx 0 0 384 10 1 : tunables 54 27 0 : slabdata 0 0 0
+kiocb 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+inotify_event_private_data 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+inotify_inode_mark_entry 110 136 112 34 1 : tunables 120 60 0 : slabdata 4 4 0
+dnotify_mark_entry 0 0 112 34 1 : tunables 120 60 0 : slabdata 0 0 0
+dnotify_struct 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+fasync_cache 0 0 24 144 1 : tunables 120 60 0 : slabdata 0 0 0
+khugepaged_mm_slot 18 92 40 92 1 : tunables 120 60 0 : slabdata 1 1 0
+ksm_mm_slot 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+ksm_stable_node 0 0 40 92 1 : tunables 120 60 0 : slabdata 0 0 0
+ksm_rmap_item 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+utrace_engine 0 0 56 67 1 : tunables 120 60 0 : slabdata 0 0 0
+utrace 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+pid_namespace 0 0 2120 3 2 : tunables 24 12 0 : slabdata 0 0 0
+nsproxy 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+posix_timers_cache 0 0 176 22 1 : tunables 120 60 0 : slabdata 0 0 0
+uid_cache 4 30 128 30 1 : tunables 120 60 0 : slabdata 1 1 0
+UNIX 113 115 768 5 1 : tunables 54 27 0 : slabdata 23 23 0
+ip_mrt_cache 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+UDP-Lite 0 0 832 9 2 : tunables 54 27 0 : slabdata 0 0 0
+tcp_bind_bucket 9 59 64 59 1 : tunables 120 60 0 : slabdata 1 1 0
+inet_peer_cache 3 59 64 59 1 : tunables 120 60 0 : slabdata 1 1 0
+secpath_cache 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+xfrm_dst_cache 0 0 384 10 1 : tunables 54 27 0 : slabdata 0 0 0
+ip_fib_alias 1 112 32 112 1 : tunables 120 60 0 : slabdata 1 1 0
+ip_fib_hash 14 53 72 53 1 : tunables 120 60 0 : slabdata 1 1 0
+ip_dst_cache 18 40 384 10 1 : tunables 54 27 0 : slabdata 4 4 0
+arp_cache 5 15 256 15 1 : tunables 120 60 0 : slabdata 1 1 0
+PING 0 0 832 9 2 : tunables 54 27 0 : slabdata 0 0 0
+RAW 2 9 832 9 2 : tunables 54 27 0 : slabdata 1 1 0
+UDP 1 9 832 9 2 : tunables 54 27 0 : slabdata 1 1 0
+tw_sock_TCP 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+request_sock_TCP 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+TCP 10 16 1664 4 2 : tunables 24 12 0 : slabdata 4 4 0
+eventpoll_pwq 59 106 72 53 1 : tunables 120 60 0 : slabdata 2 2 0
+eventpoll_epi 59 90 128 30 1 : tunables 120 60 0 : slabdata 3 3 0
+sgpool-128 2 2 4096 1 1 : tunables 24 12 0 : slabdata 2 2 0
+sgpool-64 2 2 2048 2 1 : tunables 24 12 0 : slabdata 1 1 0
+sgpool-32 2 4 1024 4 1 : tunables 54 27 0 : slabdata 1 1 0
+sgpool-16 2 8 512 8 1 : tunables 54 27 0 : slabdata 1 1 0
+sgpool-8 2 15 256 15 1 : tunables 120 60 0 : slabdata 1 1 0
+scsi_data_buffer 0 0 24 144 1 : tunables 120 60 0 : slabdata 0 0 0
+blkdev_integrity 0 0 112 34 1 : tunables 120 60 0 : slabdata 0 0 0
+blkdev_queue 28 28 2864 2 2 : tunables 24 12 0 : slabdata 14 14 0
+blkdev_requests 11 11 352 11 1 : tunables 54 27 0 : slabdata 1 1 0
+blkdev_ioc 4 48 80 48 1 : tunables 120 60 0 : slabdata 1 1 0
+fsnotify_event_holder 0 0 24 144 1 : tunables 120 60 0 : slabdata 0 0 0
+fsnotify_event 0 0 104 37 1 : tunables 120 60 0 : slabdata 0 0 0
+bio-0 95 140 192 20 1 : tunables 120 60 0 : slabdata 7 7 0
+biovec-256 34 34 4096 1 1 : tunables 24 12 0 : slabdata 34 34 0
+biovec-128 0 0 2048 2 1 : tunables 24 12 0 : slabdata 0 0 0
+biovec-64 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+biovec-16 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
bip-256 2 2 4224 1 2 : tunables 8 4 0 : slabdata 2 2 0
-bip-128 0 0 2176 3 2 : tunables 24 12 8 : slabdata 0 0 0
-bip-64 0 0 1152 7 2 : tunables 24 12 8 : slabdata 0 0 0
-bip-16 0 0 384 10 1 : tunables 54 27 8 : slabdata 0 0 0
-bip-4 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-bip-1 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-sock_inode_cache 667 685 704 5 1 : tunables 54 27 8 : slabdata 137 137 0
-skbuff_fclone_cache 7 7 512 7 1 : tunables 54 27 8 : slabdata 1 1 0
-skbuff_head_cache 302 450 256 15 1 : tunables 120 60 8 : slabdata 30 30 0
-file_lock_cache 38 44 176 22 1 : tunables 120 60 8 : slabdata 2 2 0
-net_namespace 0 0 2112 3 2 : tunables 24 12 8 : slabdata 0 0 0
-shmem_inode_cache 774 775 800 5 1 : tunables 54 27 8 : slabdata 155 155 0
-Acpi-Operand 4563 4664 72 53 1 : tunables 120 60 8 : slabdata 88 88 0
-Acpi-ParseExt 0 0 72 53 1 : tunables 120 60 8 : slabdata 0 0 0
-Acpi-Parse 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-Acpi-State 0 0 80 48 1 : tunables 120 60 8 : slabdata 0 0 0
-Acpi-Namespace 3311 3312 40 92 1 : tunables 120 60 8 : slabdata 36 36 0
-task_delay_info 332 340 112 34 1 : tunables 120 60 8 : slabdata 10 10 0
-taskstats 5 12 328 12 1 : tunables 54 27 8 : slabdata 1 1 0
-proc_inode_cache 1008 1008 640 6 1 : tunables 54 27 8 : slabdata 168 168 0
-sigqueue 35 48 160 24 1 : tunables 120 60 8 : slabdata 2 2 0
-bdev_cache 32 36 832 4 1 : tunables 54 27 8 : slabdata 9 9 0
-sysfs_dir_cache 11356 11367 144 27 1 : tunables 120 60 8 : slabdata 421 421 0
-mnt_cache 37 45 256 15 1 : tunables 120 60 8 : slabdata 3 3 0
-filp 4614 4700 192 20 1 : tunables 120 60 8 : slabdata 235 235 60
-inode_cache 6883 7308 592 6 1 : tunables 54 27 8 : slabdata 1218 1218 0
-dentry 61000 63960 192 20 1 : tunables 120 60 8 : slabdata 3198 3198 0
-names_cache 26 26 4096 1 1 : tunables 24 12 8 : slabdata 26 26 0
-avc_node 518 1239 64 59 1 : tunables 120 60 8 : slabdata 21 21 0
-selinux_inode_security 84086 86072 72 53 1 : tunables 120 60 8 : slabdata 1624 1624 0
-radix_tree_node 11552 11781 560 7 1 : tunables 54 27 8 : slabdata 1683 1683 0
-key_jar 11 20 192 20 1 : tunables 120 60 8 : slabdata 1 1 0
-buffer_head 220986 230214 104 37 1 : tunables 120 60 8 : slabdata 6222 6222 0
-vm_area_struct 12932 13034 200 19 1 : tunables 120 60 8 : slabdata 686 686 60
-mm_struct 145 145 1408 5 2 : tunables 24 12 8 : slabdata 29 29 0
-fs_cache 137 177 64 59 1 : tunables 120 60 8 : slabdata 3 3 0
-files_cache 162 165 704 11 2 : tunables 54 27 8 : slabdata 15 15 0
-signal_cache 204 204 1024 4 1 : tunables 54 27 8 : slabdata 51 51 0
-sighand_cache 195 195 2112 3 2 : tunables 24 12 8 : slabdata 65 65 0
-task_xstate 232 232 512 8 1 : tunables 54 27 8 : slabdata 29 29 0
-task_struct 303 303 2656 3 2 : tunables 24 12 8 : slabdata 101 101 0
-cred_jar 580 580 192 20 1 : tunables 120 60 8 : slabdata 29 29 0
-anon_vma_chain 7844 8162 48 77 1 : tunables 120 60 8 : slabdata 106 106 60
-anon_vma 5773 5888 40 92 1 : tunables 120 60 8 : slabdata 64 64 60
-pid 322 330 128 30 1 : tunables 120 60 8 : slabdata 11 11 0
-shared_policy_node 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-numa_policy 1 28 136 28 1 : tunables 120 60 8 : slabdata 1 1 0
-idr_layer_cache 428 434 544 7 1 : tunables 54 27 8 : slabdata 62 62 0
+bip-128 0 0 2176 3 2 : tunables 24 12 0 : slabdata 0 0 0
+bip-64 0 0 1152 7 2 : tunables 24 12 0 : slabdata 0 0 0
+bip-16 0 0 384 10 1 : tunables 54 27 0 : slabdata 0 0 0
+bip-4 0 0 192 20 1 : tunables 120 60 0 : slabdata 0 0 0
+bip-1 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+sock_inode_cache 159 170 704 5 1 : tunables 54 27 0 : slabdata 34 34 0
+skbuff_fclone_cache 7 7 512 7 1 : tunables 54 27 0 : slabdata 1 1 0
+skbuff_head_cache 120 240 256 15 1 : tunables 120 60 0 : slabdata 16 16 0
+file_lock_cache 20 22 176 22 1 : tunables 120 60 0 : slabdata 1 1 0
+net_namespace 0 0 2240 3 2 : tunables 24 12 0 : slabdata 0 0 0
+shmem_inode_cache 654 655 784 5 1 : tunables 54 27 0 : slabdata 131 131 0
+Acpi-Operand 1196 1219 72 53 1 : tunables 120 60 0 : slabdata 23 23 0
+Acpi-ParseExt 0 0 72 53 1 : tunables 120 60 0 : slabdata 0 0 0
+Acpi-Parse 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+Acpi-State 0 0 80 48 1 : tunables 120 60 0 : slabdata 0 0 0
+Acpi-Namespace 394 460 40 92 1 : tunables 120 60 0 : slabdata 5 5 0
+task_delay_info 111 170 112 34 1 : tunables 120 60 0 : slabdata 5 5 0
+taskstats 0 0 328 12 1 : tunables 54 27 0 : slabdata 0 0 0
+proc_inode_cache 864 864 640 6 1 : tunables 54 27 0 : slabdata 144 144 0
+sigqueue 16 24 160 24 1 : tunables 120 60 0 : slabdata 1 1 0
+bdev_cache 31 32 896 4 1 : tunables 54 27 0 : slabdata 8 8 0
+sysfs_dir_cache 7509 7533 144 27 1 : tunables 120 60 0 : slabdata 279 279 0
+mnt_cache 27 30 256 15 1 : tunables 120 60 0 : slabdata 2 2 0
+filp 960 960 192 20 1 : tunables 120 60 0 : slabdata 48 48 0
+inode_cache 5700 5700 592 6 1 : tunables 54 27 0 : slabdata 950 950 0
+dentry 148569 148600 192 20 1 : tunables 120 60 0 : slabdata 7430 7430 0
+names_cache 2 2 4096 1 1 : tunables 24 12 0 : slabdata 2 2 0
+avc_node 528 708 64 59 1 : tunables 120 60 0 : slabdata 12 12 0
+selinux_inode_security 26537 26659 72 53 1 : tunables 120 60 0 : slabdata 503 503 0
+radix_tree_node 2820 2828 560 7 1 : tunables 54 27 0 : slabdata 404 404 0
+key_jar 8 20 192 20 1 : tunables 120 60 0 : slabdata 1 1 0
+buffer_head 27588 28416 104 37 1 : tunables 120 60 0 : slabdata 768 768 0
+vm_area_struct 2869 2869 200 19 1 : tunables 120 60 0 : slabdata 151 151 0
+mm_struct 51 55 1408 5 2 : tunables 24 12 0 : slabdata 11 11 0
+fs_cache 54 118 64 59 1 : tunables 120 60 0 : slabdata 2 2 0
+files_cache 55 88 704 11 2 : tunables 54 27 0 : slabdata 8 8 0
+signal_cache 101 112 1088 7 2 : tunables 24 12 0 : slabdata 16 16 0
+sighand_cache 101 102 2112 3 2 : tunables 24 12 0 : slabdata 34 34 0
+task_xstate 60 72 512 8 1 : tunables 54 27 0 : slabdata 9 9 0
+task_struct 106 108 2656 3 2 : tunables 24 12 0 : slabdata 36 36 0
+cred_jar 285 300 192 20 1 : tunables 120 60 0 : slabdata 15 15 0
+anon_vma_chain 1926 2464 48 77 1 : tunables 120 60 0 : slabdata 32 32 0
+anon_vma 1348 1656 40 92 1 : tunables 120 60 0 : slabdata 18 18 0
+pid 113 180 128 30 1 : tunables 120 60 0 : slabdata 6 6 0
+shared_policy_node 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+numa_policy 0 0 136 28 1 : tunables 120 60 0 : slabdata 0 0 0
+idr_layer_cache 271 273 544 7 1 : tunables 54 27 0 : slabdata 39 39 0
size-4194304(DMA) 0 0 4194304 1 1024 : tunables 1 1 0 : slabdata 0 0 0
size-4194304 0 0 4194304 1 1024 : tunables 1 1 0 : slabdata 0 0 0
size-2097152(DMA) 0 0 2097152 1 512 : tunables 1 1 0 : slabdata 0 0 0
@@ -307,36 +249,36 @@ size-524288 0 0 524288 1 128 : tunables 1 1 0 : sla
size-262144(DMA) 0 0 262144 1 64 : tunables 1 1 0 : slabdata 0 0 0
size-262144 0 0 262144 1 64 : tunables 1 1 0 : slabdata 0 0 0
size-131072(DMA) 0 0 131072 1 32 : tunables 8 4 0 : slabdata 0 0 0
-size-131072 1 1 131072 1 32 : tunables 8 4 0 : slabdata 1 1 0
+size-131072 0 0 131072 1 32 : tunables 8 4 0 : slabdata 0 0 0
size-65536(DMA) 0 0 65536 1 16 : tunables 8 4 0 : slabdata 0 0 0
size-65536 2 2 65536 1 16 : tunables 8 4 0 : slabdata 2 2 0
size-32768(DMA) 0 0 32768 1 8 : tunables 8 4 0 : slabdata 0 0 0
size-32768 3 3 32768 1 8 : tunables 8 4 0 : slabdata 3 3 0
size-16384(DMA) 0 0 16384 1 4 : tunables 8 4 0 : slabdata 0 0 0
-size-16384 11 11 16384 1 4 : tunables 8 4 0 : slabdata 11 11 0
+size-16384 7 7 16384 1 4 : tunables 8 4 0 : slabdata 7 7 0
size-8192(DMA) 0 0 8192 1 2 : tunables 8 4 0 : slabdata 0 0 0
-size-8192 27 27 8192 1 2 : tunables 8 4 0 : slabdata 27 27 0
-size-4096(DMA) 0 0 4096 1 1 : tunables 24 12 8 : slabdata 0 0 0
-size-4096 425 425 4096 1 1 : tunables 24 12 8 : slabdata 425 425 0
-size-2048(DMA) 0 0 2048 2 1 : tunables 24 12 8 : slabdata 0 0 0
-size-2048 578 578 2048 2 1 : tunables 24 12 8 : slabdata 289 289 0
-size-1024(DMA) 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-size-1024 1304 1304 1024 4 1 : tunables 54 27 8 : slabdata 326 326 0
-size-512(DMA) 0 0 512 8 1 : tunables 54 27 8 : slabdata 0 0 0
-size-512 1123 1176 512 8 1 : tunables 54 27 8 : slabdata 147 147 0
-size-256(DMA) 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-size-256 870 870 256 15 1 : tunables 120 60 8 : slabdata 58 58 0
-size-192(DMA) 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-size-192 2119 2160 192 20 1 : tunables 120 60 8 : slabdata 108 108 0
-size-128(DMA) 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-size-64(DMA) 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-size-64 33003 40887 64 59 1 : tunables 120 60 8 : slabdata 693 693 0
-size-32(DMA) 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-size-128 3921 4800 128 30 1 : tunables 120 60 8 : slabdata 160 160 0
-size-32 332359 332976 32 112 1 : tunables 120 60 8 : slabdata 2973 2973 0
-kmem_cache 191 191 32896 1 16 : tunables 8 4 0 : slabdata 191 191 0
+size-8192 12 12 8192 1 2 : tunables 8 4 0 : slabdata 12 12 0
+size-4096(DMA) 0 0 4096 1 1 : tunables 24 12 0 : slabdata 0 0 0
+size-4096 115 115 4096 1 1 : tunables 24 12 0 : slabdata 115 115 0
+size-2048(DMA) 0 0 2048 2 1 : tunables 24 12 0 : slabdata 0 0 0
+size-2048 206 206 2048 2 1 : tunables 24 12 0 : slabdata 103 103 0
+size-1024(DMA) 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+size-1024 584 584 1024 4 1 : tunables 54 27 0 : slabdata 146 146 0
+size-512(DMA) 0 0 512 8 1 : tunables 54 27 0 : slabdata 0 0 0
+size-512 584 584 512 8 1 : tunables 54 27 0 : slabdata 73 73 0
+size-256(DMA) 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+size-256 775 795 256 15 1 : tunables 120 60 0 : slabdata 53 53 0
+size-192(DMA) 0 0 192 20 1 : tunables 120 60 0 : slabdata 0 0 0
+size-192 1119 1140 192 20 1 : tunables 120 60 0 : slabdata 57 57 0
+size-128(DMA) 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+size-64(DMA) 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+size-64 19262 20650 64 59 1 : tunables 120 60 0 : slabdata 350 350 0
+size-32(DMA) 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+size-128 3817 3930 128 30 1 : tunables 120 60 0 : slabdata 131 131 0
+size-32 352187 352688 32 112 1 : tunables 120 60 0 : slabdata 3149 3149 0
+kmem_cache 182 182 32896 1 16 : tunables 8 4 0 : slabdata 182 182 0
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- lo:267102759 105357 0 0 0 0 0 0 267102759 105357 0 0 0 0 0 0
- eth0:1013756074 1354469 0 0 0 0 0 0 245526499 966773 0 0 0 0 0 0
- pan0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ lo: 7419513 35803 0 0 0 0 0 0 7419513 35803 0 0 0 0 0 0
+ eth0:585891249 8311833 0 0 0 0 0 0 163695619 110073 0 0 0 0 0 0
+ eth1:163385408 637834 0 0 0 0 0 0 2289952 35156 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.com/CA/secmod.db b/test/aux-fixed/exim-ca/example.com/CA/secmod.db
index c7f115b..f8cc0e7 100644
Binary files a/test/aux-fixed/exim-ca/example.com/CA/secmod.db and b/test/aux-fixed/exim-ca/example.com/CA/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
index f8f9275..93c9d72 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.com/CN=clica CA
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAwWhcNMzgw
-MTAxMTIzNDAwWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxYR8NYQvEd7/e4MvOj9dh2+o
-mnywT9ajMo1589DWt2z14ouRKhSZWlx4O4AicPZc6n4uvt7++t0tTHhmm5JIbwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBALjVd1KMBadFJFIzTEspoPYxJvXKvLMclekQs5QY0lmmUj5+
-ugITEG6ywu3s+REUB+8Dj+ofQz3tgIm9NBpkfsA=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
+MTAxMTIzNDAxWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALw3TIYMk4w2ob6o1TFb
+FT5sDY4HL+9uHWZfPh6dF1ILu04KVgEb0SqP/LnHLcviH6NG0G9EsiDTdG31Svuq
+xx5CrqyW+rs1pYb5NjS8mpnp3A0e2YvoWhBrfwY3+OQo193JnNDDxC5fD+bkq1P6
+LIwI72HF4/YBqGuOSGm2G34TAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAC1/IueycXMDP6mSC862
+YU584GqXCxUaxO+5X9J7qnqsBEuNCvBwnfCuPAjo+MVftpV9rghBNUvujyisBQ62
+u/q7iuEsm2Oo7LlfZ/tQbAPqBbHCSnsS4+q+rdkNz0xPpiF87p9HbG5xA0motcUT
+cIF38qe4aoHWHF7EsPgKUDbr
-----END CERTIFICATE-----
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: C3 70 0A 4C 75 DB 50 B7 1F 67 60 9C DC AD 17 A3 C0 65 5F FF
+ localKeyID: C6 54 3D 15 33 26 1F 85 58 37 5E 12 C5 4B CB 9F E6 EC A1 34
subject=/CN=expired1.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTEyMTIwMTEyMzQwMVowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuhbGp8Jqy4UZdYGiPLl+q1m4
-dBdrY6689kqn5x5FUZ4PNl9ty9+mnC2Dx5WiYbrOybQZViM9lAIvGRI1GKsHdwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUuY29tMA0GCSqGSIb3DQEBBQUAA0EAkrXPLW+etluRGUilUcMsAWEZJ8Syu317
-kXvPuyjNVz3+lGo/4hzhehSusTzy4+22UgsBmgZpjG+uI8tNRmDnAQ==
+MzQwM1oXDTEyMTIwMTEyMzQwM1owHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGE/KgstC+6lmLQzUCs
+zdgjlZj5cDw0rp0vpHdf/4nqUNOnia67EQCBVvvPgL9IUsD42KTqub8WTGJ+Ti6Z
+PsRWTIWBVfrHM2rJ6HppTQs4y8OiNas5rXJnGpu0E5RJIiiWK1BkaELBX6YDBlho
+ZFFV499MqtoZYk63k6VXogY1AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAlb9q
+okquamR7BnFLorpGo0Q7Wxs5IVQAHzbfJ/OGbm9uWpnhGENhxvU063e2VXVJbF2v
+agUHBGxszX0w0RLjXls+ZwWiD/evVvJ0l97NQ6C0sMmHMLuRXhZLmOHOI8LMCKQv
++N9MuJbiVVrwy7WrdKUz4WDS+Veo66gYSGV3jZ0=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
index 29784ae..c235285 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
index fe5dcdf..c16cb51 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: C3 70 0A 4C 75 DB 50 B7 1F 67 60 9C DC AD 17 A3 C0 65 5F FF
+ localKeyID: C6 54 3D 15 33 26 1F 85 58 37 5E 12 C5 4B CB 9F E6 EC A1 34
subject=/CN=expired1.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTEyMTIwMTEyMzQwMVowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuhbGp8Jqy4UZdYGiPLl+q1m4
-dBdrY6689kqn5x5FUZ4PNl9ty9+mnC2Dx5WiYbrOybQZViM9lAIvGRI1GKsHdwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUuY29tMA0GCSqGSIb3DQEBBQUAA0EAkrXPLW+etluRGUilUcMsAWEZJ8Syu317
-kXvPuyjNVz3+lGo/4hzhehSusTzy4+22UgsBmgZpjG+uI8tNRmDnAQ==
+MzQwM1oXDTEyMTIwMTEyMzQwM1owHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGE/KgstC+6lmLQzUCs
+zdgjlZj5cDw0rp0vpHdf/4nqUNOnia67EQCBVvvPgL9IUsD42KTqub8WTGJ+Ti6Z
+PsRWTIWBVfrHM2rJ6HppTQs4y8OiNas5rXJnGpu0E5RJIiiWK1BkaELBX6YDBlho
+ZFFV499MqtoZYk63k6VXogY1AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAlb9q
+okquamR7BnFLorpGo0Q7Wxs5IVQAHzbfJ/OGbm9uWpnhGENhxvU063e2VXVJbF2v
+agUHBGxszX0w0RLjXls+ZwWiD/evVvJ0l97NQ6C0sMmHMLuRXhZLmOHOI8LMCKQv
++N9MuJbiVVrwy7WrdKUz4WDS+Veo66gYSGV3jZ0=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
index ecfb0cb..312ac1c 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: C3 70 0A 4C 75 DB 50 B7 1F 67 60 9C DC AD 17 A3 C0 65 5F FF
+ localKeyID: C6 54 3D 15 33 26 1F 85 58 37 5E 12 C5 4B CB 9F E6 EC A1 34
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBnjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQINZM2aHxF3EcCAggA
-MBQGCCqGSIb3DQMHBAjc9XMhJPg/ZwSCAVicoTPaeGXGPJyPdhflErlI9EWbj0PH
-bv8AchovLDfYq1Q4EJzkUG1XyelHNha+BS/zFxCcmtpdQtXedL/SdXsOyM99wdJH
-tjpJyWxM3bysqDUdhv2g11KTG0M9L7RBtKmbQq0zcHf9oTZbABKSe4EzX6a9khJY
-5bRVBSQPNtj3/5aAr0BOQQnythh0880FcYmvbFmZQNR12Cexc0+X0/aTaQ/LhM1y
-8GlRBFXGACP+mrY4RfEk/EatcGmqn4JCVASF7Z7zu7JKsEskLDArF9nvVh2xN22n
-DugUfQDRPph4ug2MyUcKNSZzGs+khWmS2TgPgUV0gr1tqS4Sqo+59NuZInyGSMRn
-FeiFTSYcd+zmxinF20MCs+Y6fFasErs6/zdK5oeV8pMlTCX0/yky9Ye4kfth2oHl
-UV+Rfe2Bo40wn6QkxuptagYdoDTJrMUCH9WL/ODRn4IA1Q==
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIZ7oddrWXYk0CAggA
+MBQGCCqGSIb3DQMHBAgyw+PxiMXbfwSCAoCJs8edW5MnlAboAlXblPxI6NkTUzyN
+IVUY/8atgVpTOvF0a4YQAq580jw8TA2u0xzggDGyDhp6MnxqQgKRGkEkeWUVug0G
+67FwJRE2aeJwFD7oKUUGviKl46ReTpJR/maZHhS7AknifzkQzoHPhWLWn8MQ264Q
+/V2qv7F+pnJtofQwZnLWG3BGHWlJsj1i9qtwDEZmR9Zg0PLQZ5w+NnsXR1QGNnjL
+H/NoiVybJBXn7keAFfyPP4IhbHB+HXr4P8JP/7VIj09sXVAi1REF4x4bwaQD991R
+eSNSZ8JU1hTLVFnICEebKq5w13vuqo1TdHIwVNih+pvz2YmAC9qYexcTRPyU6rSr
+ZuxF2K1/PsBpI61cKYlM9X26uCDsz7u0mHpNSR5NBu7x+iCCx8ar0W4w7mQ4bG/6
+gPUgYTRR9xLdvOjZdKbRalZ+xBIICtvECG0lIJvtyylSp0A2fO0DuzIRTPZ2T1JA
+NxBVgBFnMAGYe6bIW46xBJLT9jTV+7geARJFO5MkmtXyYB0zhUE9LlVNbuX0FDfx
+DJRIGRxQPqjMFEzZC/PAjXMGwMUcAcNKmGPtyjknspmnGzERQlKC3yxdxqZaegWM
+G/ty1eYnPBT7aynCGK92WycIFK9B8UTC7V7rJPl0F6LD2+/hAi01v/HsljWXjdo9
++qCtPTyUvmvv5Jdg3vDbrzYZXvPoq1fv9ZLybN9ffnOPJUTCirDnq7x9bmHVYvQp
+0hJNzh1kJLvlqwBQPmiTXlv/a2NxXMK+qsVKIlLfNHyx8M3XrVM/H/D+HlOFsyCr
+7FLLHBx0hxUjwsNYSfbqlV7Svect/UEoxziTiXd0C/jrirSsoU6+kzwn
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
index d7ba631..52f4a3d 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
index 3714a90..6edc0a9 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
index 37b83a6..b264878 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
index 4a25940..bfe9e42 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
index 488e3e5..4bde4fc 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12 and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
index d30bbe0..f4e7277 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: C3 70 0A 4C 75 DB 50 B7 1F 67 60 9C DC AD 17 A3 C0 65 5F FF
+ localKeyID: C6 54 3D 15 33 26 1F 85 58 37 5E 12 C5 4B CB 9F E6 EC A1 34
subject=/CN=expired1.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTEyMTIwMTEyMzQwMVowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuhbGp8Jqy4UZdYGiPLl+q1m4
-dBdrY6689kqn5x5FUZ4PNl9ty9+mnC2Dx5WiYbrOybQZViM9lAIvGRI1GKsHdwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUuY29tMA0GCSqGSIb3DQEBBQUAA0EAkrXPLW+etluRGUilUcMsAWEZJ8Syu317
-kXvPuyjNVz3+lGo/4hzhehSusTzy4+22UgsBmgZpjG+uI8tNRmDnAQ==
+MzQwM1oXDTEyMTIwMTEyMzQwM1owHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGE/KgstC+6lmLQzUCs
+zdgjlZj5cDw0rp0vpHdf/4nqUNOnia67EQCBVvvPgL9IUsD42KTqub8WTGJ+Ti6Z
+PsRWTIWBVfrHM2rJ6HppTQs4y8OiNas5rXJnGpu0E5RJIiiWK1BkaELBX6YDBlho
+ZFFV499MqtoZYk63k6VXogY1AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAlb9q
+okquamR7BnFLorpGo0Q7Wxs5IVQAHzbfJ/OGbm9uWpnhGENhxvU063e2VXVJbF2v
+agUHBGxszX0w0RLjXls+ZwWiD/evVvJ0l97NQ6C0sMmHMLuRXhZLmOHOI8LMCKQv
++N9MuJbiVVrwy7WrdKUz4WDS+Veo66gYSGV3jZ0=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
index 9754e14..45432ce 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBALoWxqfCasuFGXWBojy5fqtZuHQXa2OuvPZKp+ceRVGeDzZfbcvf
-ppwtg8eVomG6zsm0GVYjPZQCLxkSNRirB3cCAwEAAQJAbb0wuY21XP/I27ru6dCa
-GoJ2fD+zXL2XQccU7P608kO6R9g73lx48QT21OGvLkKGA4J2U3qqvqJWKP580o3X
-gQIhAN8A4PM0w3cLBnibnQcr+5TfhSUye/4AQcaqUQBnjQW5AiEA1Z+eWtugFdR3
-D6ntc4UdyXsO1DMDn6QyuyEyrJqUDq8CIGGfrtqJVLB+gRy3cuy60m3/0/fOu/0b
-+6+Oy9sTeebxAiBK7m5RWHBSt+/7YpOTzcGhBrUw4aQHv0S8Nuzbdm0wqQIgYW0B
-7KVyChX6OpKifrdrSK3Jp3iXP9pgNunxGNj1QbM=
+MIICXQIBAAKBgQDBhPyoLLQvupZi0M1ArM3YI5WY+XA8NK6dL6R3X/+J6lDTp4mu
+uxEAgVb7z4C/SFLA+Nik6rm/Fkxifk4umT7EVkyFgVX6xzNqyeh6aU0LOMvDojWr
+Oa1yZxqbtBOUSSIolitQZGhCwV+mAwZYaGRRVePfTKraGWJOt5OlV6IGNQIDAQAB
+AoGAahPPuw/mJVOOI9R47j7LBvNaiWQR1a67GIaJDLaeiKbcb2ii3BjGlRRQ7e8s
+j63BTu4ZMy1HbCt463R4vqpZ8KlFWFnKV0XydCZY3UY0Nq/eGFPImhGHZeNdpmxC
+N2aDkJuVTI2qdv4vFUrUlwnGCZWt8BaNB9sjapEryxcKn/ECQQDrjKWW6eQqWzzI
+ASOtbmcStNTwlvZJd9K6J4kDaqK0o9lmepWzNIePehsSEeRjdZMhhlju1Nnb8T7L
+ijeXzcLzAkEA0lItZb4WqunWb38oOJEaL5N3uwxhHprDJOZ2EnRpfmjhTpqxuHpN
+0WwWmakLj74PyWtdkqzv59jzCutE2n9MNwJBAKBkazUyGs3ExsSiEfs8nC8et4kE
+IrywPOvJlAChkh1THOwtONaIRG6shNZvHIelPgSsCM7IXXjo8wuCGIzj7YUCQAH6
+E8MpDj19BS73GwGtG3nnAPEZJLCM89ic8e8qePNfOP7sJU9+lsypH21CUYGAX9Wc
+1LxUM80SFPa9T2BeYfECQQDe1c0qv6aLdzHyAaPGwXZiC2SP1ZTyinJFHWxrE560
+5EbZRmxa6kXuW9QN+Hqj1nns7cYNOpnsnOYDz/7zoLSC
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
index 706f876..94626c0 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db
index db5dae7..5ab9cbd 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
index cb3f975..5b30f43 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.com/CN=clica CA
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAwWhcNMzgw
-MTAxMTIzNDAwWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxYR8NYQvEd7/e4MvOj9dh2+o
-mnywT9ajMo1589DWt2z14ouRKhSZWlx4O4AicPZc6n4uvt7++t0tTHhmm5JIbwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBALjVd1KMBadFJFIzTEspoPYxJvXKvLMclekQs5QY0lmmUj5+
-ugITEG6ywu3s+REUB+8Dj+ofQz3tgIm9NBpkfsA=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
+MTAxMTIzNDAxWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALw3TIYMk4w2ob6o1TFb
+FT5sDY4HL+9uHWZfPh6dF1ILu04KVgEb0SqP/LnHLcviH6NG0G9EsiDTdG31Svuq
+xx5CrqyW+rs1pYb5NjS8mpnp3A0e2YvoWhBrfwY3+OQo193JnNDDxC5fD+bkq1P6
+LIwI72HF4/YBqGuOSGm2G34TAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAC1/IueycXMDP6mSC862
+YU584GqXCxUaxO+5X9J7qnqsBEuNCvBwnfCuPAjo+MVftpV9rghBNUvujyisBQ62
+u/q7iuEsm2Oo7LlfZ/tQbAPqBbHCSnsS4+q+rdkNz0xPpiF87p9HbG5xA0motcUT
+cIF38qe4aoHWHF7EsPgKUDbr
-----END CERTIFICATE-----
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 00 5E 8C 89 32 69 66 73 D9 E7 D3 9C E8 6A 72 27 1D C2 65 87
+ localKeyID: 9A 47 FF B9 55 D0 E1 29 4F 98 F8 D3 37 56 E7 89 14 5A DB 04
subject=/CN=expired2.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDJaFw0xMjEyMDExMjM0MDJaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANs6ryDCjUepqaS5l0ZmpJ3m
-bU0/nDE43cIfDCU+70Jjvf4rxfiQu1N1iiTO2IdRcxai/STBGxpaJRvo/G5l778C
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUuY29tLzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAANBABTJbEBMPo/NbiMz+shKPbN+T+oAoneT
-mb1n+3cM5I3RGkkzF8mYDyamimNn+T8GKWdVkiM/Jov1kv+KY5Twg+U=
+MjM0MDRaFw0xMjEyMDExMjM0MDRaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/e35jEeUADll58QXg
+WR+j3CfNDKMGjBVCSoPNqqPxzDSFgWsNhaPBiFMNmFLH+J3EM9pCAHnrmiS230Av
+mxCVf/NkecaiYTi5UfgzDxIPNgARO+6sLyFXajmrv70nIIqB85LahJVhjldmcjUQ
+APG/fyCUodKomCLaNqZB/xRfbwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBABQR
+zbDziROz2buA9OZ2lxkkt9afOmRDGUh/5XmpYrmNJp07DDYVEPaiAv5EHwnp0ceL
+mJOAFwMMP6CzOsN/Gh0pR7VEdfxM259LzeOiwK5OX7bY8y0fcvVzLdqNAX0l8YWK
+Pu2EycfVje1jaJlMNcDGazNtnq0Fx0ZXm8KFVV8F
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
index 1f5daa2..aa952f2 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
index 153025b..26b789b 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 00 5E 8C 89 32 69 66 73 D9 E7 D3 9C E8 6A 72 27 1D C2 65 87
+ localKeyID: 9A 47 FF B9 55 D0 E1 29 4F 98 F8 D3 37 56 E7 89 14 5A DB 04
subject=/CN=expired2.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDJaFw0xMjEyMDExMjM0MDJaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANs6ryDCjUepqaS5l0ZmpJ3m
-bU0/nDE43cIfDCU+70Jjvf4rxfiQu1N1iiTO2IdRcxai/STBGxpaJRvo/G5l778C
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUuY29tLzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAANBABTJbEBMPo/NbiMz+shKPbN+T+oAoneT
-mb1n+3cM5I3RGkkzF8mYDyamimNn+T8GKWdVkiM/Jov1kv+KY5Twg+U=
+MjM0MDRaFw0xMjEyMDExMjM0MDRaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/e35jEeUADll58QXg
+WR+j3CfNDKMGjBVCSoPNqqPxzDSFgWsNhaPBiFMNmFLH+J3EM9pCAHnrmiS230Av
+mxCVf/NkecaiYTi5UfgzDxIPNgARO+6sLyFXajmrv70nIIqB85LahJVhjldmcjUQ
+APG/fyCUodKomCLaNqZB/xRfbwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBABQR
+zbDziROz2buA9OZ2lxkkt9afOmRDGUh/5XmpYrmNJp07DDYVEPaiAv5EHwnp0ceL
+mJOAFwMMP6CzOsN/Gh0pR7VEdfxM259LzeOiwK5OX7bY8y0fcvVzLdqNAX0l8YWK
+Pu2EycfVje1jaJlMNcDGazNtnq0Fx0ZXm8KFVV8F
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
index 4390919..e65ea8d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 00 5E 8C 89 32 69 66 73 D9 E7 D3 9C E8 6A 72 27 1D C2 65 87
+ localKeyID: 9A 47 FF B9 55 D0 E1 29 4F 98 F8 D3 37 56 E7 89 14 5A DB 04
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI0nrN9i220lwCAggA
-MBQGCCqGSIb3DQMHBAjYbPQkuir8nQSCAWANYVbKcEW9iaRzdj6AmMMZw4wnklZI
-rR+R/Eaz92xDWHLv9Qo03JK2OoGgkhE3QvyNxP7Sm69hgErN202M1s7CW66HAt60
-T0XmvbZoXYkn3iPzi6Txi1GQnzo7gfd1S0phD/4q+Tq38nRzJjvHjsL1ebjiFZ2y
-t5cF+gW7+3LEKT/s0K/WpS6QKTgl/W5iV09Tix1eOPckv7z4Cs2fiurohPocUTFa
-B/hdKTun4MwmcchFrgjRda+jz/P42xtgaSmhIETD+C3jnbdEZWFY4xYijyffEUR0
-gUHKH6UPxqoJyeL8ziQmz2jc4j1glnedslHjS+fKlLCU1QKYbhgCcRB4tqILxd9M
-e3/QQksgTFZtGymqPuwPMngcR2Om+E3f0UJnCXcaINJp971l971H/yhieYjxQua4
-8NNKVdz6EzYa/46Gv77Nu7+OQ0zGhMowpjGS4kTE9qOQ3udrdL2kFYJm
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIEsk9NRmaS34CAggA
+MBQGCCqGSIb3DQMHBAg+Aio5ErYv1wSCAoCLiC2t9piJlfQgYQrHGxtMNavOCNBU
+BDHDud+huPQOfoppX/lfQibRv0UB4cLZu0nf75QEV0EveedrtHkroRoKgTTDzEjd
+A8MlwENz7nrGTmM1qSE2ZQ2KMqbK/QIne4z3WmdGyjCJ53jvhzpasdZG+RZMbL/P
+mnsYXuDyWKkKkGx0USgyx/sImQnvyJEz3/lDv4M9Ch7xicb9dEuwZjZqcQGwgThM
+uI26sjZQ84uHmSuoz7FnfjU21E5Hry+itFwzcnqE9EEDAtbU9kiPGlYiJtUXRo18
+NPTEkic4t3RUUkKMzrufJot7VI31XZPtIiJKhvb3vUFuCCYWX0RqkUGJAXgGm0gn
+CgA6rmbGOSQkz7ouv6D29x9yuRv46rK/zDsPWcqE9BStHdhusslW5d0Y6kTena31
+G1z9vPy3uRrAeSAunjDGdJMle50ies9dsFNl7ojJVW+RJcLjCAU61tRTfDg/VFAb
+LTxkbpUVCNE9s1P1TZQnO2YXwHo1PRG/CoH52eEdqQGFZ3I6SsU8kIy4+FHDGcLS
+5IrBZc4H4faCjy7mWzy96pthnWeXSyiAZ2DlPeZperRy9sFMLVGwEsBpCOxSDTRm
+lvH1ulshOREX/NCVqvxzbUJCDfrM9DCNKHGb6ILqL/rAVYJQMKSHHEemimQ6UhVb
+W/nsXfbZD2vxDO2bh/nLhzucqFQ2t4sM3e3Ts0NLXgfW69pTlcfC8m9mkskxEuLL
+ftoFJaAx1uKnr58sDUINsNfu7mTSSfx31G4rP0GTui8VxPFJHIoAaJ7zigjqQ0M/
+8mPrYoDJ0IyIq3nCPAYMD1o/st8c/KFBdqs/mvGMtAdigpTedaY2hWhy
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
index 5690dfa..58e86ed 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
index db5b8e0..ee60889 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
index 0242fc4..1385236 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
index db5b8e0..ee60889 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
index d8327d3..2708f07 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12 and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
index 91a46f9..d3199f3 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 00 5E 8C 89 32 69 66 73 D9 E7 D3 9C E8 6A 72 27 1D C2 65 87
+ localKeyID: 9A 47 FF B9 55 D0 E1 29 4F 98 F8 D3 37 56 E7 89 14 5A DB 04
subject=/CN=expired2.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDJaFw0xMjEyMDExMjM0MDJaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANs6ryDCjUepqaS5l0ZmpJ3m
-bU0/nDE43cIfDCU+70Jjvf4rxfiQu1N1iiTO2IdRcxai/STBGxpaJRvo/G5l778C
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUuY29tLzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAANBABTJbEBMPo/NbiMz+shKPbN+T+oAoneT
-mb1n+3cM5I3RGkkzF8mYDyamimNn+T8GKWdVkiM/Jov1kv+KY5Twg+U=
+MjM0MDRaFw0xMjEyMDExMjM0MDRaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/e35jEeUADll58QXg
+WR+j3CfNDKMGjBVCSoPNqqPxzDSFgWsNhaPBiFMNmFLH+J3EM9pCAHnrmiS230Av
+mxCVf/NkecaiYTi5UfgzDxIPNgARO+6sLyFXajmrv70nIIqB85LahJVhjldmcjUQ
+APG/fyCUodKomCLaNqZB/xRfbwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBABQR
+zbDziROz2buA9OZ2lxkkt9afOmRDGUh/5XmpYrmNJp07DDYVEPaiAv5EHwnp0ceL
+mJOAFwMMP6CzOsN/Gh0pR7VEdfxM259LzeOiwK5OX7bY8y0fcvVzLdqNAX0l8YWK
+Pu2EycfVje1jaJlMNcDGazNtnq0Fx0ZXm8KFVV8F
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
index cc0620b..450c7ea 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBANs6ryDCjUepqaS5l0ZmpJ3mbU0/nDE43cIfDCU+70Jjvf4rxfiQ
-u1N1iiTO2IdRcxai/STBGxpaJRvo/G5l778CAwEAAQJAads7RulKSMkuxgBrgC39
-3NSwAHXvmIDp61sMhUuPQhF8kxF9IistHoa4TBW3tdSVepBSDoMk0Ote+0UgO3wK
-SQIhAPC8xBwjNC+gpnaxOvz2iLGbVwISPgM/TMaa+goBJ3o1AiEA6SDVyZi34Gia
-W0YYzmQaJv2VcmGYh0JQ+diJT7qaoKMCIQCfZy6nvvu4KbTv1MzNYWUDzWsgePnM
-5qYsv8OeykLcnQIgU4JDkrd2Bpjx0ghGEoihJZ5ozlRPgwQqZZU/eqPph+kCIBAd
-MOImezJcizVRRG9PuyxuSvwLlPqjvFKnw2ixRkuW
+MIICXQIBAAKBgQC/e35jEeUADll58QXgWR+j3CfNDKMGjBVCSoPNqqPxzDSFgWsN
+haPBiFMNmFLH+J3EM9pCAHnrmiS230AvmxCVf/NkecaiYTi5UfgzDxIPNgARO+6s
+LyFXajmrv70nIIqB85LahJVhjldmcjUQAPG/fyCUodKomCLaNqZB/xRfbwIDAQAB
+AoGAX0E13F7YhrCcvlayT6rGXKN2gUDaELW7FaEv9C4BJJYrQobhFHb4wZvphQfT
+lnsNML+CwfausA+cWASzT3taQccICmk/ua/7mRQ+Picm4OaXS4So/qHdtNJQ30GJ
+lnFXLzpmtSqc+iBYo2iqgYdSlQU+YbGVad6vqjTAzCVNBxECQQD4cS1Docp3dMDO
+PQ5/+EJL3zco4HP7yjxsdsEOv0Np+iHpSO4QaPZc0V/CD26lkIldaTI2n9o4kq6C
+7+T11F21AkEAxU65jJiwRvI+Zq7Ty5Io5nu7t8bRA8zGN8bEirKKCGdBk5wj8X6o
+XjZz+0c8jP1T6K6dK3XuhQ24vclr9GafEwJBAPXPrRRsoRG+UAH+wTj2nknJih8E
+rV0kRNKgUPXRYdcaaLETupA7+f3uHwu4Dyb7Mh5dNhR75wLwhoAA8Y4VV70CQBEz
+IKep88vreBcZbGsVja0x4hZOJZBQPINGN4HjuHatEaFdfiCiKukzk/62ogekWbkx
+54+PU0CUBqO8uEVw4LMCQQCoN/70R5BrbZptJpCXNu+UkvtIcNDWcRTNuNsyoM9w
+xOdMe2hoQ24H5QsaZi8ferImInTj9KjBNHD7/EDjVcxM
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
index 9bce6fa..485af4a 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/secmod.db
index a21c55f..2461ab3 100644
Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/secmod.db and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
index ea68b96..eacaea2 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.com/CN=clica CA
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAwWhcNMzgw
-MTAxMTIzNDAwWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxYR8NYQvEd7/e4MvOj9dh2+o
-mnywT9ajMo1589DWt2z14ouRKhSZWlx4O4AicPZc6n4uvt7++t0tTHhmm5JIbwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBALjVd1KMBadFJFIzTEspoPYxJvXKvLMclekQs5QY0lmmUj5+
-ugITEG6ywu3s+REUB+8Dj+ofQz3tgIm9NBpkfsA=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
+MTAxMTIzNDAxWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALw3TIYMk4w2ob6o1TFb
+FT5sDY4HL+9uHWZfPh6dF1ILu04KVgEb0SqP/LnHLcviH6NG0G9EsiDTdG31Svuq
+xx5CrqyW+rs1pYb5NjS8mpnp3A0e2YvoWhBrfwY3+OQo193JnNDDxC5fD+bkq1P6
+LIwI72HF4/YBqGuOSGm2G34TAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAC1/IueycXMDP6mSC862
+YU584GqXCxUaxO+5X9J7qnqsBEuNCvBwnfCuPAjo+MVftpV9rghBNUvujyisBQ62
+u/q7iuEsm2Oo7LlfZ/tQbAPqBbHCSnsS4+q+rdkNz0xPpiF87p9HbG5xA0motcUT
+cIF38qe4aoHWHF7EsPgKUDbr
-----END CERTIFICATE-----
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 33 F8 A9 1F FC 62 68 49 CC C9 26 E0 24 22 40 40 B5 8E E6 07
+ localKeyID: E4 A8 BB 0E D4 30 78 BC 99 8F 4E 74 F8 09 C5 19 D2 1E F9 21
subject=/CN=revoked1.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTM4MDEwMTEyMzQwMVowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAtmfFkNpuJsl8xF0EINs9YniA
-h0NKsf8Tt61IVzDsR5ULJOSpA7rcqmbniYuWJ7H1q8Rm5WTqjLs5zIKG+cR/lwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFHJldm9rZWQxLmV4YW1w
-bGUuY29tMA0GCSqGSIb3DQEBBQUAA0EAXzFO3fDq0RRzNgmAa9aorYUQUx1f6ifG
-e9zS1V/Qua9HguY4FCm5NkLDSA46OA/NYEtnC3tDNF6PLSNi1Ww9NQ==
+MzQwM1oXDTM4MDEwMTEyMzQwM1owHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJyP2TKYS5c5gpvpUL2/
+5ybdWw9Kyg7lvQHqJ1P0gitOpYjan8rR/I5+ljCwJWn7uVlFt4EYUoggH6ocXCbj
+ptPg3akFf+h3dxQsvPYZzSOdYXzjVi7dDM0OrkDz9+Qc1Vg1Hub8H4Kw7N97pr9K
+Vj28va58tG8+rxl35ZHaQF2RAgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHwYDVR0R
+BBgwFoIUcmV2b2tlZDEuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAaDHc
+baJdEiTf7hfy94/jBJ3mPt57p9ZLrHXJZPWyCa8uJBavQ7dksqsvhoFc+VSXBnal
+78sGOIgvABpEaBnOdJQ2+VRzoCnVIRxM7NazRUXJWRY9U1fsxwnxxpWUYl4Fl9Cq
+b0GHPG7FBe+uhHxK+0UkzQ/WC9j5wiDOXjMLjQA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
index d74575f..e9d5f4c 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
index a35bc26..7b7ec5b 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
index abb2b6c..c80f02f 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 33 F8 A9 1F FC 62 68 49 CC C9 26 E0 24 22 40 40 B5 8E E6 07
+ localKeyID: E4 A8 BB 0E D4 30 78 BC 99 8F 4E 74 F8 09 C5 19 D2 1E F9 21
subject=/CN=revoked1.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTM4MDEwMTEyMzQwMVowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAtmfFkNpuJsl8xF0EINs9YniA
-h0NKsf8Tt61IVzDsR5ULJOSpA7rcqmbniYuWJ7H1q8Rm5WTqjLs5zIKG+cR/lwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFHJldm9rZWQxLmV4YW1w
-bGUuY29tMA0GCSqGSIb3DQEBBQUAA0EAXzFO3fDq0RRzNgmAa9aorYUQUx1f6ifG
-e9zS1V/Qua9HguY4FCm5NkLDSA46OA/NYEtnC3tDNF6PLSNi1Ww9NQ==
+MzQwM1oXDTM4MDEwMTEyMzQwM1owHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJyP2TKYS5c5gpvpUL2/
+5ybdWw9Kyg7lvQHqJ1P0gitOpYjan8rR/I5+ljCwJWn7uVlFt4EYUoggH6ocXCbj
+ptPg3akFf+h3dxQsvPYZzSOdYXzjVi7dDM0OrkDz9+Qc1Vg1Hub8H4Kw7N97pr9K
+Vj28va58tG8+rxl35ZHaQF2RAgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHwYDVR0R
+BBgwFoIUcmV2b2tlZDEuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAaDHc
+baJdEiTf7hfy94/jBJ3mPt57p9ZLrHXJZPWyCa8uJBavQ7dksqsvhoFc+VSXBnal
+78sGOIgvABpEaBnOdJQ2+VRzoCnVIRxM7NazRUXJWRY9U1fsxwnxxpWUYl4Fl9Cq
+b0GHPG7FBe+uhHxK+0UkzQ/WC9j5wiDOXjMLjQA=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
index 0507231..70b48ca 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 33 F8 A9 1F FC 62 68 49 CC C9 26 E0 24 22 40 40 B5 8E E6 07
+ localKeyID: E4 A8 BB 0E D4 30 78 BC 99 8F 4E 74 F8 09 C5 19 D2 1E F9 21
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBnjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIxIBGy/hgXxwCAggA
-MBQGCCqGSIb3DQMHBAj96WZ8xRBC6QSCAVjQ7DTLCFeVW0ah1ECV+1bvGiQy9JwH
-fxHD3s2Wg7+McsAfF2oSx8R0Za7miR70Ke94xrraIuH0NeltyalI5iQOjbGe1W8V
-exnRfXI+87W9QHVI85TW2l6pXCR96cj6zrxQAhXFamDY/SfgwTbaQibrduD2eoct
-IvJ8QsaywSKwpnQAN/4XlQ6aus7w1ywtvFek+15oAfgACG/mXaZZa9sg/pRzHT3a
-8qJjMpJSDOd5QUxKIShidYPNKA88EIvdg9+0wNj42w9A4rAwaoqol4RzdLu8dXbG
-lGjiRdGwkMvlwnAWY68hPnAPOiH8ev7lNPkOkk+YsIVoJK7AoEGyvNk2N02kaBBf
-xfrHIt8jh8Suvfp0HJbdeBTTT1qu/acwNbeA2TVVXdXyoZTrSWiwmv4P0lBYXJIx
-raWLqaaImi5JvL1o5ATr3s8RtD+0iWH5LUuWdzI/agJKUw==
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIIxD77sqGF+sCAggA
+MBQGCCqGSIb3DQMHBAjbGBdlEtiDaQSCAoDk3CvR49FBFqadjIGtEZ5FvKXImnuN
+va3HBdVV4UZ8TyllghJdiDe/Nk2Un44mUejU8fK1vHlm2gZnQaaC0IO+egRf1fTU
+we0f1k5mYJ8lJCc51ZKKo8tlt/S4ahvIjjFS0CfZD1kD5FZshIEfh2I6PBxtCpeD
+CjWCWVHAbPv+KVtfMIAAYywDgZtwpMTbOWHf4BatICRxKMQgf8sk2+qnPc+gWZMd
+EdYUYxzpZPGTMfR95BBxjrC/S0kuF9Ay1kXtXdfOPk6PSuHXKGASikYkDjrLnDs3
+vuGwxk935tc9fsKgp4QCA36Jmc6d0l3ULlJC3yYeWm+ewtnTlf2olefQMqrWWM/n
+iPF9QLkbtWQm4ExL1+G9O7mCOFUGq/YDe4L3FM3570D0JRB59Bky3kWMl5y4jZmN
+bFcki/2Y8cVu9FFunYAZ62J5pmFzrZ5usIA0fJk//fEMUcTOqOZfsbRFDYc+MyaZ
+ctdMV/hAK/X39FuS/C13je9oBsmhH6iH8oZ2QpBvZikPQGL2zEKkl09jhLPUq4s4
+zNMqGAMV3W808xewKfqSYVGHgzA9aTwg1O79+tiywOitAYqiph7tM3ZUmsKlyGC8
+iJThJZmaANNrwqwpz/jxiknBQyzTa+eJPiantN7MU0XslK8dj1bjGw/LJwai0Oea
+miGFoYLnF+Irol6y1I6UgeHvyhaHzfeprt7e08CWvWHPRcYHY8IYQko15wSizd3T
+wRdbi3xSjHuPtmJAFXcJtHJXR/jxcGdDCWGp2lp2E5XJ/pUnwFiZLFXCvBttmsaM
+zkZncGHSNO8Gy4HG4DQC8tPvSh19S4RUz2twRe/fJkX1tuErmb9BbXRT
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
index 6924826..1777f25 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
index ed8cdb3..ccda1a7 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
index c16dc37..c928a6e 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
index 76a2e14..853c475 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
index bcc39e5..cd225ae 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12 and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
index ada2bfd..1884b67 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 33 F8 A9 1F FC 62 68 49 CC C9 26 E0 24 22 40 40 B5 8E E6 07
+ localKeyID: E4 A8 BB 0E D4 30 78 BC 99 8F 4E 74 F8 09 C5 19 D2 1E F9 21
subject=/CN=revoked1.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTM4MDEwMTEyMzQwMVowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAtmfFkNpuJsl8xF0EINs9YniA
-h0NKsf8Tt61IVzDsR5ULJOSpA7rcqmbniYuWJ7H1q8Rm5WTqjLs5zIKG+cR/lwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFHJldm9rZWQxLmV4YW1w
-bGUuY29tMA0GCSqGSIb3DQEBBQUAA0EAXzFO3fDq0RRzNgmAa9aorYUQUx1f6ifG
-e9zS1V/Qua9HguY4FCm5NkLDSA46OA/NYEtnC3tDNF6PLSNi1Ww9NQ==
+MzQwM1oXDTM4MDEwMTEyMzQwM1owHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJyP2TKYS5c5gpvpUL2/
+5ybdWw9Kyg7lvQHqJ1P0gitOpYjan8rR/I5+ljCwJWn7uVlFt4EYUoggH6ocXCbj
+ptPg3akFf+h3dxQsvPYZzSOdYXzjVi7dDM0OrkDz9+Qc1Vg1Hub8H4Kw7N97pr9K
+Vj28va58tG8+rxl35ZHaQF2RAgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHwYDVR0R
+BBgwFoIUcmV2b2tlZDEuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAaDHc
+baJdEiTf7hfy94/jBJ3mPt57p9ZLrHXJZPWyCa8uJBavQ7dksqsvhoFc+VSXBnal
+78sGOIgvABpEaBnOdJQ2+VRzoCnVIRxM7NazRUXJWRY9U1fsxwnxxpWUYl4Fl9Cq
+b0GHPG7FBe+uhHxK+0UkzQ/WC9j5wiDOXjMLjQA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
index f124bcc..f354c47 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBALZnxZDabibJfMRdBCDbPWJ4gIdDSrH/E7etSFcw7EeVCyTkqQO6
-3Kpm54mLliex9avEZuVk6oy7OcyChvnEf5cCAwEAAQJALGjPfRjxQJhFvDk5TBaU
-t2jHQidsBDIqRsn1luTeYf7KVwL5p51LV27UBqIF+UPa3Wl04rc5IWSCp5CIpASa
-IQIhAN6Ekj/LESey/9nn85fDMUH45PgW/7J+NeqwgK6zoyulAiEA0doPRY/U2ano
-Hu94mggwB693XasYuRsSsGZWK1+nCYsCIF1BXjGSH0xt/kAKr9IoodouP3eh2+Oo
-dVw4QJX2/ylpAiAZUYjUKLVSiZhS2yue0ewRkU8CgxkZhDWuCLrOwtyhXwIgJr3H
-b3LNAipslDnHrNzBK2GB6MlM7/+foJ7Lu7pbK+o=
+MIICXAIBAAKBgQCcj9kymEuXOYKb6VC9v+cm3VsPSsoO5b0B6idT9IIrTqWI2p/K
+0fyOfpYwsCVp+7lZRbeBGFKIIB+qHFwm46bT4N2pBX/od3cULLz2Gc0jnWF841Yu
+3QzNDq5A8/fkHNVYNR7m/B+CsOzfe6a/SlY9vL2ufLRvPq8Zd+WR2kBdkQIDAQAB
+AoGAZOonwv/9gV1Vfa+3FofSs+9sWYAIm++jk89dSDVLjiSkeIELDI2rsCGSJ5Hy
+m8zgnNVeQfzufcXPAzRCheKpTdj42Hwp22aJ/jknulGrICnne3//7coSoT4bgP9U
+AaVntX3CZCj5UUwx2FVrjiYYC4tcetISflj83A41jNMqSp0CQQDMQMrJRkw3/HPE
+Qe2PHu1lT2RpyetZ0v8QysYUYb21OJESiNlSyfkXgZsCMqEipke/KJAA6kKqjtDn
+fCIgfAmzAkEAxDn1C7L66VyNJ2/hOIzhwIq7qpWRPxhCedncoY+Dp/5ad53/ra0n
+ZBtWLLIx3WaJuqdde1bh/8o4/r7tV7sRqwJADg2DJjf09IElAeK7UnaBRNAii3i9
+/Y8bx278E9jpsXcz2/+YXC7TOX/MR2luVrD0DL3gsn9rmMp8qwCKZIvEKwJBAJbl
+LsBRYUvlBRMHoP0YsV2cEdaK78fCQxRq6ZQ/xXGBUlZb5MrMtdbwgqMaYOgtusoT
+e/qmBGLsQkn7zo5BZ8MCQAzu3rZkcCVNctWHuziJgVVpzDIIJrwc8hQd1QxCzwWZ
+ZLApQN00kn4730iWE8ZYBgVXZ58d/ME+hGtu7o753zM=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/secmod.db
index f95ff68..783e9a8 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/secmod.db and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
index d9830bc..0d09ec3 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.com/CN=clica CA
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAwWhcNMzgw
-MTAxMTIzNDAwWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxYR8NYQvEd7/e4MvOj9dh2+o
-mnywT9ajMo1589DWt2z14ouRKhSZWlx4O4AicPZc6n4uvt7++t0tTHhmm5JIbwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBALjVd1KMBadFJFIzTEspoPYxJvXKvLMclekQs5QY0lmmUj5+
-ugITEG6ywu3s+REUB+8Dj+ofQz3tgIm9NBpkfsA=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
+MTAxMTIzNDAxWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALw3TIYMk4w2ob6o1TFb
+FT5sDY4HL+9uHWZfPh6dF1ILu04KVgEb0SqP/LnHLcviH6NG0G9EsiDTdG31Svuq
+xx5CrqyW+rs1pYb5NjS8mpnp3A0e2YvoWhBrfwY3+OQo193JnNDDxC5fD+bkq1P6
+LIwI72HF4/YBqGuOSGm2G34TAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAC1/IueycXMDP6mSC862
+YU584GqXCxUaxO+5X9J7qnqsBEuNCvBwnfCuPAjo+MVftpV9rghBNUvujyisBQ62
+u/q7iuEsm2Oo7LlfZ/tQbAPqBbHCSnsS4+q+rdkNz0xPpiF87p9HbG5xA0motcUT
+cIF38qe4aoHWHF7EsPgKUDbr
-----END CERTIFICATE-----
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 17 78 A2 B6 AD CE 30 23 61 D1 78 DA EF AD AC 2D 72 C6 16 34
+ localKeyID: 23 B0 07 BC A3 EA 80 08 FC 26 A1 DB 6B EB 75 86 F3 FC AA F3
subject=/CN=revoked2.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDJaFw0zODAxMDExMjM0MDJaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
-bGUuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALl7NO1x6uz5p6etz9g+bD4n
-/s5Wh/XGDL1IHD78fRFFX9B8dCyoMrzjFTIz8QkOr/sA4RD2B2uk83ZnqtNImY0C
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUuY29tLzAfBgNVHREEGDAWghRyZXZva2VkMi5leGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAANBAKtwWm1WtnL+jH97DwIutT6s4CkIY2uY
-JkpV4segUV03S1pN9Cnamy4prQYPCfOI1BQO4krsDNOoV/PtDvqxuso=
+MjM0MDRaFw0zODAxMDExMjM0MDRaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
+bGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpL02ZJJWr/Ls2jGoP
+s8d6sgPSHV8jcseUohCCuwDoyMbCtCs0GqdOkOmTk+7sMYbysyKljt+cABE7HXiW
+Ht4jbz3+9mex0eepOGWDIcz2RxAl4wp+3p7bdeOMqHX5jH2C3HauFc/RPaDEMJ6L
+95x7rtYEfh0XxM4wEgniLt6JMQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1Ud
+EQQYMBaCFHJldm9rZWQyLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBAMG8
+5BVe792b8hTVp+vrFYIPa3FoJCyYdwlc9/3w3Aii6xEr/gSRyC/KF2cORYOinkHN
+R5K68zQhAT9bDFeneZnow/VHduv7qUmSGDq2Ew5NfX7bl5DKT/eEZdHXdLWZbVo2
+lMOHsKimg3+3yNcTjD3hh0gQ9KXOHgsxgvovqRAg
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
index 45ca163..9bbdd37 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
index 4976f14..806239d 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
index ecdf2a5..18ad66c 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 17 78 A2 B6 AD CE 30 23 61 D1 78 DA EF AD AC 2D 72 C6 16 34
+ localKeyID: 23 B0 07 BC A3 EA 80 08 FC 26 A1 DB 6B EB 75 86 F3 FC AA F3
subject=/CN=revoked2.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDJaFw0zODAxMDExMjM0MDJaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
-bGUuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALl7NO1x6uz5p6etz9g+bD4n
-/s5Wh/XGDL1IHD78fRFFX9B8dCyoMrzjFTIz8QkOr/sA4RD2B2uk83ZnqtNImY0C
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUuY29tLzAfBgNVHREEGDAWghRyZXZva2VkMi5leGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAANBAKtwWm1WtnL+jH97DwIutT6s4CkIY2uY
-JkpV4segUV03S1pN9Cnamy4prQYPCfOI1BQO4krsDNOoV/PtDvqxuso=
+MjM0MDRaFw0zODAxMDExMjM0MDRaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
+bGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpL02ZJJWr/Ls2jGoP
+s8d6sgPSHV8jcseUohCCuwDoyMbCtCs0GqdOkOmTk+7sMYbysyKljt+cABE7HXiW
+Ht4jbz3+9mex0eepOGWDIcz2RxAl4wp+3p7bdeOMqHX5jH2C3HauFc/RPaDEMJ6L
+95x7rtYEfh0XxM4wEgniLt6JMQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1Ud
+EQQYMBaCFHJldm9rZWQyLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBAMG8
+5BVe792b8hTVp+vrFYIPa3FoJCyYdwlc9/3w3Aii6xEr/gSRyC/KF2cORYOinkHN
+R5K68zQhAT9bDFeneZnow/VHduv7qUmSGDq2Ew5NfX7bl5DKT/eEZdHXdLWZbVo2
+lMOHsKimg3+3yNcTjD3hh0gQ9KXOHgsxgvovqRAg
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
index 41e2717..d37cf15 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 17 78 A2 B6 AD CE 30 23 61 D1 78 DA EF AD AC 2D 72 C6 16 34
+ localKeyID: 23 B0 07 BC A3 EA 80 08 FC 26 A1 DB 6B EB 75 86 F3 FC AA F3
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIFV1GIQOsrw4CAggA
-MBQGCCqGSIb3DQMHBAgtBn7nWaro7ASCAWArJ92GA0suBbeIF2CisKcYFfGP+KD5
-LUOKocnSVgVeEvjQmoLzb/YAnXQsh3HtfHjbsJg1Hix4XIRI6skZD33JhhQZha/0
-M8QsA3GBCPcskjQCIMg0FVltjZOVnR20JxlI0HtMybZrIlhNCcWrLkVhU8CRbzFc
-Pubs7P9xIxlfuWVAEBmlOb1LkctHKnWlvVDR4Bef7epwa/KttSmLbBHuayQiwvms
-axUke+NYJvzFWfKpTXP0OHOfz7cdb5dN/BcF642LIGu2f7nY7vGbSG9+iZ4Mb85k
-FBbuSFquqAdxho6IHL7p/xfsW3k8+o6jKhCqkFaY1O1TNLmNtyJSyULDEbJMBiBF
-Q0pLC3AF6EtPDvN7gIvlY6jERZb7j8DJrCnjbEJR1IF09DrH3EdfaYLnGd+0/SRn
-UPY0jNEmT8hwj1ANacuSlBaIXYSjtjDYwJTz4DJA36z+03TDo/ahxwaW
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI0d0Zn9u4hdYCAggA
+MBQGCCqGSIb3DQMHBAiWwYqUTtXcowSCAoBGMcnUwk86R6ZGYxqoDAJwP2DVJRO/
++qdLTmBGGVu0eInL89aomA/okmVGxbVv7smtsEzXLvJRuvqggB0tT8Wx+kJmaiHy
+5PmJxOeOvTwSMXc6rhLlWA2m6BiI69JVKv8taJmXdXjYhEtHRMu2FIQzJz6ZupWP
+Nfvpsz7AHIT0Nnn6KeY/1GWYchiGhmf41aNOsJxapbSI5H2V4/RjIUmctENjUBQ1
+f3nNAFWrpbt9LoikVqM701dZnBsc70i+VdFEXirs3XIJlV5ZIgBR3j3yCwu2rolV
++3wVV7hJqYOp+NjRSWur3lbaD2gzJ2Bp++HofGLf+lYcTMItv8a1rEeVDCxQWVyv
+5Dv0IHPoYPv66WHrlnjqFmK1lE7R5CADLJq1kVZM9bKfVGrkLk8CxdHiNnx70xLy
+KpVGlX5RruoJHWSy3g9AlzaP621gyYXP45dfqqJ//nTMlxrNVJrMIk8lxttLD/LE
+LYvVW+tkHxJSVtJQ2tAVvdNdkgvVAmjv1JthVG1qIxTaEluYOFKD8BnCe1x5TDtP
+F0XWOL+hDVToDtMfhINPOVUjHmm2+q08P3QHwvU7YDgV+jNySHyLCYxte9t5XxU+
+eUmASXsl/sPareGOGt8Jt47mQuXufl0g7woyNrI9tiOrEuaDC4e2ivhvGVELkRGu
+pDOCjTKA39qPOsBgxygMP5c49OmziAe7HOJLQZb8+kbv+x4q/AvlJZ8LEvCRsSVB
+xaQ/Pkbz48eAB8kyruTL4Hz2j120T9/YgXhnPuRNk0BAfk/CKcI6aMmepOmzkWe8
+S1F2ZszcT15j2JvNEu/608ZnyHHpc8ARa65Jrhm9IWVvrxEcY+fc9ix6
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
index 2d46e90..f0b748a 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
index 4651403..c70aceb 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
index 78aa197..d199416 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
index 4651403..c70aceb 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
index d94652e..a863f36 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12 and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
index 529be66..7b64d36 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 17 78 A2 B6 AD CE 30 23 61 D1 78 DA EF AD AC 2D 72 C6 16 34
+ localKeyID: 23 B0 07 BC A3 EA 80 08 FC 26 A1 DB 6B EB 75 86 F3 FC AA F3
subject=/CN=revoked2.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDJaFw0zODAxMDExMjM0MDJaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
-bGUuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALl7NO1x6uz5p6etz9g+bD4n
-/s5Wh/XGDL1IHD78fRFFX9B8dCyoMrzjFTIz8QkOr/sA4RD2B2uk83ZnqtNImY0C
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUuY29tLzAfBgNVHREEGDAWghRyZXZva2VkMi5leGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAANBAKtwWm1WtnL+jH97DwIutT6s4CkIY2uY
-JkpV4segUV03S1pN9Cnamy4prQYPCfOI1BQO4krsDNOoV/PtDvqxuso=
+MjM0MDRaFw0zODAxMDExMjM0MDRaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
+bGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpL02ZJJWr/Ls2jGoP
+s8d6sgPSHV8jcseUohCCuwDoyMbCtCs0GqdOkOmTk+7sMYbysyKljt+cABE7HXiW
+Ht4jbz3+9mex0eepOGWDIcz2RxAl4wp+3p7bdeOMqHX5jH2C3HauFc/RPaDEMJ6L
+95x7rtYEfh0XxM4wEgniLt6JMQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1Ud
+EQQYMBaCFHJldm9rZWQyLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBAMG8
+5BVe792b8hTVp+vrFYIPa3FoJCyYdwlc9/3w3Aii6xEr/gSRyC/KF2cORYOinkHN
+R5K68zQhAT9bDFeneZnow/VHduv7qUmSGDq2Ew5NfX7bl5DKT/eEZdHXdLWZbVo2
+lMOHsKimg3+3yNcTjD3hh0gQ9KXOHgsxgvovqRAg
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
index 9c8a59b..30b5ac6 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBALl7NO1x6uz5p6etz9g+bD4n/s5Wh/XGDL1IHD78fRFFX9B8dCyo
-MrzjFTIz8QkOr/sA4RD2B2uk83ZnqtNImY0CAwEAAQJBAKkeAI07YDOAEnCd1zPY
-/sLRns+uMDtUwArZs/9uIe7a3X4ussXCv60z9epuGre7StXrVyDGBnGqGexsKIiH
-uaECIQDzrY97z+Zcb1RZ/ncQfiep40jMGmpDX/un+wtfkeICWQIhAMLcSIgL/FTH
-t7ehuH5pClcJY0bX0tbOpfNgOWvMniJVAiEAyrYMkewOb8Dxg/gLJn48ErkP2zLy
-SWA0orZV7MgYIukCIBcGcIui3u4lq0/HjEVjpBUkxtZYKlG3mWRoumBCjW0BAiEA
-tqIijH5G06iofDnTIJzXFfetUPNl/wqJ1Xz6ECFh84s=
+MIICWwIBAAKBgQCpL02ZJJWr/Ls2jGoPs8d6sgPSHV8jcseUohCCuwDoyMbCtCs0
+GqdOkOmTk+7sMYbysyKljt+cABE7HXiWHt4jbz3+9mex0eepOGWDIcz2RxAl4wp+
+3p7bdeOMqHX5jH2C3HauFc/RPaDEMJ6L95x7rtYEfh0XxM4wEgniLt6JMQIDAQAB
+AoGAGTiuDsh/b5ZLqoQgQ5r/f/EN1MMALd6sliHa6EJMjmdwChKl5iybCIFd8Nw6
+4Ac6IPBHl/rGpxDzgKaSFX8gilW0Z4fvQzZJPomF8Q0SPslKyj7NTlwONBi3Ddmu
+nitKjyZ4wfVHQ+DT5GvAQ7S5DNiGjkPlDKTyWJdeK0DuOoECQQDWu6NOJbdG0mVO
+EbO7jIQX+tVmWJKSFeju4FFDoLmOMFCoxH173FCBYs7UvZx0JTRoIS2nglpCJjYK
+w+9tN0b5AkEAybLM8tyzmSsLWZJDIuB+4M0B1l9NQ/pmoi5LW7PEUbY0baikDKJm
+ytEUcdGK6/6nFZDeUgl1ZpfmfRzmC6nJ+QJAa2JuqngGDa7N5prHrTT6IhvYeFQ3
+CENYt40KVq2b3dWfoKaSskxdHjdRg+ZGxXaNnL1q3Wg8xvPg9sVBiPap0QJAeuL2
+HW27+rEQDDWhs8klZF9jJDISSD1ydJNSFH/1N3eUf89Ei/ISQLWcCDCLvHb9Y5VM
+7pyWq7gWlNmbizWaOQJAUhPRkTvHoxURzTxf52Ky6J2nMETCx5SeghHR13e56JlJ
+k3Y2abavSFG7mVGQeb1iOAVB8byypZmcLj+8lyTI6g==
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/secmod.db
index b7f2179..3413d56 100644
Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/secmod.db and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
index 5bb0677..b5db1d3 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.com/CN=clica CA
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAwWhcNMzgw
-MTAxMTIzNDAwWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxYR8NYQvEd7/e4MvOj9dh2+o
-mnywT9ajMo1589DWt2z14ouRKhSZWlx4O4AicPZc6n4uvt7++t0tTHhmm5JIbwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBALjVd1KMBadFJFIzTEspoPYxJvXKvLMclekQs5QY0lmmUj5+
-ugITEG6ywu3s+REUB+8Dj+ofQz3tgIm9NBpkfsA=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
+MTAxMTIzNDAxWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALw3TIYMk4w2ob6o1TFb
+FT5sDY4HL+9uHWZfPh6dF1ILu04KVgEb0SqP/LnHLcviH6NG0G9EsiDTdG31Svuq
+xx5CrqyW+rs1pYb5NjS8mpnp3A0e2YvoWhBrfwY3+OQo193JnNDDxC5fD+bkq1P6
+LIwI72HF4/YBqGuOSGm2G34TAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAC1/IueycXMDP6mSC862
+YU584GqXCxUaxO+5X9J7qnqsBEuNCvBwnfCuPAjo+MVftpV9rghBNUvujyisBQ62
+u/q7iuEsm2Oo7LlfZ/tQbAPqBbHCSnsS4+q+rdkNz0xPpiF87p9HbG5xA0motcUT
+cIF38qe4aoHWHF7EsPgKUDbr
-----END CERTIFICATE-----
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 7B 32 26 98 D0 B8 1E 75 99 29 DC F8 13 EE 29 B7 59 E3 DC DC
+ localKeyID: 07 9B A8 A4 C0 6F 68 15 5D BA 46 46 6D 1B F0 19 F0 BA 38 3F
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAjCCAaygAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIIChzCCAfCgAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTM4MDEwMTEyMzQwMVowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
-LmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC6EbKf3ZB2Zm+SVn7KzSofX5I+
-3KANkvS0aVxUS/mtnKJg6JLKc2dVav1OmPTF/M8J21F6tVd8EHWBrlsgS3QdAgMB
-AAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUu
-Y29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRw
-Oi8vb3NjcC9leGFtcGxlLmNvbS8wHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-LmNvbTANBgkqhkiG9w0BAQUFAANBALDva+1Fm8VMNtBTzLmk0wd+rAGNry/HPB++
-vNngBR33/8N/529Zr4WPrL2BeOZkQeDO1qH/2giCAvYfZoBOIO4=
+MzQwMloXDTM4MDEwMTEyMzQwMlowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
+LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvefViDa0YRwyCthPwVWt
+E5dQxXu63SXsVVsBV4UuumZjFV+iH3gFQl3D1qBS2Zi/DnXY70liWgr04XXl5Vvg
+toElwTYJ5MJKd46etdvp7nNvqELxUG7kpjuvhzaQ766NsveOiSLBsuO4oa5Ct+jP
+43oSvG366ZeCW/pu6M51xiECAwEAAaOBvzCBvDAOBgNVHQ8BAf8EBAMCBPAwIAYD
+VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOG
+IWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQo
+MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwL2V4YW1wbGUuY29tLzAeBgNVHREE
+FzAVghNzZXJ2ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBAIgkFVmL
+tPjBPMHmbQ7+S587xcyjNHKIFTuRCOJr/eVMtj+mMkpjm0b1l59B5VvZ2voijjb+
+SJY7KaWmQGp/a8c/LgSzv8Ui1WUe66upFaMKa27iagDd+GE0WYNg9M3dOoLQjerq
+1lsMu8qcTa/VoQ7MUfmGCRdlrP6lJuAMjG2m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
index 9d730fe..5528723 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db and b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
index 672b088..9fb98ff 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db and b/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/secmod.db
index 0883379..f037d51 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/secmod.db and b/test/aux-fixed/exim-ca/example.com/server1.example.com/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
index 6ea0a52..e0450d4 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 7B 32 26 98 D0 B8 1E 75 99 29 DC F8 13 EE 29 B7 59 E3 DC DC
+ localKeyID: 07 9B A8 A4 C0 6F 68 15 5D BA 46 46 6D 1B F0 19 F0 BA 38 3F
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAjCCAaygAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIIChzCCAfCgAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTM4MDEwMTEyMzQwMVowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
-LmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC6EbKf3ZB2Zm+SVn7KzSofX5I+
-3KANkvS0aVxUS/mtnKJg6JLKc2dVav1OmPTF/M8J21F6tVd8EHWBrlsgS3QdAgMB
-AAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUu
-Y29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRw
-Oi8vb3NjcC9leGFtcGxlLmNvbS8wHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-LmNvbTANBgkqhkiG9w0BAQUFAANBALDva+1Fm8VMNtBTzLmk0wd+rAGNry/HPB++
-vNngBR33/8N/529Zr4WPrL2BeOZkQeDO1qH/2giCAvYfZoBOIO4=
+MzQwMloXDTM4MDEwMTEyMzQwMlowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
+LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvefViDa0YRwyCthPwVWt
+E5dQxXu63SXsVVsBV4UuumZjFV+iH3gFQl3D1qBS2Zi/DnXY70liWgr04XXl5Vvg
+toElwTYJ5MJKd46etdvp7nNvqELxUG7kpjuvhzaQ766NsveOiSLBsuO4oa5Ct+jP
+43oSvG366ZeCW/pu6M51xiECAwEAAaOBvzCBvDAOBgNVHQ8BAf8EBAMCBPAwIAYD
+VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOG
+IWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQo
+MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwL2V4YW1wbGUuY29tLzAeBgNVHREE
+FzAVghNzZXJ2ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBAIgkFVmL
+tPjBPMHmbQ7+S587xcyjNHKIFTuRCOJr/eVMtj+mMkpjm0b1l59B5VvZ2voijjb+
+SJY7KaWmQGp/a8c/LgSzv8Ui1WUe66upFaMKa27iagDd+GE0WYNg9M3dOoLQjerq
+1lsMu8qcTa/VoQ7MUfmGCRdlrP6lJuAMjG2m
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
index 02d5161..e8b2cd2 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 7B 32 26 98 D0 B8 1E 75 99 29 DC F8 13 EE 29 B7 59 E3 DC DC
+ localKeyID: 07 9B A8 A4 C0 6F 68 15 5D BA 46 46 6D 1B F0 19 F0 BA 38 3F
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBnjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIt+n3xYebFlACAggA
-MBQGCCqGSIb3DQMHBAi30QtCXj3kIQSCAVjO+WdU7jaPYN1v7ev2qNehi8MrvllJ
-Q03/xCaiGTI7fUQM55W4Tc5+b952ni6ZtCnYfCojIQ6Wr0uyrabRE9nCRTudKAGv
-+RG/vO576Wv69XblZaKwPp1ru5Fb+TqMRDmHsJKzmjx4/iN3l/673w8QEW+opYjI
-i+azRCzMjUcFDkExEqXunJCDD4k0iWv/LTiXa/WfKoPncY6dmtjGt/ceGG7gn+sy
-IGTPbVyX85I4lfSb42mQjticlqpNWNv+BasZNGIAGkreGEIR1HqvoIeIjyze4j/k
-yAA/oAO7WucowZfX6Rcno9yO5Cjsbn60RPMe5aSnCKXH8OnaklegbzQCIXwlRapH
-VCE28ladQ1+7zwCBhCW60WwhRN0UDQz9aFTrbhZ0uUZ13t/EcRr17f43hXnjwCVg
-+q6ixyRnx4zSncCTL6iOe2ybUV8IXCFdrWnd7CYJOz804w==
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIQmNIxR8+DtACAggA
+MBQGCCqGSIb3DQMHBAhYfBxLYDX4bwSCAoAwu8a1DteY/quE8ZlvIhwMgWUxxVXL
+tF5aCbVI8hJo3OLkPu9Zit5sS1aiPOrY6iwmMgnhtn0NkEWc5HynqvEXHyBn3e4L
+FbUxux3z044DTmqSQVbOuN9/lOxnYphj1iEv/GuwvyD6emicRQdE6/ibJMXelKnO
+jR2F/9AlBtZbq35LO+NekkymgXodYlW4IxFOOBljT4aXsu0V+aYwRU5ofqXGUcV3
+RioBmC9gurwO5rPoW+WCIaYHqiqwA8BrixifciC7gs0cK/PflgrKjm8uqGLtQtsn
+yKSqez5Tl1IObQqxzyoNObed1GaV2KH2iHjzJ3hW3bZ5mKn+XItydnuGdzTdtFqO
+JQa2AU+O1NpKtALd2y+TEp1UEptEBPg6TGRir/p+aCQRU257KmATmFfVx4JgqJGa
+oTDUqgCjkDikyVhSLXW9Kft410QEcDkGSZfQ+n/aBg3LcyYGRRTa/mZMvxXbGFdZ
+l2UIt76Egx60LQLaUb8btL6cArZ4ZYyY3QUczClAxErw9YbsnAruQTR1FImPOcjw
+B0mRHGm9nhh/ERH5tD6PvGe05Okdr9ev8n8GU+0AR+Jxsm6+3kuY+WtQ5mJvl9SO
+poIMjBD7rJKsOAyHrddAfryrXjSVUXVmNou1iY1Vnug1LloR9HhdkkT4UUIAecYa
+xcnQakJf0fYw4QFfWqphZD/NaCpGvWtReNVNFxR/tPQ+gRKorl8wpW2anpcgIlvS
+t0HPnOYI6GqHYS/HE3lM2CGJOH7ZGgRI/KFzbCYZF5BjX9bLsZD5RJXVdVlyc9jq
+0tuzA4zbhDL/xJbEbl+6tAzrBw8gUj1lDIt2DJ2AdYJLHgM7SCGgX3j+
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
index 0e35bdf..36bff2b 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
index c616136..6ed229e 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
index fb9674a..7651faa 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
index aa6d371..ebe49c3 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
index e7f3cfb..7130974 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12 and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
index 5080ef8..75cc689 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 7B 32 26 98 D0 B8 1E 75 99 29 DC F8 13 EE 29 B7 59 E3 DC DC
+ localKeyID: 07 9B A8 A4 C0 6F 68 15 5D BA 46 46 6D 1B F0 19 F0 BA 38 3F
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAjCCAaygAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIIChzCCAfCgAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTM4MDEwMTEyMzQwMVowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
-LmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC6EbKf3ZB2Zm+SVn7KzSofX5I+
-3KANkvS0aVxUS/mtnKJg6JLKc2dVav1OmPTF/M8J21F6tVd8EHWBrlsgS3QdAgMB
-AAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUu
-Y29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRw
-Oi8vb3NjcC9leGFtcGxlLmNvbS8wHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-LmNvbTANBgkqhkiG9w0BAQUFAANBALDva+1Fm8VMNtBTzLmk0wd+rAGNry/HPB++
-vNngBR33/8N/529Zr4WPrL2BeOZkQeDO1qH/2giCAvYfZoBOIO4=
+MzQwMloXDTM4MDEwMTEyMzQwMlowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
+LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvefViDa0YRwyCthPwVWt
+E5dQxXu63SXsVVsBV4UuumZjFV+iH3gFQl3D1qBS2Zi/DnXY70liWgr04XXl5Vvg
+toElwTYJ5MJKd46etdvp7nNvqELxUG7kpjuvhzaQ766NsveOiSLBsuO4oa5Ct+jP
+43oSvG366ZeCW/pu6M51xiECAwEAAaOBvzCBvDAOBgNVHQ8BAf8EBAMCBPAwIAYD
+VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOG
+IWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQo
+MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwL2V4YW1wbGUuY29tLzAeBgNVHREE
+FzAVghNzZXJ2ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBAIgkFVmL
+tPjBPMHmbQ7+S587xcyjNHKIFTuRCOJr/eVMtj+mMkpjm0b1l59B5VvZ2voijjb+
+SJY7KaWmQGp/a8c/LgSzv8Ui1WUe66upFaMKa27iagDd+GE0WYNg9M3dOoLQjerq
+1lsMu8qcTa/VoQ7MUfmGCRdlrP6lJuAMjG2m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
index a616974..db9d0af 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBALoRsp/dkHZmb5JWfsrNKh9fkj7coA2S9LRpXFRL+a2comDokspz
-Z1Vq/U6Y9MX8zwnbUXq1V3wQdYGuWyBLdB0CAwEAAQJAC7hRqAAsuUh6fp00H1IM
-9Szv6UW8Tx6Si0qXpjei4mx/reGBvQGTIUJuGdXmuBH5tQHLPskjEqXmgiccWydz
-gQIhAPCP3JccbCUpKELah84ikXuQs0PEnGfyg4oP22x0B5q3AiEAxgKV7eFrd5Qa
-FfjHsK/HfrL8YQYynm8yDqqHnSsJY8sCIFei4Sa/uPoUs1EfkWfcGgnc3iGrB5uq
-spbiTfqFjpujAiAcWvhvdU13dUz7AoJOKg3udeEwX7vV9mR7ty3ucuBIWwIgEy7b
-le8z7zokRTzIKSMpl5xr/0Vp6DWlS0KwuLNuJjc=
+MIICXAIBAAKBgQC959WINrRhHDIK2E/BVa0Tl1DFe7rdJexVWwFXhS66ZmMVX6If
+eAVCXcPWoFLZmL8OddjvSWJaCvThdeXlW+C2gSXBNgnkwkp3jp612+nuc2+oQvFQ
+buSmO6+HNpDvro2y946JIsGy47ihrkK36M/jehK8bfrpl4Jb+m7oznXGIQIDAQAB
+AoGAX6ZSXc434iWiauXync06ZIC1VRJx1wtP0toIff19wLLrOwu1C6aW94tkpUiR
+EjomGPFwd2191R5potmQForFTiigbaZDT5WGPQtNnOW8yc8jOb+lDXXNn5KgqoHk
+Jthl8f9sNBJ91k5ubRJZ8UilxDKrkfPJf1uwrs5UjS/u3tUCQQDpDQIgnyKdIlfD
+2awBCchaSUthP1ZhN9B1j1h6uubwQicEJfyPvA2iyNqMg2tYOBPhFJIhh4rvl9lj
+fwiAFmMDAkEA0Jss9SmRMabz3GaHZc00q9wQ/tWC8DwZSIQ0JImVNrc8ZnOK4s+Z
+aq+0wsgSxji86U1r1FqXBWpi1LTcYsjXCwJAV1CCXYqBw3GchEpHgVQS9pDDZzn9
+uQraVVFRixn/cEC4sXsx9wAz86thBoguba0E9a1pWpqX2VCBKB/uJV891QJAU/Fd
+kfn8F0LbdqE7cte0jkOsAx/f5NQKSIgKg3lpte7eO0vbY5GuZqP11Tu1clZ6jlc9
+QOKDSwaYZoew939iKQJBALHvPh+XWqxoKZYuRPz6ACg2E9hn2dqS3zy1efjaJp5d
+qX+i141Npsm4I09RctPgtF82IkMJG7spSlefOPdFaJQ=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
index dc1fbb7..2c19d8b 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.com/CN=clica CA
issuer=/O=example.com/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAwWhcNMzgw
-MTAxMTIzNDAwWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxYR8NYQvEd7/e4MvOj9dh2+o
-mnywT9ajMo1589DWt2z14ouRKhSZWlx4O4AicPZc6n4uvt7++t0tTHhmm5JIbwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBALjVd1KMBadFJFIzTEspoPYxJvXKvLMclekQs5QY0lmmUj5+
-ugITEG6ywu3s+REUB+8Dj+ofQz3tgIm9NBpkfsA=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
+MTAxMTIzNDAxWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALw3TIYMk4w2ob6o1TFb
+FT5sDY4HL+9uHWZfPh6dF1ILu04KVgEb0SqP/LnHLcviH6NG0G9EsiDTdG31Svuq
+xx5CrqyW+rs1pYb5NjS8mpnp3A0e2YvoWhBrfwY3+OQo193JnNDDxC5fD+bkq1P6
+LIwI72HF4/YBqGuOSGm2G34TAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAC1/IueycXMDP6mSC862
+YU584GqXCxUaxO+5X9J7qnqsBEuNCvBwnfCuPAjo+MVftpV9rghBNUvujyisBQ62
+u/q7iuEsm2Oo7LlfZ/tQbAPqBbHCSnsS4+q+rdkNz0xPpiF87p9HbG5xA0motcUT
+cIF38qe4aoHWHF7EsPgKUDbr
-----END CERTIFICATE-----
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 69 B2 C3 8A B6 1C C2 19 F4 1B 4E 74 28 AF 12 89 E8 2E D9 BE
+ localKeyID: 7A AB C2 BF BD DC E2 77 7E 4A BD 24 09 AF 2C 12 2C 0D AC E8
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAzCCAa2gAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDFaFw0zODAxMDExMjM0MDFaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEA2TCJENbO0UK+Cjs2HSqq1OlM
-VIJQs/ctua3DEcPOphjNwLrUqVGv5qkWFDHbsJ00hpiW7uK9tDfawSWmcFis1wID
-AQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBs
-ZS5jb20wDQYJKoZIhvcNAQEFBQADQQCeF6NprEufUaSaqXhBk7hP7kX2NtTEkHmg
-hm1yvEzKL1/7gmqhMAGFapGV90k/8J6L4FiIEaxIHuTvm94KfKZi
+MjM0MDNaFw0zODAxMDExMjM0MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPEWjYMGGSHDgRJoF2y
+CepoJtuAdAV7VjyZjXvDK9bz+jd0PNdOpNRlleaqW7ANy4IgIaaV+P2oVTXatHVO
+qy3rHbsTYtOrBYL/WSWzOj3dnqKZYSAHLatkAHduAVTH3eAkaY54lvSL6bDFIgHH
+RfFFTsdRNpZoyK0s/RJ7A4FPAgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHgYDVR0R
+BBcwFYITc2VydmVyMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQAS1q1+
+IoUhp4x/jSvSTiiFQ4MOs5gPh5OFA9ZB1TVMm33nbcNjw/yTD9k8QGPcjihdWomA
+T43lMtcl2C6IoXZ1LXEdGjE18PgCUeZwk4fWiYgLw7gb6cx/f1u8K/vCSJL8kKJj
+DztxvLvyjIJ4S+hEl+Og7+cRsVEG0CcgIs1ipA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
index 840f694..9c890c7 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db and b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
index 89bff13..3f2be4b 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db and b/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/secmod.db
index 8ea139c..39f8480 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/secmod.db and b/test/aux-fixed/exim-ca/example.com/server2.example.com/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
index 52263a2..98e831e 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 69 B2 C3 8A B6 1C C2 19 F4 1B 4E 74 28 AF 12 89 E8 2E D9 BE
+ localKeyID: 7A AB C2 BF BD DC E2 77 7E 4A BD 24 09 AF 2C 12 2C 0D AC E8
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAzCCAa2gAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDFaFw0zODAxMDExMjM0MDFaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEA2TCJENbO0UK+Cjs2HSqq1OlM
-VIJQs/ctua3DEcPOphjNwLrUqVGv5qkWFDHbsJ00hpiW7uK9tDfawSWmcFis1wID
-AQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBs
-ZS5jb20wDQYJKoZIhvcNAQEFBQADQQCeF6NprEufUaSaqXhBk7hP7kX2NtTEkHmg
-hm1yvEzKL1/7gmqhMAGFapGV90k/8J6L4FiIEaxIHuTvm94KfKZi
+MjM0MDNaFw0zODAxMDExMjM0MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPEWjYMGGSHDgRJoF2y
+CepoJtuAdAV7VjyZjXvDK9bz+jd0PNdOpNRlleaqW7ANy4IgIaaV+P2oVTXatHVO
+qy3rHbsTYtOrBYL/WSWzOj3dnqKZYSAHLatkAHduAVTH3eAkaY54lvSL6bDFIgHH
+RfFFTsdRNpZoyK0s/RJ7A4FPAgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHgYDVR0R
+BBcwFYITc2VydmVyMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQAS1q1+
+IoUhp4x/jSvSTiiFQ4MOs5gPh5OFA9ZB1TVMm33nbcNjw/yTD9k8QGPcjihdWomA
+T43lMtcl2C6IoXZ1LXEdGjE18PgCUeZwk4fWiYgLw7gb6cx/f1u8K/vCSJL8kKJj
+DztxvLvyjIJ4S+hEl+Og7+cRsVEG0CcgIs1ipA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
index a4960f9..34665ac 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 69 B2 C3 8A B6 1C C2 19 F4 1B 4E 74 28 AF 12 89 E8 2E D9 BE
+ localKeyID: 7A AB C2 BF BD DC E2 77 7E 4A BD 24 09 AF 2C 12 2C 0D AC E8
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBnjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIFmRnQVx4IM4CAggA
-MBQGCCqGSIb3DQMHBAj96PHFOGcW+gSCAVhUx92WT6m/52ZEGgqV+RyBKgHPv0Vk
-NCrmKEJJAvGRWGl+jnpU780hLNx+qWHxGV6r+wyPN9F81oDhqeYQtIRIYC8tWBeC
-9mouIU/iNXYUkun4ZaH6sIJSFfB/2l/pz5/GaiCqgQPPufGmRFsHcGcZlYpnLHkb
-PyRFagan7QYIwUouBTyJ0o/OKBU/r6QM+ZO1zB4YqUutpYMTUbcD9zkj3eAFpIDZ
-fuci+WK1imuUek9LdKifM8f5jdc4n/Ya5rFcpHg45CXz+pLntsprjQVzhFdQblZW
-60ZyiJm682h7ioHhcJYmYyEa5DMItEqzLasQncMi/s8+SUCqTE0QaWYWJ+ofv1cD
-GBYWoM7Ar47zaqgQYlKMKs9mDfUQ4FQy382yrnsPnyo+K8ra5ESUA++uIxMwouHo
-x3dD4wV51jP8VC9VN2GWprZWffnxwMP4PxZejmZVbSWvPw==
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQItk/lU+I4SfACAggA
+MBQGCCqGSIb3DQMHBAiAkdrN3LxxtwSCAoAVTvMKuBD7cT5lkUrAswZn/9N7iIVi
+ZfYlcHB87fvbTPlSfUHMskb845VYUjLwQXA49GAfgwo7cirfXQp0IrKrvTAhFjrY
+WnKJZS31+E+sST+ZStxjdZSy+JcTDkO2qHlWPOZMV1XnkWGX9hHQLhJlxEXdQkZw
+xnQ7NP7X7lG0Biuln8/lGSGfVLc8gSIUqM6IFOpyn88Jcz+LbK8WoII/aNaI43/1
+LzGCi8G86lvzDrsK5Xxj+/KpRTdThsP5CfT8PvzcNGSLUDx+c4Du+QtLUn5yZeYU
+2KMfv9nCkY92n0NJL2b+kZI+jMRllGZJtl5vOFM3NnI9Ujf3ZGXrVEg+B/SW/1v0
++QpZJr84tnL1Ncba3QELfpYBbAHj/7Y6LZWdS1Rd+HSPvdkZsdmUEuXPP415Nm5A
+P29uk8sxSy97KBd20RZI9jEBNy5MdBSeeJpj4tlDO/MD3J2DXmJ0YdglvG5/wOGC
+2T3441YBCT5l/3HzdpT2LXmRohqwzQKNw02obM6+wnoZNS4ROyFfuCM/xinNaqX/
+84bulaA2WVInw1slCiyYq6fZ9M27W+A7X5r8V2D58UqvZ+3NftaXQZ4B4Syk+8W+
+YG21HbPWkUEj5weH90YdLtH3y9AB4lCi+VTWFwbuc7Kak6FKfZwuVGGl7HtRWG9F
+V/Sw33YRPpBXEpe5Magl/QZzB4lEiphrT+QQWQzfXqo4x3Nj0o8Rgizn8iGxMWyj
+OzuGyCXoqUNY7Q/5tNXr4hVhylWbMAI4acBgY1+ad8j8kLj7UmoBuDHu8FMeuPr5
+eu/BEmuu/G4GVQt+fGpv5Jnp2InSuKS0EdeyOSxB6oDBw7/IVIrfBPTf
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
index baa2281..4810000 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
index 80180be..399b26a 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
index fe4957e..d33b240 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
index 80180be..399b26a 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
index c080a6a..d0dad03 100644
Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12 and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
index eacf55c..f4438c3 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 69 B2 C3 8A B6 1C C2 19 F4 1B 4E 74 28 AF 12 89 E8 2E D9 BE
+ localKeyID: 7A AB C2 BF BD DC E2 77 7E 4A BD 24 09 AF 2C 12 2C 0D AC E8
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAzCCAa2gAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDFaFw0zODAxMDExMjM0MDFaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEA2TCJENbO0UK+Cjs2HSqq1OlM
-VIJQs/ctua3DEcPOphjNwLrUqVGv5qkWFDHbsJ00hpiW7uK9tDfawSWmcFis1wID
-AQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBs
-ZS5jb20wDQYJKoZIhvcNAQEFBQADQQCeF6NprEufUaSaqXhBk7hP7kX2NtTEkHmg
-hm1yvEzKL1/7gmqhMAGFapGV90k/8J6L4FiIEaxIHuTvm94KfKZi
+MjM0MDNaFw0zODAxMDExMjM0MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPEWjYMGGSHDgRJoF2y
+CepoJtuAdAV7VjyZjXvDK9bz+jd0PNdOpNRlleaqW7ANy4IgIaaV+P2oVTXatHVO
+qy3rHbsTYtOrBYL/WSWzOj3dnqKZYSAHLatkAHduAVTH3eAkaY54lvSL6bDFIgHH
+RfFFTsdRNpZoyK0s/RJ7A4FPAgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHgYDVR0R
+BBcwFYITc2VydmVyMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQAS1q1+
+IoUhp4x/jSvSTiiFQ4MOs5gPh5OFA9ZB1TVMm33nbcNjw/yTD9k8QGPcjihdWomA
+T43lMtcl2C6IoXZ1LXEdGjE18PgCUeZwk4fWiYgLw7gb6cx/f1u8K/vCSJL8kKJj
+DztxvLvyjIJ4S+hEl+Og7+cRsVEG0CcgIs1ipA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
index 6e0c41e..d53d97f 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBANkwiRDWztFCvgo7Nh0qqtTpTFSCULP3LbmtwxHDzqYYzcC61KlR
-r+apFhQx27CdNIaYlu7ivbQ32sElpnBYrNcCAwEAAQJAAT7+ClKxLRIs9PISBWjR
-Qhd0kKeOvvmUEZSlodx1uw42qqDQ0vfYMSOWzn8dlGQ/XGJ4xVwvFFklNCfWva4M
-QQIhAPaoF/TqmR/dc2CLsQkWoZQqdu7w+uBnTnqqcQ1A2ci9AiEA4Wqw3SszsAwV
-ELV+DCDouyncyMmCzJkDjYA1WYNiVyMCIAc3AYRjfFknRCG11Fbct5s65sG0gNIh
-k3UZGTd3ByfNAiAbwAqt75eZYKNnPzCZRaPhBrJLdaNIlL2/Ob1Xm7kLiQIgWtVa
-weFGKWW86QXScrel5sjNDxFv+ZvMd+heAiPqkXs=
+MIICXAIBAAKBgQDTxFo2DBhkhw4ESaBdsgnqaCbbgHQFe1Y8mY17wyvW8/o3dDzX
+TqTUZZXmqluwDcuCICGmlfj9qFU12rR1Tqst6x27E2LTqwWC/1klszo93Z6imWEg
+By2rZAB3bgFUx93gJGmOeJb0i+mwxSIBx0XxRU7HUTaWaMitLP0SewOBTwIDAQAB
+AoGBAIUoLTVY66mihnzJsw3XWobLkMtq/QlJYZNfVmig85sI9KgT7gHQkLKBYf2V
+12tfcTzUaXRvTw5o35OqfthYbCehLpCDMd6reWk7eoo9VMAVUCgXJ2MNRPSGv8uA
+pfoBxhfiUxxFpA4CN+ZPuHCEbjUcbo/GvkRRI5vk+cY1t8FxAkEA9kJZxcrzak5J
+GOAiT7soSerDY+4hVtA9KWzMt3WzjIQqPBqR1SO6xTjQKcTFLWVdVmI9n86LEOTQ
+iHplXZ096QJBANwkutdvJkAIKTcECEp5PgF711xdqsBXwP1z4JUzjgzNMSMQW4zw
+7rSupmzquAn8Jo6EsV5fmGVT3kdtqlD3qncCQA6+oklpgXGYBmBq6yMC/cKPP+u3
+0l80ULUuQoOplHqRX0YCAUFVxlUQtcYKdhPlwdTuROpQn5r/WE0TpwYX6CECQHjA
+fOwmv6hn0ZOn1pRjJKvTrjGv/zU57VYY9ZthiA1lkApXsqAAmC7rjcY4iXKQqOWL
+y26kqQcLleVANifrcckCQFsKeOYEvYcWjM5hp/Ti7nHlCUracdH78ePGFcBCpjS3
+jAPGRkwRt1/7mUT7WZ/4THmguu5IG/MmG4T/0qEcJEw=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
index bed3d2f..c8c18a5 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
@@ -1,10 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAp2tm7DhEtMNQPz23MpsxYVje
-SgMgmkDx8qdr97SBBVqtPcHMMrCEZ9dQiYCFxbshxXfeova+DbLZISDlHA9xjQID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAG/rfiV0UE6Q//VIKN5CprvNXDGQFfcFCWNRCu6ZGTPpaDf2
-iPqVISD9trZrvtlUIgKjGgOQQbdNH9RBj5+6QKo=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANxsitxvuTf1LtcvBkHf
+Ph8vuxdyWei/ZKWmlycMyMjFbjCIDbCGFhux+92S9OIzCkvq2KPpVQB5Lgf2bKwi
+b9KMtmWWdXej3lSqQOapf6h8aUc/F3flUsadTKFQPzHZi4+hOi4+t1aXzaBuopVX
+IqO2MjTQcIorxEZ9fUO+c4blAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAFjeFqPGxfNLnC1K/PPE
+QEA05z2oadv0m5trTvO3YNNYvQHdh0whiFiRRo3rc2gOSL0b4mxKDz9n4i5wdWN3
+sfx0a1RNG6rqJP4ZSF+GNye3Kux6amnHEI/tNbo/LDHxq8FQ9crva8v/pgAVXrhP
+qYhEcoGqK3DkLcSqc0LCLJMs
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
index 5d2b2ea..42b5174 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
@@ -1,11 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
index 0d794a0..28c2c99 100644
Binary files a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db and b/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db b/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
index 31b9ac7..8531ef6 100644
Binary files a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db and b/test/aux-fixed/exim-ca/example.net/BLANK/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/secmod.db b/test/aux-fixed/exim-ca/example.net/BLANK/secmod.db
index 8a83193..b709dd8 100644
Binary files a/test/aux-fixed/exim-ca/example.net/BLANK/secmod.db and b/test/aux-fixed/exim-ca/example.net/BLANK/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.pem b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
index bed3d2f..c8c18a5 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
@@ -1,10 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAp2tm7DhEtMNQPz23MpsxYVje
-SgMgmkDx8qdr97SBBVqtPcHMMrCEZ9dQiYCFxbshxXfeova+DbLZISDlHA9xjQID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAG/rfiV0UE6Q//VIKN5CprvNXDGQFfcFCWNRCu6ZGTPpaDf2
-iPqVISD9trZrvtlUIgKjGgOQQbdNH9RBj5+6QKo=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANxsitxvuTf1LtcvBkHf
+Ph8vuxdyWei/ZKWmlycMyMjFbjCIDbCGFhux+92S9OIzCkvq2KPpVQB5Lgf2bKwi
+b9KMtmWWdXej3lSqQOapf6h8aUc/F3flUsadTKFQPzHZi4+hOi4+t1aXzaBuopVX
+IqO2MjTQcIorxEZ9fUO+c4blAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAFjeFqPGxfNLnC1K/PPE
+QEA05z2oadv0m5trTvO3YNNYvQHdh0whiFiRRo3rc2gOSL0b4mxKDz9n4i5wdWN3
+sfx0a1RNG6rqJP4ZSF+GNye3Kux6amnHEI/tNbo/LDHxq8FQ9crva8v/pgAVXrhP
+qYhEcoGqK3DkLcSqc0LCLJMs
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
index 5ab675c..1c00d70 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
@@ -1,14 +1,20 @@
Bag Attributes
friendlyName: OCSP Signer
- localKeyID: 16 61 1B 08 43 C0 0E C4 AF 4D 7B E9 27 1D EB B0 D7 05 E9 75
+ localKeyID: ED 30 2D 18 0A DE 99 C9 80 31 4B A2 01 5D 99 E3 80 8D 16 35
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAsT/jRe87h2kyfvbt
-YbvgOPS3y6+BPP8pVdU2CefZAy4mYhuj4ZejZgOf8W9XoonCKTW0Y31feBcy0cM+
-2TNM3QIDAQABAkEApPyuBevggnP2T95zKfUiioGoD43HA8sTY9T53xCTnPOrNNCv
-Vn5+ZXao86JF3ly2jY8Eg0b1hFpfZsZMhG/PgQIhAOg/SgSXqPL8oON/Uot1IUHe
-xLfwqW4toMwTknwdWO39AiEAw2ClhCYw/YTDdbh8sstP7k9HDNBPynwAuURLqc6/
-oGECIBDxVQgCvFuFnIMcLbxovhVdGALHNsUH5RweLWiKh4tNAiBSgpVD6tETr6bQ
-J1paM6yM6uQJkEuyKo4vr5z4mHyq4QIhAMtfRG4+QspRY6aaAAebWBS4zwDiAZCH
-6bnyjSzbUHsm
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAL3M5yESGo10q2yj
+NuxPDNK0/2yxsWa4vXlCv6Yx1QkAqAt+yJn036qeA3pBt5DLUnQszQseWrbhr8zF
+/GMM3SlT4kr/Z4R7HF9AlriRJaPbXz7K9Q4T9UWLi1rOma6aUKTA5Tx1A4XxIpv+
+61CGi90MkpAILcmg/pHeadT84GeFAgMBAAECgYBDhyRwkrVZwLnA9Cz1VIa2bOk3
+rdz1NCNNgl8XbUFja5VeSaRrikENvhx0oe8CmCRk6w+ktg8GZDOdAo/yWcBRd6fn
+BIuU13VyoMksfQcNs3UWR+SiDHhWEe4Tyq6kBMCDxkZOXI6Y96wcxPyBiUW9/fBH
+b0B8cMh5wS4M4YOP3QJBAOxag8a9xPnphE/WswcOpEGeDKNMOs84KxM2UAQh9cJg
+vNCUe0/IAveoGjy81yOCrtuf+noxNv6rJpAwZOFxC0cCQQDNk8KPsByYnSpAQISn
+RDEDEZOuv1gU66CACbTe+M6IrxzLZE0hcfOHiVLmCUsL5D5pLfzzOdQh7RDipzTY
+wQTTAkAX5WbhVxptMgDgmZJsKjzNLY+ViwV/Ieyo+prIcC6KwoEUjY6SGGTEaUiN
+z4Ho4zOOnPQUGpm20dMKTPpGGMnNAkBO4z3NH9rJYb4968Q737ojIFKYw0qMtKLh
+n1fuHHI9F12oWzQR+oVmZHcQWU6YIJ0mhYRE3dMetbc+EsX/y4oLAkEAtJ9yAmcU
+v8bTxGFXsfc3B4t2E0f8cv4zkHAjwvCkcZMLGXB8Tj+Q+rd6pEHnnRWduR58xxun
+oDerdQ1JBK4Hjw==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
index 4ebddda..b4c1d42 100644
Binary files a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12 and b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
index 2d71376..8336136 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
@@ -1,11 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBgDCCASqgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICBTCCAW6gAwIBAgIBAzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwM1oXDTM4MDEwMTEyMzQwM1owMjEUMBIGA1UEChMLZXhhbXBsZS5uZXQxGjAY
-BgNVBAMTEWNsaWNhIE9DU1AgU2lnbmVyMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJB
-ALE/40XvO4dpMn727WG74Dj0t8uvgTz/KVXVNgnn2QMuJmIbo+GXo2YDn/FvV6KJ
-wik1tGN9X3gXMtHDPtkzTN0CAwEAAaMqMCgwDgYDVR0PAQH/BAQDAgeAMBYGA1Ud
-JQEB/wQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBBQUAA0EAjPHbFyZJZHxLSqn5
-i4i7+sWFAueHbbVXyDkzbspOeAbUeuc+lyZ7gMkRofbfIyXIMzSggVKiBetK5gf8
-OhXNJA==
+MzQwOFoXDTM4MDEwMTEyMzQwOFowMjEUMBIGA1UEChMLZXhhbXBsZS5uZXQxGjAY
+BgNVBAMTEWNsaWNhIE9DU1AgU2lnbmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQC9zOchEhqNdKtsozbsTwzStP9ssbFmuL15Qr+mMdUJAKgLfsiZ9N+qngN6
+QbeQy1J0LM0LHlq24a/MxfxjDN0pU+JK/2eEexxfQJa4kSWj218+yvUOE/VFi4ta
+zpmumlCkwOU8dQOF8SKb/utQhovdDJKQCC3JoP6R3mnU/OBnhQIDAQABoyowKDAO
+BgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwkwDQYJKoZIhvcN
+AQEFBQADgYEApZElaM/UlP1hpEMKGWMG8FCQvL4DZ0HrT176hh27pMZNVif9VTaa
+chZmuh4pdkgSwZgmMW14FfDoBEClexdSb2TBNYBl5ySsKc4WCNSFte1PN8ZABuR6
+BA1xdT4YQ/Tzhk19Id9Ge+u2OWgpxNZqYDxoqMqsqph5h6eVKmuB0Tw=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
index 5d2b2ea..42b5174 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
@@ -1,11 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/ca.conf b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
index d162ea3..1a41e70 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
@@ -1,5 +1,5 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:03 2012
+; Thu Nov 1 12:34:08 2012
[CLICA]
crl_url=
http://crl.example.net/latest.crl
@@ -13,6 +13,6 @@ ocsp_url=
http://oscp/example.net/
org=example.net
subject=clica CA
name=Certificate Authority
-bits=512
+bits=1024
diff --git a/test/aux-fixed/exim-ca/example.net/CA/cert8.db b/test/aux-fixed/exim-ca/example.net/CA/cert8.db
index 6a130c8..3637539 100644
Binary files a/test/aux-fixed/exim-ca/example.net/CA/cert8.db and b/test/aux-fixed/exim-ca/example.net/CA/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
index 364b43d..1a748fa 100644
Binary files a/test/aux-fixed/exim-ca/example.net/CA/crl.empty and b/test/aux-fixed/exim-ca/example.net/CA/crl.empty differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
index 250311c..c77ccca 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20130127152434Z
+update=20131215221458Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
index 8236f85..420d273 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
@@ -1,6 +1,7 @@
-----BEGIN X509 CRL-----
-MIGsMFgCAQEwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhhbXBsZS5uZXQx
-GzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydBgPMjAxMzAxMjcxNTI0MzRaMA0G
-CSqGSIb3DQEBBQUAA0EAnGNQN1GnKB2PGg9C+vguhNlTRLgf9j9lziLPBkPff4+k
-8JLTVhcuQYnYTdw1WKq/DeXJRyZwd7Z8vAMMdsW5ZA==
+MIHtMFgCAQEwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhhbXBsZS5uZXQx
+GzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydBgPMjAxMzEyMTUyMjE0NThaMA0G
+CSqGSIb3DQEBBQUAA4GBAF5B9aj8p3GIddLvXRk1IGSWmfDRgvI4UktiUxjrZacd
+A84ZsvMRoUlAxIziRnrl/5ptAV0/TK3TONvp2AxC6Hfvn2hscw27In7q8uLlKNgG
+sfZM1ZmK46ddyd9qyLIWvE/NUlraz4RTT/gUtYsP19vT9wgI8oxiITOeWXRFyNZ3
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2 b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
index 7473ce8..4a8d82a 100644
Binary files a/test/aux-fixed/exim-ca/example.net/CA/crl.v2 and b/test/aux-fixed/exim-ca/example.net/CA/crl.v2 differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
index 434045f..5bb688b 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20130127152437Z
-addcert 102 20130127152437Z
-addcert 202 20130127152437Z
+update=20131215221500Z
+addcert 102 20131215221500Z
+addcert 202 20131215221500Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
index dceb45c..6c43d64 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
@@ -1,7 +1,9 @@
-----BEGIN X509 CRL-----
-MIHcMIGHAgEBMA0GCSqGSIb3DQEBBQUAMDMxFDASBgNVBAoTC2V4YW1wbGUubmV0
-MRswGQYDVQQDExJjbGljYSBTaWduaW5nIENlcnQYDzIwMTMwMTI3MTUyNDM3WjAt
-MBQCAWYYDzIwMTMwMTI3MTUyNDM3WjAVAgIAyhgPMjAxMzAxMjcxNTI0MzdaMA0G
-CSqGSIb3DQEBBQUAA0EAL1D/ZMfKSVVozt/TtAPIR/PMLTvBCGrRDbH31tI3pGUJ
-l+FZTnkR48HXOkuaPCxMclubZ0ptQ6wXHP58iwKacA==
+MIIBHTCBhwIBATANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFtcGxlLm5l
+dDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0GA8yMDEzMTIxNTIyMTUwMFow
+LTAUAgFmGA8yMDEzMTIxNTIyMTUwMFowFQICAMoYDzIwMTMxMjE1MjIxNTAwWjAN
+BgkqhkiG9w0BAQUFAAOBgQAyatj9vIP3zaH9vBGJt6fLqgqonj23cI3aP2AIWZT0
+AWyz7PTk0xtqxaIAFwUo4/VqrK8A2gxG+yDcjP+II3QeLZ2RhhzsC9jphtbhxWS/
+yPDL1hwDJ1IjfwkBB3CL7E1b4JP8Hy7GxZuLZgKjpLYhQmJV3BmGNzCV4UuqdFi5
+dQ==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/key3.db b/test/aux-fixed/exim-ca/example.net/CA/key3.db
index e17cadf..1902397 100644
Binary files a/test/aux-fixed/exim-ca/example.net/CA/key3.db and b/test/aux-fixed/exim-ca/example.net/CA/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/noise.file b/test/aux-fixed/exim-ca/example.net/CA/noise.file
index c19c41f..da679cd 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.net/CA/noise.file
@@ -1,301 +1,243 @@
processor : 0
vendor_id : GenuineIntel
cpu family : 6
-model : 26
-model name : Intel(R) Xeon(R) CPU E5520 @ 2.27GHz
-stepping : 5
-cpu MHz : 2260.628
-cache size : 8192 KB
+model : 13
+model name : QEMU Virtual CPU version (cpu64-rhel6)
+stepping : 3
+cpu MHz : 1994.999
+cache size : 4096 KB
fpu : yes
fpu_exception : yes
-cpuid level : 11
+cpuid level : 4
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts mmx fxsr sse sse2 ss syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts xtopology tsc_reliable nonstop_tsc aperfmperf unfair_spinlock pni ssse3 cx16 sse4_1 sse4_2 x2apic popcnt hypervisor lahf_lm ida dts
-bogomips : 4521.25
+flags : fpu de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm up unfair_spinlock pni cx16 hypervisor lahf_lm
+bogomips : 3989.99
clflush size : 64
cache_alignment : 64
-address sizes : 40 bits physical, 48 bits virtual
+address sizes : 38 bits physical, 48 bits virtual
power management:
-processor : 1
-vendor_id : GenuineIntel
-cpu family : 6
-model : 26
-model name : Intel(R) Xeon(R) CPU E5520 @ 2.27GHz
-stepping : 5
-cpu MHz : 2260.628
-cache size : 8192 KB
-fpu : yes
-fpu_exception : yes
-cpuid level : 11
-wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts mmx fxsr sse sse2 ss syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts xtopology tsc_reliable nonstop_tsc aperfmperf unfair_spinlock pni ssse3 cx16 sse4_1 sse4_2 x2apic popcnt hypervisor lahf_lm ida dts
-bogomips : 4521.25
-clflush size : 64
-cache_alignment : 64
-address sizes : 40 bits physical, 48 bits virtual
-power management:
-
- CPU0 CPU1
- 0: 2481 0 IO-APIC-edge timer
- 1: 21441 346 IO-APIC-edge i8042
- 3: 1 0 IO-APIC-edge
- 4: 1 0 IO-APIC-edge
- 7: 0 0 IO-APIC-edge parport0
- 8: 1 0 IO-APIC-edge rtc0
- 9: 0 0 IO-APIC-fasteoi acpi
- 12: 78986 1718 IO-APIC-edge i8042
- 14: 0 0 IO-APIC-edge ata_piix
- 15: 2423337 1435 IO-APIC-edge ata_piix
- 16: 1025 0 IO-APIC-fasteoi Ensoniq AudioPCI
- 17: 239858 2559 IO-APIC-fasteoi ehci_hcd:usb1, ioc0
- 18: 246 0 IO-APIC-fasteoi uhci_hcd:usb2
- 19: 1868825 51479 IO-APIC-fasteoi eth0
- 24: 0 0 PCI-MSI-edge pciehp
- 25: 0 0 PCI-MSI-edge pciehp
- 26: 0 0 PCI-MSI-edge pciehp
- 27: 0 0 PCI-MSI-edge pciehp
- 28: 0 0 PCI-MSI-edge pciehp
- 29: 0 0 PCI-MSI-edge pciehp
- 30: 0 0 PCI-MSI-edge pciehp
- 31: 0 0 PCI-MSI-edge pciehp
- 32: 0 0 PCI-MSI-edge pciehp
- 33: 0 0 PCI-MSI-edge pciehp
- 34: 0 0 PCI-MSI-edge pciehp
- 35: 0 0 PCI-MSI-edge pciehp
- 36: 0 0 PCI-MSI-edge pciehp
- 37: 0 0 PCI-MSI-edge pciehp
- 38: 0 0 PCI-MSI-edge pciehp
- 39: 0 0 PCI-MSI-edge pciehp
- 40: 0 0 PCI-MSI-edge pciehp
- 41: 0 0 PCI-MSI-edge pciehp
- 42: 0 0 PCI-MSI-edge pciehp
- 43: 0 0 PCI-MSI-edge pciehp
- 44: 0 0 PCI-MSI-edge pciehp
- 45: 0 0 PCI-MSI-edge pciehp
- 46: 0 0 PCI-MSI-edge pciehp
- 47: 0 0 PCI-MSI-edge pciehp
- 48: 0 0 PCI-MSI-edge pciehp
- 49: 0 0 PCI-MSI-edge pciehp
- 50: 0 0 PCI-MSI-edge pciehp
- 51: 0 0 PCI-MSI-edge pciehp
- 52: 0 0 PCI-MSI-edge pciehp
- 53: 0 0 PCI-MSI-edge pciehp
- 54: 0 0 PCI-MSI-edge pciehp
- 55: 0 0 PCI-MSI-edge pciehp
- 56: 1 0 PCI-MSI-edge vmci
- 57: 0 0 PCI-MSI-edge vmci
-NMI: 0 0 Non-maskable interrupts
-LOC: 12398590 14242910 Local timer interrupts
-SPU: 0 0 Spurious interrupts
-PMI: 0 0 Performance monitoring interrupts
-IWI: 0 0 IRQ work interrupts
-RES: 282808 309226 Rescheduling interrupts
-CAL: 1955 163556 Function call interrupts
-TLB: 18075 15578 TLB shootdowns
-TRM: 0 0 Thermal event interrupts
-THR: 0 0 Threshold APIC interrupts
-MCE: 0 0 Machine check exceptions
-MCP: 2310 2310 Machine check polls
+ CPU0
+ 0: 249 IO-APIC-edge timer
+ 1: 7 IO-APIC-edge i8042
+ 4: 1 IO-APIC-edge
+ 8: 0 IO-APIC-edge rtc0
+ 9: 0 IO-APIC-fasteoi acpi
+ 10: 953 IO-APIC-fasteoi virtio3
+ 11: 78 IO-APIC-fasteoi uhci_hcd:usb1, snd_hda_intel
+ 12: 102 IO-APIC-edge i8042
+ 14: 0 IO-APIC-edge ata_piix
+ 15: 106 IO-APIC-edge ata_piix
+ 24: 0 PCI-MSI-edge virtio2-config
+ 25: 561181 PCI-MSI-edge virtio2-requests
+ 26: 0 PCI-MSI-edge virtio0-config
+ 27: 7973184 PCI-MSI-edge virtio0-input
+ 28: 2 PCI-MSI-edge virtio0-output
+ 29: 0 PCI-MSI-edge virtio1-config
+ 30: 571571 PCI-MSI-edge virtio1-input
+ 31: 1 PCI-MSI-edge virtio1-output
+NMI: 0 Non-maskable interrupts
+LOC: 18461764 Local timer interrupts
+SPU: 0 Spurious interrupts
+PMI: 0 Performance monitoring interrupts
+IWI: 0 IRQ work interrupts
+RES: 0 Rescheduling interrupts
+CAL: 0 Function call interrupts
+TLB: 0 TLB shootdowns
+TRM: 0 Thermal event interrupts
+THR: 0 Threshold APIC interrupts
+MCE: 0 Machine check exceptions
+MCP: 8673 Machine check polls
ERR: 0
MIS: 0
-MemTotal: 1914844 kB
-MemFree: 133340 kB
-Buffers: 142048 kB
-Cached: 953728 kB
-SwapCached: 108 kB
-Active: 982140 kB
-Inactive: 540820 kB
-Active(anon): 287228 kB
-Inactive(anon): 143480 kB
-Active(file): 694912 kB
-Inactive(file): 397340 kB
+MemTotal: 488092 kB
+MemFree: 84780 kB
+Buffers: 94000 kB
+Cached: 143232 kB
+SwapCached: 1900 kB
+Active: 125276 kB
+Inactive: 142044 kB
+Active(anon): 8316 kB
+Inactive(anon): 22668 kB
+Active(file): 116960 kB
+Inactive(file): 119376 kB
Unevictable: 0 kB
Mlocked: 0 kB
-SwapTotal: 4194296 kB
-SwapFree: 4193560 kB
-Dirty: 2760 kB
+SwapTotal: 524280 kB
+SwapFree: 511568 kB
+Dirty: 2444 kB
Writeback: 0 kB
-AnonPages: 427016 kB
-Mapped: 70844 kB
-Shmem: 3400 kB
-Slab: 191064 kB
-SReclaimable: 125460 kB
-SUnreclaim: 65604 kB
-KernelStack: 2312 kB
-PageTables: 23528 kB
+AnonPages: 28688 kB
+Mapped: 13320 kB
+Shmem: 924 kB
+Slab: 109088 kB
+SReclaimable: 58252 kB
+SUnreclaim: 50836 kB
+KernelStack: 768 kB
+PageTables: 3744 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 5151716 kB
-Committed_AS: 973184 kB
+CommitLimit: 768324 kB
+Committed_AS: 109440 kB
VmallocTotal: 34359738367 kB
-VmallocUsed: 280772 kB
-VmallocChunk: 34359441168 kB
+VmallocUsed: 12116 kB
+VmallocChunk: 34359711712 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 249856 kB
+AnonHugePages: 0 kB
HugePages_Total: 0
HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 8192 kB
-DirectMap2M: 2088960 kB
+DirectMap4k: 7156 kB
+DirectMap2M: 1492992 kB
slabinfo - version: 2.1
# name <active_objs> <num_objs> <objsize> <objperslab> <pagesperslab> : tunables <limit> <batchcount> <sharedfactor> : slabdata <active_slabs> <num_slabs> <sharedavail>
-bridge_fdb_cache 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-fuse_request 0 0 632 6 1 : tunables 54 27 8 : slabdata 0 0 0
-fuse_inode 0 0 768 5 1 : tunables 54 27 8 : slabdata 0 0 0
-rpc_buffers 8 8 2048 2 1 : tunables 24 12 8 : slabdata 4 4 0
-rpc_tasks 8 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-rpc_inode_cache 8 8 832 4 1 : tunables 54 27 8 : slabdata 2 2 0
-hgfsInodeCache 1 6 640 6 1 : tunables 54 27 8 : slabdata 1 1 0
-AF_VMCI 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-nf_conntrack_expect 0 0 240 16 1 : tunables 120 60 8 : slabdata 0 0 0
-nf_conntrack_ffffffff8200cec0 11 26 304 13 1 : tunables 54 27 8 : slabdata 2 2 0
-fib6_nodes 22 59 64 59 1 : tunables 120 60 8 : slabdata 1 1 0
-ip6_dst_cache 13 30 384 10 1 : tunables 54 27 8 : slabdata 3 3 0
-ndisc_cache 1 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-ip6_mrt_cache 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-RAWv6 67 68 1024 4 1 : tunables 54 27 8 : slabdata 17 17 0
-UDPLITEv6 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-UDPv6 4 4 1024 4 1 : tunables 54 27 8 : slabdata 1 1 0
-tw_sock_TCPv6 0 0 320 12 1 : tunables 54 27 8 : slabdata 0 0 0
-request_sock_TCPv6 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-TCPv6 9 10 1856 2 1 : tunables 24 12 8 : slabdata 5 5 0
-jbd2_1k 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-avtab_node 502203 502416 24 144 1 : tunables 120 60 8 : slabdata 3489 3489 0
-ext4_inode_cache 74880 74880 1024 4 1 : tunables 54 27 8 : slabdata 18720 18720 0
-ext4_xattr 9 44 88 44 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_free_block_extents 32 67 56 67 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_alloc_context 28 28 136 28 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_prealloc_space 18 37 104 37 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_system_zone 0 0 40 92 1 : tunables 120 60 8 : slabdata 0 0 0
-jbd2_journal_handle 32 144 24 144 1 : tunables 120 60 8 : slabdata 1 1 0
-jbd2_journal_head 102 102 112 34 1 : tunables 120 60 8 : slabdata 3 3 0
-jbd2_revoke_table 4 202 16 202 1 : tunables 120 60 8 : slabdata 1 1 0
-jbd2_revoke_record 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-dm_crypt_io 50 50 152 25 1 : tunables 120 60 8 : slabdata 2 2 0
-sd_ext_cdb 2 112 32 112 1 : tunables 120 60 8 : slabdata 1 1 0
-scsi_sense_cache 22 60 128 30 1 : tunables 120 60 8 : slabdata 2 2 0
-scsi_cmd_cache 23 45 256 15 1 : tunables 120 60 8 : slabdata 3 3 0
-dm_raid1_read_record 0 0 1064 7 2 : tunables 24 12 8 : slabdata 0 0 0
-kcopyd_job 0 0 3240 2 2 : tunables 24 12 8 : slabdata 0 0 0
-io 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-dm_uevent 0 0 2608 3 2 : tunables 24 12 8 : slabdata 0 0 0
-dm_rq_clone_bio_info 0 0 16 202 1 : tunables 120 60 8 : slabdata 0 0 0
-dm_rq_target_io 0 0 392 10 1 : tunables 54 27 8 : slabdata 0 0 0
-dm_target_io 844 864 24 144 1 : tunables 120 60 8 : slabdata 6 6 0
-dm_io 828 828 40 92 1 : tunables 120 60 8 : slabdata 9 9 0
-flow_cache 0 0 96 40 1 : tunables 120 60 8 : slabdata 0 0 0
-uhci_urb_priv 6 67 56 67 1 : tunables 120 60 8 : slabdata 1 1 0
-cfq_io_context 4 28 136 28 1 : tunables 120 60 8 : slabdata 1 1 0
-cfq_queue 5 16 240 16 1 : tunables 120 60 8 : slabdata 1 1 0
-bsg_cmd 0 0 312 12 1 : tunables 54 27 8 : slabdata 0 0 0
-mqueue_inode_cache 1 4 896 4 1 : tunables 54 27 8 : slabdata 1 1 0
-isofs_inode_cache 0 0 640 6 1 : tunables 54 27 8 : slabdata 0 0 0
-hugetlbfs_inode_cache 1 6 608 6 1 : tunables 54 27 8 : slabdata 1 1 0
-dquot 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-kioctx 0 0 384 10 1 : tunables 54 27 8 : slabdata 0 0 0
-kiocb 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-inotify_event_private_data 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-inotify_inode_mark_entry 186 204 112 34 1 : tunables 120 60 8 : slabdata 6 6 0
-dnotify_mark_entry 1 34 112 34 1 : tunables 120 60 8 : slabdata 1 1 0
-dnotify_struct 1 112 32 112 1 : tunables 120 60 8 : slabdata 1 1 0
-fasync_cache 6 144 24 144 1 : tunables 120 60 8 : slabdata 1 1 0
-khugepaged_mm_slot 83 92 40 92 1 : tunables 120 60 8 : slabdata 1 1 0
-ksm_mm_slot 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-ksm_stable_node 0 0 40 92 1 : tunables 120 60 8 : slabdata 0 0 0
-ksm_rmap_item 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-utrace_engine 0 0 56 67 1 : tunables 120 60 8 : slabdata 0 0 0
-utrace 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-pid_namespace 0 0 2120 3 2 : tunables 24 12 8 : slabdata 0 0 0
-nsproxy 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-posix_timers_cache 0 0 176 22 1 : tunables 120 60 8 : slabdata 0 0 0
-uid_cache 10 60 128 30 1 : tunables 120 60 8 : slabdata 2 2 0
-UNIX 459 480 768 5 1 : tunables 54 27 8 : slabdata 96 96 0
-ip_mrt_cache 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-UDP-Lite 0 0 832 9 2 : tunables 54 27 8 : slabdata 0 0 0
-tcp_bind_bucket 15 59 64 59 1 : tunables 120 60 8 : slabdata 1 1 0
-inet_peer_cache 4 59 64 59 1 : tunables 120 60 8 : slabdata 1 1 0
-secpath_cache 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-xfrm_dst_cache 0 0 384 10 1 : tunables 54 27 8 : slabdata 0 0 0
-ip_fib_alias 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-ip_fib_hash 10 106 72 53 1 : tunables 120 60 8 : slabdata 2 2 0
-ip_dst_cache 29 50 384 10 1 : tunables 54 27 8 : slabdata 5 5 0
-arp_cache 4 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-RAW 65 72 832 9 2 : tunables 54 27 8 : slabdata 8 8 0
-UDP 6 18 832 9 2 : tunables 54 27 8 : slabdata 2 2 0
-tw_sock_TCP 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-request_sock_TCP 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-TCP 20 24 1664 4 2 : tunables 24 12 8 : slabdata 6 6 0
-eventpoll_pwq 126 212 72 53 1 : tunables 120 60 8 : slabdata 4 4 0
-eventpoll_epi 126 180 128 30 1 : tunables 120 60 8 : slabdata 6 6 0
-sgpool-128 2 2 4096 1 1 : tunables 24 12 8 : slabdata 2 2 0
-sgpool-64 2 2 2048 2 1 : tunables 24 12 8 : slabdata 1 1 0
-sgpool-32 2 4 1024 4 1 : tunables 54 27 8 : slabdata 1 1 0
-sgpool-16 2 8 512 8 1 : tunables 54 27 8 : slabdata 1 1 0
-sgpool-8 15 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-scsi_data_buffer 0 0 24 144 1 : tunables 120 60 8 : slabdata 0 0 0
-blkdev_integrity 0 0 112 34 1 : tunables 120 60 8 : slabdata 0 0 0
-blkdev_queue 29 30 2856 2 2 : tunables 24 12 8 : slabdata 15 15 0
-blkdev_requests 31 44 352 11 1 : tunables 54 27 8 : slabdata 4 4 0
-blkdev_ioc 5 48 80 48 1 : tunables 120 60 8 : slabdata 1 1 0
-fsnotify_event_holder 0 0 24 144 1 : tunables 120 60 8 : slabdata 0 0 0
-fsnotify_event 0 0 104 37 1 : tunables 120 60 8 : slabdata 0 0 0
-bio-0 180 180 192 20 1 : tunables 120 60 8 : slabdata 9 9 0
-biovec-256 66 66 4096 1 1 : tunables 24 12 8 : slabdata 66 66 0
-biovec-128 0 0 2048 2 1 : tunables 24 12 8 : slabdata 0 0 0
-biovec-64 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-biovec-16 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
+nf_conntrack_expect 0 0 240 16 1 : tunables 120 60 0 : slabdata 0 0 0
+nf_conntrack_ffffffff81b165c0 12 24 312 12 1 : tunables 54 27 0 : slabdata 2 2 0
+fib6_nodes 48 118 64 59 1 : tunables 120 60 0 : slabdata 2 2 0
+ip6_dst_cache 29 40 384 10 1 : tunables 54 27 0 : slabdata 4 4 0
+ndisc_cache 45 45 256 15 1 : tunables 120 60 0 : slabdata 3 3 0
+ip6_mrt_cache 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+RAWv6 4 4 1024 4 1 : tunables 54 27 0 : slabdata 1 1 0
+UDPLITEv6 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+UDPv6 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+tw_sock_TCPv6 0 0 320 12 1 : tunables 54 27 0 : slabdata 0 0 0
+request_sock_TCPv6 0 0 192 20 1 : tunables 120 60 0 : slabdata 0 0 0
+TCPv6 9 10 1856 2 1 : tunables 24 12 0 : slabdata 5 5 0
+jbd2_1k 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+avtab_node 551034 551232 24 144 1 : tunables 120 60 0 : slabdata 3828 3828 0
+ext4_inode_cache 19240 19240 1024 4 1 : tunables 54 27 0 : slabdata 4810 4810 0
+ext4_xattr 12 44 88 44 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_free_block_extents 16 67 56 67 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_alloc_context 16 28 136 28 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_prealloc_space 4 37 104 37 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_system_zone 0 0 40 92 1 : tunables 120 60 0 : slabdata 0 0 0
+jbd2_journal_handle 16 144 24 144 1 : tunables 120 60 0 : slabdata 1 1 0
+jbd2_journal_head 102 102 112 34 1 : tunables 120 60 0 : slabdata 3 3 0
+jbd2_revoke_table 4 202 16 202 1 : tunables 120 60 0 : slabdata 1 1 0
+jbd2_revoke_record 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+scsi_sense_cache 2 30 128 30 1 : tunables 120 60 0 : slabdata 1 1 0
+scsi_cmd_cache 2 15 256 15 1 : tunables 120 60 0 : slabdata 1 1 0
+dm_raid1_read_record 0 0 1064 7 2 : tunables 24 12 0 : slabdata 0 0 0
+kcopyd_job 0 0 3240 2 2 : tunables 24 12 0 : slabdata 0 0 0
+io 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+dm_uevent 0 0 2608 3 2 : tunables 24 12 0 : slabdata 0 0 0
+dm_rq_clone_bio_info 0 0 16 202 1 : tunables 120 60 0 : slabdata 0 0 0
+dm_rq_target_io 0 0 392 10 1 : tunables 54 27 0 : slabdata 0 0 0
+dm_target_io 588 720 24 144 1 : tunables 120 60 0 : slabdata 5 5 0
+dm_io 588 736 40 92 1 : tunables 120 60 0 : slabdata 8 8 0
+flow_cache 0 0 96 40 1 : tunables 120 60 0 : slabdata 0 0 0
+uhci_urb_priv 0 0 56 67 1 : tunables 120 60 0 : slabdata 0 0 0
+cfq_io_context 0 0 136 28 1 : tunables 120 60 0 : slabdata 0 0 0
+cfq_queue 0 0 240 16 1 : tunables 120 60 0 : slabdata 0 0 0
+bsg_cmd 0 0 312 12 1 : tunables 54 27 0 : slabdata 0 0 0
+mqueue_inode_cache 1 4 896 4 1 : tunables 54 27 0 : slabdata 1 1 0
+isofs_inode_cache 0 0 640 6 1 : tunables 54 27 0 : slabdata 0 0 0
+hugetlbfs_inode_cache 1 6 608 6 1 : tunables 54 27 0 : slabdata 1 1 0
+dquot 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+kioctx 0 0 384 10 1 : tunables 54 27 0 : slabdata 0 0 0
+kiocb 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+inotify_event_private_data 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+inotify_inode_mark_entry 110 136 112 34 1 : tunables 120 60 0 : slabdata 4 4 0
+dnotify_mark_entry 0 0 112 34 1 : tunables 120 60 0 : slabdata 0 0 0
+dnotify_struct 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+fasync_cache 0 0 24 144 1 : tunables 120 60 0 : slabdata 0 0 0
+khugepaged_mm_slot 18 92 40 92 1 : tunables 120 60 0 : slabdata 1 1 0
+ksm_mm_slot 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+ksm_stable_node 0 0 40 92 1 : tunables 120 60 0 : slabdata 0 0 0
+ksm_rmap_item 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+utrace_engine 0 0 56 67 1 : tunables 120 60 0 : slabdata 0 0 0
+utrace 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+pid_namespace 0 0 2120 3 2 : tunables 24 12 0 : slabdata 0 0 0
+nsproxy 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+posix_timers_cache 0 0 176 22 1 : tunables 120 60 0 : slabdata 0 0 0
+uid_cache 4 30 128 30 1 : tunables 120 60 0 : slabdata 1 1 0
+UNIX 113 115 768 5 1 : tunables 54 27 0 : slabdata 23 23 0
+ip_mrt_cache 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+UDP-Lite 0 0 832 9 2 : tunables 54 27 0 : slabdata 0 0 0
+tcp_bind_bucket 9 59 64 59 1 : tunables 120 60 0 : slabdata 1 1 0
+inet_peer_cache 3 59 64 59 1 : tunables 120 60 0 : slabdata 1 1 0
+secpath_cache 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+xfrm_dst_cache 0 0 384 10 1 : tunables 54 27 0 : slabdata 0 0 0
+ip_fib_alias 1 112 32 112 1 : tunables 120 60 0 : slabdata 1 1 0
+ip_fib_hash 14 53 72 53 1 : tunables 120 60 0 : slabdata 1 1 0
+ip_dst_cache 18 40 384 10 1 : tunables 54 27 0 : slabdata 4 4 0
+arp_cache 5 15 256 15 1 : tunables 120 60 0 : slabdata 1 1 0
+PING 0 0 832 9 2 : tunables 54 27 0 : slabdata 0 0 0
+RAW 2 9 832 9 2 : tunables 54 27 0 : slabdata 1 1 0
+UDP 1 9 832 9 2 : tunables 54 27 0 : slabdata 1 1 0
+tw_sock_TCP 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+request_sock_TCP 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+TCP 10 16 1664 4 2 : tunables 24 12 0 : slabdata 4 4 0
+eventpoll_pwq 59 106 72 53 1 : tunables 120 60 0 : slabdata 2 2 0
+eventpoll_epi 59 90 128 30 1 : tunables 120 60 0 : slabdata 3 3 0
+sgpool-128 2 2 4096 1 1 : tunables 24 12 0 : slabdata 2 2 0
+sgpool-64 2 2 2048 2 1 : tunables 24 12 0 : slabdata 1 1 0
+sgpool-32 2 4 1024 4 1 : tunables 54 27 0 : slabdata 1 1 0
+sgpool-16 2 8 512 8 1 : tunables 54 27 0 : slabdata 1 1 0
+sgpool-8 2 15 256 15 1 : tunables 120 60 0 : slabdata 1 1 0
+scsi_data_buffer 0 0 24 144 1 : tunables 120 60 0 : slabdata 0 0 0
+blkdev_integrity 0 0 112 34 1 : tunables 120 60 0 : slabdata 0 0 0
+blkdev_queue 28 28 2864 2 2 : tunables 24 12 0 : slabdata 14 14 0
+blkdev_requests 11 11 352 11 1 : tunables 54 27 0 : slabdata 1 1 0
+blkdev_ioc 4 48 80 48 1 : tunables 120 60 0 : slabdata 1 1 0
+fsnotify_event_holder 0 0 24 144 1 : tunables 120 60 0 : slabdata 0 0 0
+fsnotify_event 0 0 104 37 1 : tunables 120 60 0 : slabdata 0 0 0
+bio-0 140 140 192 20 1 : tunables 120 60 0 : slabdata 7 7 0
+biovec-256 34 34 4096 1 1 : tunables 24 12 0 : slabdata 34 34 0
+biovec-128 0 0 2048 2 1 : tunables 24 12 0 : slabdata 0 0 0
+biovec-64 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+biovec-16 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
bip-256 2 2 4224 1 2 : tunables 8 4 0 : slabdata 2 2 0
-bip-128 0 0 2176 3 2 : tunables 24 12 8 : slabdata 0 0 0
-bip-64 0 0 1152 7 2 : tunables 24 12 8 : slabdata 0 0 0
-bip-16 0 0 384 10 1 : tunables 54 27 8 : slabdata 0 0 0
-bip-4 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-bip-1 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-sock_inode_cache 666 685 704 5 1 : tunables 54 27 8 : slabdata 137 137 0
-skbuff_fclone_cache 42 42 512 7 1 : tunables 54 27 8 : slabdata 6 6 0
-skbuff_head_cache 302 450 256 15 1 : tunables 120 60 8 : slabdata 30 30 0
-file_lock_cache 38 44 176 22 1 : tunables 120 60 8 : slabdata 2 2 0
-net_namespace 0 0 2112 3 2 : tunables 24 12 8 : slabdata 0 0 0
-shmem_inode_cache 774 775 800 5 1 : tunables 54 27 8 : slabdata 155 155 0
-Acpi-Operand 4563 4664 72 53 1 : tunables 120 60 8 : slabdata 88 88 0
-Acpi-ParseExt 0 0 72 53 1 : tunables 120 60 8 : slabdata 0 0 0
-Acpi-Parse 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-Acpi-State 0 0 80 48 1 : tunables 120 60 8 : slabdata 0 0 0
-Acpi-Namespace 3311 3312 40 92 1 : tunables 120 60 8 : slabdata 36 36 0
-task_delay_info 332 340 112 34 1 : tunables 120 60 8 : slabdata 10 10 0
-taskstats 5 12 328 12 1 : tunables 54 27 8 : slabdata 1 1 0
-proc_inode_cache 1008 1008 640 6 1 : tunables 54 27 8 : slabdata 168 168 0
-sigqueue 35 48 160 24 1 : tunables 120 60 8 : slabdata 2 2 0
-bdev_cache 32 36 832 4 1 : tunables 54 27 8 : slabdata 9 9 0
-sysfs_dir_cache 11356 11367 144 27 1 : tunables 120 60 8 : slabdata 421 421 0
-mnt_cache 37 45 256 15 1 : tunables 120 60 8 : slabdata 3 3 0
-filp 4644 4700 192 20 1 : tunables 120 60 8 : slabdata 235 235 120
-inode_cache 6883 7308 592 6 1 : tunables 54 27 8 : slabdata 1218 1218 0
-dentry 61240 63960 192 20 1 : tunables 120 60 8 : slabdata 3198 3198 0
-names_cache 26 26 4096 1 1 : tunables 24 12 8 : slabdata 26 26 0
-avc_node 510 1239 64 59 1 : tunables 120 60 8 : slabdata 21 21 0
-selinux_inode_security 84206 86072 72 53 1 : tunables 120 60 8 : slabdata 1624 1624 0
-radix_tree_node 11606 11781 560 7 1 : tunables 54 27 8 : slabdata 1683 1683 0
-key_jar 11 20 192 20 1 : tunables 120 60 8 : slabdata 1 1 0
-buffer_head 221526 230214 104 37 1 : tunables 120 60 8 : slabdata 6222 6222 0
-vm_area_struct 12962 13034 200 19 1 : tunables 120 60 8 : slabdata 686 686 0
-mm_struct 145 145 1408 5 2 : tunables 24 12 8 : slabdata 29 29 0
-fs_cache 177 177 64 59 1 : tunables 120 60 8 : slabdata 3 3 0
-files_cache 162 165 704 11 2 : tunables 54 27 8 : slabdata 15 15 0
-signal_cache 208 208 1024 4 1 : tunables 54 27 8 : slabdata 52 52 0
-sighand_cache 201 201 2112 3 2 : tunables 24 12 8 : slabdata 67 67 0
-task_xstate 240 240 512 8 1 : tunables 54 27 8 : slabdata 30 30 0
-task_struct 306 306 2656 3 2 : tunables 24 12 8 : slabdata 102 102 0
-cred_jar 580 580 192 20 1 : tunables 120 60 8 : slabdata 29 29 0
-anon_vma_chain 7874 8162 48 77 1 : tunables 120 60 8 : slabdata 106 106 0
-anon_vma 5773 5888 40 92 1 : tunables 120 60 8 : slabdata 64 64 0
-pid 322 330 128 30 1 : tunables 120 60 8 : slabdata 11 11 0
-shared_policy_node 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-numa_policy 1 28 136 28 1 : tunables 120 60 8 : slabdata 1 1 0
-idr_layer_cache 428 434 544 7 1 : tunables 54 27 8 : slabdata 62 62 0
+bip-128 0 0 2176 3 2 : tunables 24 12 0 : slabdata 0 0 0
+bip-64 0 0 1152 7 2 : tunables 24 12 0 : slabdata 0 0 0
+bip-16 0 0 384 10 1 : tunables 54 27 0 : slabdata 0 0 0
+bip-4 0 0 192 20 1 : tunables 120 60 0 : slabdata 0 0 0
+bip-1 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+sock_inode_cache 156 170 704 5 1 : tunables 54 27 0 : slabdata 34 34 0
+skbuff_fclone_cache 7 7 512 7 1 : tunables 54 27 0 : slabdata 1 1 0
+skbuff_head_cache 120 240 256 15 1 : tunables 120 60 0 : slabdata 16 16 0
+file_lock_cache 20 22 176 22 1 : tunables 120 60 0 : slabdata 1 1 0
+net_namespace 0 0 2240 3 2 : tunables 24 12 0 : slabdata 0 0 0
+shmem_inode_cache 654 655 784 5 1 : tunables 54 27 0 : slabdata 131 131 0
+Acpi-Operand 1196 1219 72 53 1 : tunables 120 60 0 : slabdata 23 23 0
+Acpi-ParseExt 0 0 72 53 1 : tunables 120 60 0 : slabdata 0 0 0
+Acpi-Parse 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+Acpi-State 0 0 80 48 1 : tunables 120 60 0 : slabdata 0 0 0
+Acpi-Namespace 394 460 40 92 1 : tunables 120 60 0 : slabdata 5 5 0
+task_delay_info 111 170 112 34 1 : tunables 120 60 0 : slabdata 5 5 0
+taskstats 0 0 328 12 1 : tunables 54 27 0 : slabdata 0 0 0
+proc_inode_cache 864 864 640 6 1 : tunables 54 27 0 : slabdata 144 144 0
+sigqueue 16 24 160 24 1 : tunables 120 60 0 : slabdata 1 1 0
+bdev_cache 31 32 896 4 1 : tunables 54 27 0 : slabdata 8 8 0
+sysfs_dir_cache 7509 7533 144 27 1 : tunables 120 60 0 : slabdata 279 279 0
+mnt_cache 27 30 256 15 1 : tunables 120 60 0 : slabdata 2 2 0
+filp 960 960 192 20 1 : tunables 120 60 0 : slabdata 48 48 0
+inode_cache 5700 5700 592 6 1 : tunables 54 27 0 : slabdata 950 950 0
+dentry 148780 148780 192 20 1 : tunables 120 60 0 : slabdata 7439 7439 0
+names_cache 2 2 4096 1 1 : tunables 24 12 0 : slabdata 2 2 0
+avc_node 498 708 64 59 1 : tunables 120 60 0 : slabdata 12 12 0
+selinux_inode_security 26657 26659 72 53 1 : tunables 120 60 0 : slabdata 503 503 0
+radix_tree_node 2856 2856 560 7 1 : tunables 54 27 0 : slabdata 408 408 0
+key_jar 8 20 192 20 1 : tunables 120 60 0 : slabdata 1 1 0
+buffer_head 28008 28416 104 37 1 : tunables 120 60 0 : slabdata 768 768 0
+vm_area_struct 2869 2869 200 19 1 : tunables 120 60 0 : slabdata 151 151 0
+mm_struct 51 55 1408 5 2 : tunables 24 12 0 : slabdata 11 11 0
+fs_cache 54 118 64 59 1 : tunables 120 60 0 : slabdata 2 2 0
+files_cache 55 88 704 11 2 : tunables 54 27 0 : slabdata 8 8 0
+signal_cache 101 112 1088 7 2 : tunables 24 12 0 : slabdata 16 16 0
+sighand_cache 101 102 2112 3 2 : tunables 24 12 0 : slabdata 34 34 0
+task_xstate 60 72 512 8 1 : tunables 54 27 0 : slabdata 9 9 0
+task_struct 106 108 2656 3 2 : tunables 24 12 0 : slabdata 36 36 0
+cred_jar 285 300 192 20 1 : tunables 120 60 0 : slabdata 15 15 0
+anon_vma_chain 1926 2464 48 77 1 : tunables 120 60 0 : slabdata 32 32 0
+anon_vma 1348 1656 40 92 1 : tunables 120 60 0 : slabdata 18 18 0
+pid 113 180 128 30 1 : tunables 120 60 0 : slabdata 6 6 0
+shared_policy_node 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+numa_policy 0 0 136 28 1 : tunables 120 60 0 : slabdata 0 0 0
+idr_layer_cache 271 273 544 7 1 : tunables 54 27 0 : slabdata 39 39 0
size-4194304(DMA) 0 0 4194304 1 1024 : tunables 1 1 0 : slabdata 0 0 0
size-4194304 0 0 4194304 1 1024 : tunables 1 1 0 : slabdata 0 0 0
size-2097152(DMA) 0 0 2097152 1 512 : tunables 1 1 0 : slabdata 0 0 0
@@ -307,36 +249,36 @@ size-524288 0 0 524288 1 128 : tunables 1 1 0 : sla
size-262144(DMA) 0 0 262144 1 64 : tunables 1 1 0 : slabdata 0 0 0
size-262144 0 0 262144 1 64 : tunables 1 1 0 : slabdata 0 0 0
size-131072(DMA) 0 0 131072 1 32 : tunables 8 4 0 : slabdata 0 0 0
-size-131072 1 1 131072 1 32 : tunables 8 4 0 : slabdata 1 1 0
+size-131072 0 0 131072 1 32 : tunables 8 4 0 : slabdata 0 0 0
size-65536(DMA) 0 0 65536 1 16 : tunables 8 4 0 : slabdata 0 0 0
size-65536 2 2 65536 1 16 : tunables 8 4 0 : slabdata 2 2 0
size-32768(DMA) 0 0 32768 1 8 : tunables 8 4 0 : slabdata 0 0 0
size-32768 3 3 32768 1 8 : tunables 8 4 0 : slabdata 3 3 0
size-16384(DMA) 0 0 16384 1 4 : tunables 8 4 0 : slabdata 0 0 0
-size-16384 12 12 16384 1 4 : tunables 8 4 0 : slabdata 12 12 0
+size-16384 7 7 16384 1 4 : tunables 8 4 0 : slabdata 7 7 0
size-8192(DMA) 0 0 8192 1 2 : tunables 8 4 0 : slabdata 0 0 0
-size-8192 27 27 8192 1 2 : tunables 8 4 0 : slabdata 27 27 0
-size-4096(DMA) 0 0 4096 1 1 : tunables 24 12 8 : slabdata 0 0 0
-size-4096 425 425 4096 1 1 : tunables 24 12 8 : slabdata 425 425 0
-size-2048(DMA) 0 0 2048 2 1 : tunables 24 12 8 : slabdata 0 0 0
-size-2048 573 578 2048 2 1 : tunables 24 12 8 : slabdata 289 289 0
-size-1024(DMA) 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-size-1024 1340 1340 1024 4 1 : tunables 54 27 8 : slabdata 335 335 0
-size-512(DMA) 0 0 512 8 1 : tunables 54 27 8 : slabdata 0 0 0
-size-512 1123 1176 512 8 1 : tunables 54 27 8 : slabdata 147 147 0
-size-256(DMA) 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-size-256 930 930 256 15 1 : tunables 120 60 8 : slabdata 62 62 0
-size-192(DMA) 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-size-192 2119 2160 192 20 1 : tunables 120 60 8 : slabdata 108 108 0
-size-128(DMA) 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-size-64(DMA) 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-size-64 33093 40887 64 59 1 : tunables 120 60 8 : slabdata 693 693 0
-size-32(DMA) 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-size-128 3921 4800 128 30 1 : tunables 120 60 8 : slabdata 160 160 0
-size-32 332389 332976 32 112 1 : tunables 120 60 8 : slabdata 2973 2973 0
-kmem_cache 191 191 32896 1 16 : tunables 8 4 0 : slabdata 191 191 0
+size-8192 12 12 8192 1 2 : tunables 8 4 0 : slabdata 12 12 0
+size-4096(DMA) 0 0 4096 1 1 : tunables 24 12 0 : slabdata 0 0 0
+size-4096 115 115 4096 1 1 : tunables 24 12 0 : slabdata 115 115 0
+size-2048(DMA) 0 0 2048 2 1 : tunables 24 12 0 : slabdata 0 0 0
+size-2048 206 206 2048 2 1 : tunables 24 12 0 : slabdata 103 103 0
+size-1024(DMA) 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+size-1024 584 584 1024 4 1 : tunables 54 27 0 : slabdata 146 146 0
+size-512(DMA) 0 0 512 8 1 : tunables 54 27 0 : slabdata 0 0 0
+size-512 584 584 512 8 1 : tunables 54 27 0 : slabdata 73 73 0
+size-256(DMA) 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+size-256 775 795 256 15 1 : tunables 120 60 0 : slabdata 53 53 0
+size-192(DMA) 0 0 192 20 1 : tunables 120 60 0 : slabdata 0 0 0
+size-192 1119 1140 192 20 1 : tunables 120 60 0 : slabdata 57 57 0
+size-128(DMA) 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+size-64(DMA) 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+size-64 19322 20650 64 59 1 : tunables 120 60 0 : slabdata 350 350 0
+size-32(DMA) 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+size-128 3817 3930 128 30 1 : tunables 120 60 0 : slabdata 131 131 0
+size-32 352187 352688 32 112 1 : tunables 120 60 0 : slabdata 3149 3149 0
+kmem_cache 182 182 32896 1 16 : tunables 8 4 0 : slabdata 182 182 0
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- lo:267102759 105357 0 0 0 0 0 0 267102759 105357 0 0 0 0 0 0
- eth0:1013761672 1354551 0 0 0 0 0 0 245537245 966850 0 0 0 0 0 0
- pan0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ lo: 7419513 35803 0 0 0 0 0 0 7419513 35803 0 0 0 0 0 0
+ eth0:585898087 8311937 0 0 0 0 0 0 163704249 110160 0 0 0 0 0 0
+ eth1:163385580 637836 0 0 0 0 0 0 2289952 35156 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.net/CA/secmod.db b/test/aux-fixed/exim-ca/example.net/CA/secmod.db
index c7f115b..f8cc0e7 100644
Binary files a/test/aux-fixed/exim-ca/example.net/CA/secmod.db and b/test/aux-fixed/exim-ca/example.net/CA/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
index d0ee061..ebdb556 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.net/CN=clica CA
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAp2tm7DhEtMNQPz23MpsxYVje
-SgMgmkDx8qdr97SBBVqtPcHMMrCEZ9dQiYCFxbshxXfeova+DbLZISDlHA9xjQID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAG/rfiV0UE6Q//VIKN5CprvNXDGQFfcFCWNRCu6ZGTPpaDf2
-iPqVISD9trZrvtlUIgKjGgOQQbdNH9RBj5+6QKo=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANxsitxvuTf1LtcvBkHf
+Ph8vuxdyWei/ZKWmlycMyMjFbjCIDbCGFhux+92S9OIzCkvq2KPpVQB5Lgf2bKwi
+b9KMtmWWdXej3lSqQOapf6h8aUc/F3flUsadTKFQPzHZi4+hOi4+t1aXzaBuopVX
+IqO2MjTQcIorxEZ9fUO+c4blAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAFjeFqPGxfNLnC1K/PPE
+QEA05z2oadv0m5trTvO3YNNYvQHdh0whiFiRRo3rc2gOSL0b4mxKDz9n4i5wdWN3
+sfx0a1RNG6rqJP4ZSF+GNye3Kux6amnHEI/tNbo/LDHxq8FQ9crva8v/pgAVXrhP
+qYhEcoGqK3DkLcSqc0LCLJMs
-----END CERTIFICATE-----
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 1E 0D 7E 35 C6 DD 12 8A 56 2B C8 44 4B 60 A9 95 DC 68 6F 37
+ localKeyID: 25 36 B6 83 AD 6E 96 A0 9A 84 CB 78 1E 5D D8 76 EE 12 4B 85
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwNFoXDTEyMTIwMTEyMzQwNFowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5uZXQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA+LXqjv5NnRW2OlKWyYYH8ZFb
-Fj4xAdg4qSa1WK/wlUUdpQldGzpDuq/BzuyQdJjp1vSnqhKjfxz0ef9xJievdwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUubmV0MA0GCSqGSIb3DQEBBQUAA0EA0dUUjXeu21xQo+AsptLSwmzhn+EV8ixI
-757XRkCnAN0mOZZHcv+imuiEXpf62J+wNyWKNCWu2iPttov/JAcYKA==
+MzQxMFoXDTEyMTIwMTEyMzQxMFowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALVlLfeBrVGMZ+dkcc7W
+GPF6/Bq4ln4lhDjgCdY1QdUcYIHEbZOgP8zXJy1jtdt7cYCmAvqsdrn62uuZfT4S
++OR5Fb4p3CCTlYqQsv9j7p9v729S67Hw6u+JLbCtFCvfneBOwA3cSuml93XEhLzm
+bqL1Cfg41yUZW5g58qRo7Ik3AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm5ldC8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAfhYF
+C9IoGApsve7LNbeVQfsP3RJoCm6IwEEE+RShrvO3O3jLVoJh9IVXtXP2MeHs5INJ
+0TUsCt5nLdNvEVSXyhOzBMDW7dKG/5p5QfQZzxd24i5Gvp1t9t+WKJ/7BmRxO0uY
+4Bef+58lCfDRA7Iapgv2Sp0x0gKz21WHrrHiJWQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
index 85ea017..ad62be9 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
index 1550cf2..54c1794 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 1E 0D 7E 35 C6 DD 12 8A 56 2B C8 44 4B 60 A9 95 DC 68 6F 37
+ localKeyID: 25 36 B6 83 AD 6E 96 A0 9A 84 CB 78 1E 5D D8 76 EE 12 4B 85
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwNFoXDTEyMTIwMTEyMzQwNFowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5uZXQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA+LXqjv5NnRW2OlKWyYYH8ZFb
-Fj4xAdg4qSa1WK/wlUUdpQldGzpDuq/BzuyQdJjp1vSnqhKjfxz0ef9xJievdwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUubmV0MA0GCSqGSIb3DQEBBQUAA0EA0dUUjXeu21xQo+AsptLSwmzhn+EV8ixI
-757XRkCnAN0mOZZHcv+imuiEXpf62J+wNyWKNCWu2iPttov/JAcYKA==
+MzQxMFoXDTEyMTIwMTEyMzQxMFowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALVlLfeBrVGMZ+dkcc7W
+GPF6/Bq4ln4lhDjgCdY1QdUcYIHEbZOgP8zXJy1jtdt7cYCmAvqsdrn62uuZfT4S
++OR5Fb4p3CCTlYqQsv9j7p9v729S67Hw6u+JLbCtFCvfneBOwA3cSuml93XEhLzm
+bqL1Cfg41yUZW5g58qRo7Ik3AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm5ldC8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAfhYF
+C9IoGApsve7LNbeVQfsP3RJoCm6IwEEE+RShrvO3O3jLVoJh9IVXtXP2MeHs5INJ
+0TUsCt5nLdNvEVSXyhOzBMDW7dKG/5p5QfQZzxd24i5Gvp1t9t+WKJ/7BmRxO0uY
+4Bef+58lCfDRA7Iapgv2Sp0x0gKz21WHrrHiJWQ=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
index 00adfe8..f68a05b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 1E 0D 7E 35 C6 DD 12 8A 56 2B C8 44 4B 60 A9 95 DC 68 6F 37
+ localKeyID: 25 36 B6 83 AD 6E 96 A0 9A 84 CB 78 1E 5D D8 76 EE 12 4B 85
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIEobdAguY51UCAggA
-MBQGCCqGSIb3DQMHBAjyQJzMIkx+swSCAWBoW5JocLm3XvmW7cnK8Np23KqUs4ST
-MG68rJY6pLqdGkn8aK0yZfecdpuHoFCZRdxQy9ztdofB50tkr7evlTuM1u40/9b0
-ygZ9ajxESZmF5mS8r6dFGXOBq7UrMpEvod1lujpP3hwtkqJOlPFhacPUestqDjP4
-zDmEmKQYyRx4DQ3QM4T2Wuc1S8TSECcMLsOgZhOxGULIzmtxceftS/V9NYewZsne
-Q05TKH7ygWGvUyYEgDlFlBAk8CAiqIBBz3fU2bmWfR5p6hoSTqGeLlAL7fTid8Vf
-g4HEfthygRC28+s5r/MbMBJKwTdRHnQbmK4rOxFUhYCkV8Df28Ukx/RaA9CKjbQl
-2fnuTRAms72szZRoKsdS3xVgyaOdgdhVJKWP2QAUvzblX/wpKr9BwrbqIhXOqEiv
-9/yCVqUg20sjNvYyw/2Zv9t+g9u3d5CMyU37e8AT8X3DExmpleiOdX4J
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIyW63oiIFzjECAggA
+MBQGCCqGSIb3DQMHBAhx1PvKKA2LOgSCAoDg13PvZWh3xAoEntbUIQM0IoHjt3Ud
+L2OOR+9BzzjvM8DJaiHTuA0hbvL6ufaQGIn0z8L9xcFPpdTNV6mJ8uBtMO7QzBYR
+YVqK9dnMQlGIRNOi/CfrKvhCdtYGe63Vbmugx/MMVl4Rvul2PWpUIA5/cimBJ/L5
+6kkOCQSPFTDErC7a/jKrPb3hcaY28zbhtStLH1+FDGh9uBcnUyYc5NkYzoNQ9UHC
+6rRNS2x9XTV6zN/mx5Z3RRlWrgz8QmlKhaYKHmpzvNks0MPE7Doh5K2qxjK30G2h
+qf7uILmECC5mWN9+sSYtffo7ooUZ3eopRzdesU21QtkVc9ILLWpn41RrQj3zfRai
+eEP8aJbWzE6oKNjwoJ6yACXlEvYY8jwqsdcNjkflGfUoZDTE2uQoDBnHfBfhklMO
+k3qyw1b1v91rg/3ueLv92AspiEC142Zmy0vwwiVKBAUrXJrynTh+WG7RWQxSfWIF
+i1J7IB8lexK1t/cm7Uf6kqOalEGl1CipMYSA7gpcLpE1O4v73orj2Cetz+lw57F9
+SqrATA+rzN1vaYWgh/oTgR5oiOvLqWSYXRbSC/buEWMOFCe5I60T35pLyDlfs2OS
+xgEV+BIkM48+PguT/+HPIutvbaY6pMzsWlzSUTiSme9LnZUm35a/pQbfwYuUTAIk
+abX/+hA4vjmocj4F8GdjnH9MjEMfeZeJFsgMOtDbC39EYk1rEgVJn+jcHKCGsJyv
+80CPEPqZ9Uq8hBXsdAApFDpAng5RTVEAWd7IvVEksiPltal5G715Gne0wvnmrO3A
+RcEL2VVJ5JoHkYkBGiJxdDMS7xXLDgnj4qO2FbysiWn99TfJg2mkzgl8
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
index 8831013..611216e 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
index 3b2606d..10795ad 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
index c67ed9c..9d2fba3 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
index 6b8b763..6a7b235 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
index 84f4bf5..8994aae 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12 and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
index 310db9b..dc857be 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 1E 0D 7E 35 C6 DD 12 8A 56 2B C8 44 4B 60 A9 95 DC 68 6F 37
+ localKeyID: 25 36 B6 83 AD 6E 96 A0 9A 84 CB 78 1E 5D D8 76 EE 12 4B 85
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwNFoXDTEyMTIwMTEyMzQwNFowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5uZXQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA+LXqjv5NnRW2OlKWyYYH8ZFb
-Fj4xAdg4qSa1WK/wlUUdpQldGzpDuq/BzuyQdJjp1vSnqhKjfxz0ef9xJievdwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUubmV0MA0GCSqGSIb3DQEBBQUAA0EA0dUUjXeu21xQo+AsptLSwmzhn+EV8ixI
-757XRkCnAN0mOZZHcv+imuiEXpf62J+wNyWKNCWu2iPttov/JAcYKA==
+MzQxMFoXDTEyMTIwMTEyMzQxMFowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALVlLfeBrVGMZ+dkcc7W
+GPF6/Bq4ln4lhDjgCdY1QdUcYIHEbZOgP8zXJy1jtdt7cYCmAvqsdrn62uuZfT4S
++OR5Fb4p3CCTlYqQsv9j7p9v729S67Hw6u+JLbCtFCvfneBOwA3cSuml93XEhLzm
+bqL1Cfg41yUZW5g58qRo7Ik3AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm5ldC8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAfhYF
+C9IoGApsve7LNbeVQfsP3RJoCm6IwEEE+RShrvO3O3jLVoJh9IVXtXP2MeHs5INJ
+0TUsCt5nLdNvEVSXyhOzBMDW7dKG/5p5QfQZzxd24i5Gvp1t9t+WKJ/7BmRxO0uY
+4Bef+58lCfDRA7Iapgv2Sp0x0gKz21WHrrHiJWQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
index 77c8dad..e4a70c8 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAPi16o7+TZ0VtjpSlsmGB/GRWxY+MQHYOKkmtViv8JVFHaUJXRs6
-Q7qvwc7skHSY6db0p6oSo38c9Hn/cSYnr3cCAwEAAQJBAK1O9tgV1Te1PXp+upxL
-TZXD2FkzlSrX5QPZ+VyHnXolg8XNhx2pA1J4iJrnvooWQRZuWRhi/p8g2ygJ8B6I
-60ECIQD/cO5OrdRWg3EBgoCWN7WAZ53qMmSRxAnMt95W5yujGQIhAPlBNzbQr2Z7
-DVvwCc2ERxuaFGTcLZH/x+oRhZ9jr0kPAiB/79froDSRgBPBZdNxaUWGol79RXAJ
-cd5WomDBtdatQQIgAVyP1qbRLnghnIz1IMBGOypeTia9wPxqtSafWj2LKZUCID/d
-8buaLYm3yYYAQwbTBtb89+gpRg0I51DFS6fNIuU4
+MIICXAIBAAKBgQC1ZS33ga1RjGfnZHHO1hjxevwauJZ+JYQ44AnWNUHVHGCBxG2T
+oD/M1yctY7Xbe3GApgL6rHa5+trrmX0+EvjkeRW+Kdwgk5WKkLL/Y+6fb+9vUuux
+8OrviS2wrRQr353gTsAN3Erppfd1xIS85m6i9Qn4ONclGVuYOfKkaOyJNwIDAQAB
+AoGAGSPjwgjj94hpIiXGrC76GAW+iQmKOgODFsreMiUBccLUEUgjE7HDBeXP1Teb
+jcbHDVh00z8x2UbOLpcAR6kje3MMGYZWgcMVOU2ealx3T5hPWwOyWHqTv0mESERv
+TBXBfowSjQyp5pSc+bDXHQUlFvwhMw7RTcXZJsjvnp0I5dECQQDh53kEXeoTXE6T
+LzPtdp5kcVTCcR6c391+zTdPcLOd6eatu9/v0DGjR5VowYcQ7jHC/1oP+H/y9qnS
+t9c7muPJAkEAzY+3T0L3WdYu3Fl9iTFJkwiJeA+VBYPJ4XcOVDWB3bdZRXEqXc+M
+HNrSL9QRjaDLWgB+iUAlnFk+ugZAArCE/wJBAKaF8OlNKV14L9vDce3cAMpd2HM0
+27IcO7RbJiiDFYSUhR0QXvTybYTFIdgEwMG0NC5f+U3IitjZBzpzlk8z0DECQHZ0
+qQfN6Uglut9T2pmig2ltc/px0EhbR4zb1LAGHY4syA7SRb3FilJebt0M8giRbl2x
+BzoEcygD7be5Pk3OdvUCQGByIPJ6wAuhcnzgZPY7ZC1+TtuoIUDsZ+mO56mfESIr
+WUN41SIFoSNqExEHnNNv30snUnzP55wTWHPTZMweHYU=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
index 9919dfa..b5a981c 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/secmod.db
index 4347c0d..a9f8a45 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/secmod.db and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
index 323ae16..cabaa2f 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.net/CN=clica CA
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAp2tm7DhEtMNQPz23MpsxYVje
-SgMgmkDx8qdr97SBBVqtPcHMMrCEZ9dQiYCFxbshxXfeova+DbLZISDlHA9xjQID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAG/rfiV0UE6Q//VIKN5CprvNXDGQFfcFCWNRCu6ZGTPpaDf2
-iPqVISD9trZrvtlUIgKjGgOQQbdNH9RBj5+6QKo=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANxsitxvuTf1LtcvBkHf
+Ph8vuxdyWei/ZKWmlycMyMjFbjCIDbCGFhux+92S9OIzCkvq2KPpVQB5Lgf2bKwi
+b9KMtmWWdXej3lSqQOapf6h8aUc/F3flUsadTKFQPzHZi4+hOi4+t1aXzaBuopVX
+IqO2MjTQcIorxEZ9fUO+c4blAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAFjeFqPGxfNLnC1K/PPE
+QEA05z2oadv0m5trTvO3YNNYvQHdh0whiFiRRo3rc2gOSL0b4mxKDz9n4i5wdWN3
+sfx0a1RNG6rqJP4ZSF+GNye3Kux6amnHEI/tNbo/LDHxq8FQ9crva8v/pgAVXrhP
+qYhEcoGqK3DkLcSqc0LCLJMs
-----END CERTIFICATE-----
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 1A 68 61 A3 03 A4 DC 65 19 7A 7E 5E 65 37 39 DB E3 CB 56 AC
+ localKeyID: 40 FC 15 EC 15 17 E0 33 9C CF AB 8B 86 3A 3B 13 BE 4A 73 A9
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDVaFw0xMjEyMDExMjM0MDVaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUubmV0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMRPNIrjXhmHfWrc/c+K9esj
-3cXECi38lpKgZyhqN8CjRvifIaMoZaCPoXoppyC3MmtLhT5JnYe8+1vSApl9jPUC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLm5ldDANBgkqhkiG9w0BAQUFAANBAMmrnrUFZRECJcDk4BGSMQp5vvC/uHi0
-1NSP3Ki4Yu+CbXUHtgZqwOB5abU8INeLbJoab2stMFsdevzRYuuqb7s=
+MjM0MTFaFw0xMjEyMDExMjM0MTFaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyYgxFSfRxFRnJXiir
+x98gGlztFVjWFXz6lj4Aug+MyZRmk0ve+LwhgyPYQpUVj1sHcAFS2+BcPITkwISE
+OswZ/T96op3bE/ajY9jWc3DKcixCDlpgWFjGHOQncfP/StakQqchjPr60/OnDghX
+VLZHt9TF7cEjNcGaq3glpsHImQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBAAk2
+Ilqx1ZkSVp5B/AS2U16tiUz00+pYJnDPg6c4dHmZFC2XwjlR5EXs9g5D0DUXjXDY
+6u4KBZyd5AEGhNIrxwYR83HSiwLWG9ZbvjtoTh5WeIwHiTYfU33SU264jNrwb0Vg
+cfDiwaKSBNWg8LL2mnKNEUGmPYr0RwCfx3qtlUA0
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
index 6df2cda..14f9804 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
index b8e34d0..214ed84 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 1A 68 61 A3 03 A4 DC 65 19 7A 7E 5E 65 37 39 DB E3 CB 56 AC
+ localKeyID: 40 FC 15 EC 15 17 E0 33 9C CF AB 8B 86 3A 3B 13 BE 4A 73 A9
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDVaFw0xMjEyMDExMjM0MDVaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUubmV0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMRPNIrjXhmHfWrc/c+K9esj
-3cXECi38lpKgZyhqN8CjRvifIaMoZaCPoXoppyC3MmtLhT5JnYe8+1vSApl9jPUC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLm5ldDANBgkqhkiG9w0BAQUFAANBAMmrnrUFZRECJcDk4BGSMQp5vvC/uHi0
-1NSP3Ki4Yu+CbXUHtgZqwOB5abU8INeLbJoab2stMFsdevzRYuuqb7s=
+MjM0MTFaFw0xMjEyMDExMjM0MTFaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyYgxFSfRxFRnJXiir
+x98gGlztFVjWFXz6lj4Aug+MyZRmk0ve+LwhgyPYQpUVj1sHcAFS2+BcPITkwISE
+OswZ/T96op3bE/ajY9jWc3DKcixCDlpgWFjGHOQncfP/StakQqchjPr60/OnDghX
+VLZHt9TF7cEjNcGaq3glpsHImQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBAAk2
+Ilqx1ZkSVp5B/AS2U16tiUz00+pYJnDPg6c4dHmZFC2XwjlR5EXs9g5D0DUXjXDY
+6u4KBZyd5AEGhNIrxwYR83HSiwLWG9ZbvjtoTh5WeIwHiTYfU33SU264jNrwb0Vg
+cfDiwaKSBNWg8LL2mnKNEUGmPYr0RwCfx3qtlUA0
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
index 382ad41..1dab786 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 1A 68 61 A3 03 A4 DC 65 19 7A 7E 5E 65 37 39 DB E3 CB 56 AC
+ localKeyID: 40 FC 15 EC 15 17 E0 33 9C CF AB 8B 86 3A 3B 13 BE 4A 73 A9
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIU+oGNqBSHjcCAggA
-MBQGCCqGSIb3DQMHBAjYaI7Iob+lDASCAWDAZIbvl/AbphvMZhynrCFGzj6iN309
-N+U1mQPGWD6hisPfA4aTpIQyHtVah6KCE1fbzGFgiNULsfByVj4XBRbetiVKMuWA
-xs/EEcPhNRG0KOeRxzDtSpM0lG078XAC4p7wgqvhf4R9524Vq4PpYzt+tKfh0rPC
-leF7VFJ5vi7Tms7q1wqtL76Wgibq4m43XoFrYMbQL2qbXl98rRAP6R6u852f4L/D
-Cy1EGsgWIdGjCPQRxdwC0Vf1vIjaspXBmVhbFJR9Djp48DShbAO11cXRSIligH6t
-7p+aesQM/illunmCaMzMYFAjdrMYZEO1bqVdU5Nd7/tlQQLgHSdo+iD6XLnci7dw
-elQ9bRxYVMEDX16kTXd4NU6xP0Zpac5XHu4ji2PKlSOSxQh5GbPICXdEH7K/Oshv
-CUIZbYnlGsOT2uFgnChtUeIwc6OXcSv3LLXIwzg0ec7yN83j0r3jQRQx
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI7bYIuOTKDfICAggA
+MBQGCCqGSIb3DQMHBAiPk4bG554wGASCAoCvbxLayy40eB5onrGDZC7EuSxFtf4f
+V3X4C+tQSvzlCmVgiTTFsxqExOrVXpv6BFVUxt0Lw8DN99jTdSrgDoO2pydPQYgv
+OTjP+hIzJasLjz5LmzrL2B73lIvBz6Cq9z7Udw18XJ21d3LlQuoT7BA65vUq2Os0
+qgl5SxM8j3RuBZB2tlorCZHu+j8ofFN8pd3jeE8qWAtL8YAU1xPWcFbx6aXURa7Y
+/Nis+V8rRlMwgArCSYsemoilK8+cj5ZRf46DkHQ5yHWHJkdVs+magZydoyCU9wGp
+kbBdnQiWlK4OJfl6otx/56ZmVn9kicFCz+TmjeAdvR8qe9pKE7MCfgTCRLLy3UH3
+2W77sf4nT317eT+W+BOskvdsepYcaWHf3SiHSNBbqJ++J551INft6oT3iUbU4LeS
+ETM77tIdhmXSdK0QKsOsUZLjOnwOOWAhv5/Da1yOrLAwV5ImJwlLqrF2c/l1eE6s
+bRb/+x7QSn0mo6th2swmQY67tR0MSjkzNzWBoiSXVATGQNsTxuZjZkGfAqlMlPxH
+1vvn+iWfpILaxIg99VWUPo90zuVXifmdl6WXt2JPqyk+s62dRzAZQV4gfBt/d5Eq
+OMuxYx5ggbgGmACOMgJ002vD6dkhY036fPMIKRPeuIdWCgQEXvmR++i3TdMkSmEc
+8gWEuc0dZGzTaRNRmwXnC73UC2mKzaNCFiTfsgRzuMwCA3DWO1CtrFRq6T1zZfci
+eZE2ARdRcli4hv4MJ/3yDubaXDw5UY55QlbBe4fcp9yJRvXhsCuXlWIgglpTLeEL
+Jkrsej7DCtRCi06U457TDVtKs+LJvfjFZXMubY+rqmZxqhoRojTXmrz2
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
index 7f6c27b..9d2661a 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
index a9ad370..bdd8d7a 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
index 4684f07..771595f 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
index a9ad370..bdd8d7a 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
index 8f9ef94..00ce6ef 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12 and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
index 8c10ace..7ca3672 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 1A 68 61 A3 03 A4 DC 65 19 7A 7E 5E 65 37 39 DB E3 CB 56 AC
+ localKeyID: 40 FC 15 EC 15 17 E0 33 9C CF AB 8B 86 3A 3B 13 BE 4A 73 A9
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDVaFw0xMjEyMDExMjM0MDVaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUubmV0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMRPNIrjXhmHfWrc/c+K9esj
-3cXECi38lpKgZyhqN8CjRvifIaMoZaCPoXoppyC3MmtLhT5JnYe8+1vSApl9jPUC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLm5ldDANBgkqhkiG9w0BAQUFAANBAMmrnrUFZRECJcDk4BGSMQp5vvC/uHi0
-1NSP3Ki4Yu+CbXUHtgZqwOB5abU8INeLbJoab2stMFsdevzRYuuqb7s=
+MjM0MTFaFw0xMjEyMDExMjM0MTFaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyYgxFSfRxFRnJXiir
+x98gGlztFVjWFXz6lj4Aug+MyZRmk0ve+LwhgyPYQpUVj1sHcAFS2+BcPITkwISE
+OswZ/T96op3bE/ajY9jWc3DKcixCDlpgWFjGHOQncfP/StakQqchjPr60/OnDghX
+VLZHt9TF7cEjNcGaq3glpsHImQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBAAk2
+Ilqx1ZkSVp5B/AS2U16tiUz00+pYJnDPg6c4dHmZFC2XwjlR5EXs9g5D0DUXjXDY
+6u4KBZyd5AEGhNIrxwYR83HSiwLWG9ZbvjtoTh5WeIwHiTYfU33SU264jNrwb0Vg
+cfDiwaKSBNWg8LL2mnKNEUGmPYr0RwCfx3qtlUA0
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
index 12a48de..6da7a9c 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAMRPNIrjXhmHfWrc/c+K9esj3cXECi38lpKgZyhqN8CjRvifIaMo
-ZaCPoXoppyC3MmtLhT5JnYe8+1vSApl9jPUCAwEAAQJAOCkksfs8B3ewlKrmXcK2
-ee/H2XUtKFzTwtzqxjAlBRHwxgSOZr4rn10t+R4j6cvLqhfbXGu0p+1oGgFCYAe6
-/QIhAOU/L1TRGgE1Q0gR+BSyWTlHNSXu1wmy0j/nVSk1fb2bAiEA2zgBX7vxRt1M
-d7AKLfqjpMKolmMUyWNQdGFI/+Ch0K8CIHsFMkAgygS18XoecnOg1bKgHMxTZEBH
-Hv6+BHxNwUFbAiBpXA98/Y1G69F2rMsXsiC4bT4tmU1CRVNDvAYjxMjAzQIhAOHO
-1ynQHqtSfjlkpZtcNqey2SlcqXz7xI/aEXVYj5Q4
+MIICXAIBAAKBgQCyYgxFSfRxFRnJXiirx98gGlztFVjWFXz6lj4Aug+MyZRmk0ve
++LwhgyPYQpUVj1sHcAFS2+BcPITkwISEOswZ/T96op3bE/ajY9jWc3DKcixCDlpg
+WFjGHOQncfP/StakQqchjPr60/OnDghXVLZHt9TF7cEjNcGaq3glpsHImQIDAQAB
+AoGAOFcFXyEDhm/OrC4EFHVVQJNzBCJ442z4A0FOpfYeES5do6QkE3FmIgOEX7pv
+0dZsPsYedOgjTZ6DrqgrcoQLkCaj1XiKDKhfJeJnA7Db6ip83vvXUUyX3u+L3q6L
+Asn8P0hFxdOjvdyqE+6N6qddyWm2PqAmCx71MvMX+Sa1K7ECQQDhEoOSYlGZD82Q
+nKTXVbbVkjAHIBVGe2Q1MaZtzV6KcL61gAQiuOcOt8bivAzXjz6y3sgkDLMd6wP7
+hlwZlRuFAkEAyuUelguPYvwhHPkPfR34aPp4n0w8sxawI2YX3Ese/TwKeZxvItPM
+2Uhiax4R89DJCOw9zGrfBPk1A/v5raXzBQJAfXfKrPHuNvteRv1rzzbTI5/I8k/q
+TE5BAH5bHt7bkyViyt9AbvLQq527W24lYo1SEHis7Zu+xjDbGX4/HWvH2QJBALEK
+kE/ZMnrrCnHfmfZRCot/03Uc7vJOX8/jq/pbymSp2XIYYJmBOwR2NvrFOGEJ1AHn
+Ml2G+6e5VNtvKYSug4kCQBYKIp6/ZqCLx72m5IK2LjskH671RvmpuqGgRhxgkLtN
+GUfe131qT18M0LtC0SoYUc73p1NUJz6OjIOsRSSQEsc=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
index 4489ac3..32112c1 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db
index 372213d..1cfbdb2 100644
Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
index cba5fac..24b07cd 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.net/CN=clica CA
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAp2tm7DhEtMNQPz23MpsxYVje
-SgMgmkDx8qdr97SBBVqtPcHMMrCEZ9dQiYCFxbshxXfeova+DbLZISDlHA9xjQID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAG/rfiV0UE6Q//VIKN5CprvNXDGQFfcFCWNRCu6ZGTPpaDf2
-iPqVISD9trZrvtlUIgKjGgOQQbdNH9RBj5+6QKo=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANxsitxvuTf1LtcvBkHf
+Ph8vuxdyWei/ZKWmlycMyMjFbjCIDbCGFhux+92S9OIzCkvq2KPpVQB5Lgf2bKwi
+b9KMtmWWdXej3lSqQOapf6h8aUc/F3flUsadTKFQPzHZi4+hOi4+t1aXzaBuopVX
+IqO2MjTQcIorxEZ9fUO+c4blAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAFjeFqPGxfNLnC1K/PPE
+QEA05z2oadv0m5trTvO3YNNYvQHdh0whiFiRRo3rc2gOSL0b4mxKDz9n4i5wdWN3
+sfx0a1RNG6rqJP4ZSF+GNye3Kux6amnHEI/tNbo/LDHxq8FQ9crva8v/pgAVXrhP
+qYhEcoGqK3DkLcSqc0LCLJMs
-----END CERTIFICATE-----
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 3A 08 2E BA 85 F0 DD 7E C5 FE 51 92 BD 0B C7 35 9D 56 6B A5
+ localKeyID: 3F 8B 78 56 29 DE F6 65 7D 18 12 99 E8 77 FB 31 9B 07 55 61
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwNFoXDTM4MDEwMTEyMzQwNFowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
-ZS5uZXQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAr20bGUprpXdQGlk/FW+RJ19l
-FZ//slFysFeG3PEVjVjCnvsoxBFZJFVyfHhyxTvVYdoC6BVZfs9HRAjgZuBImQID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJldm9rZWQxLmV4YW1w
-bGUubmV0MA0GCSqGSIb3DQEBBQUAA0EACw87yNDj6DBkvF+i1qUyw6vqijmPyOQZ
-4S+UOCyyNSsJrA1VMjRjAqGTgyU0OFtfcGuhvZ1ZnlFrvVog/icGcw==
+MzQwOVoXDTM4MDEwMTEyMzQwOVowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
+ZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJ13iNp2v6uOyJMqKudP
+F5guDxevS6AiPrp1UauKmSDifGfNXGuX/+/IT8RDV+xqmN9ToTymt93CnXVMnkYv
+2bh5Ni2UvIZCYETSY8yu1+J/WMZjICPUpA1XEhigp2tLmBn06LowiY+eeB9K/V56
+XE4EAOFLeOc24WMDZNG/9VIdAgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm5ldC8wHwYDVR0R
+BBgwFoIUcmV2b2tlZDEuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAU8xh
+9mZgc77/yN26QBsTtOLARJ/AJ6VNlUNNTUy2qntzLX0l2Y2A1yEPvRNoJSunUsUX
+5g2TwqfklzqwCCrv7fI7gNvMdAFslgkdjgA1ojcD4+L8BCN3c9M2OkLl40Y4P5Yk
+2AjK1m9xMMd5o9FHgnOdBCm3ixJ/GpB/GQGPbR8=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
index e10dae1..8a99ba2 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
index 57ab103..342fe0f 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
index 6db7016..3ab4982 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 3A 08 2E BA 85 F0 DD 7E C5 FE 51 92 BD 0B C7 35 9D 56 6B A5
+ localKeyID: 3F 8B 78 56 29 DE F6 65 7D 18 12 99 E8 77 FB 31 9B 07 55 61
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwNFoXDTM4MDEwMTEyMzQwNFowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
-ZS5uZXQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAr20bGUprpXdQGlk/FW+RJ19l
-FZ//slFysFeG3PEVjVjCnvsoxBFZJFVyfHhyxTvVYdoC6BVZfs9HRAjgZuBImQID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJldm9rZWQxLmV4YW1w
-bGUubmV0MA0GCSqGSIb3DQEBBQUAA0EACw87yNDj6DBkvF+i1qUyw6vqijmPyOQZ
-4S+UOCyyNSsJrA1VMjRjAqGTgyU0OFtfcGuhvZ1ZnlFrvVog/icGcw==
+MzQwOVoXDTM4MDEwMTEyMzQwOVowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
+ZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJ13iNp2v6uOyJMqKudP
+F5guDxevS6AiPrp1UauKmSDifGfNXGuX/+/IT8RDV+xqmN9ToTymt93CnXVMnkYv
+2bh5Ni2UvIZCYETSY8yu1+J/WMZjICPUpA1XEhigp2tLmBn06LowiY+eeB9K/V56
+XE4EAOFLeOc24WMDZNG/9VIdAgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm5ldC8wHwYDVR0R
+BBgwFoIUcmV2b2tlZDEuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAU8xh
+9mZgc77/yN26QBsTtOLARJ/AJ6VNlUNNTUy2qntzLX0l2Y2A1yEPvRNoJSunUsUX
+5g2TwqfklzqwCCrv7fI7gNvMdAFslgkdjgA1ojcD4+L8BCN3c9M2OkLl40Y4P5Yk
+2AjK1m9xMMd5o9FHgnOdBCm3ixJ/GpB/GQGPbR8=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
index d67c105..3c7bc1b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 3A 08 2E BA 85 F0 DD 7E C5 FE 51 92 BD 0B C7 35 9D 56 6B A5
+ localKeyID: 3F 8B 78 56 29 DE F6 65 7D 18 12 99 E8 77 FB 31 9B 07 55 61
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQITLxrgeizo7ACAggA
-MBQGCCqGSIb3DQMHBAiR0pknm91lSASCAWAoe8AKx1R5elFbE1FAZaGyPjegmgc5
-qFLKuVzK43OMKRphZJPKRSa12rzz40qRozJItXiDNL1+qt+IbOirtUlvvKu+5cdC
-oHQgSjA58Is1DN6f+OqD7v7S1ZdXrtyMmtvaHLfjsgX7f9acq8Q7OrcdVcJksVRL
-7yCULtR0NRxG+elh5lF9SNY+1f8Hee/dfP3LmyE+leO5ECfOWcIFLBCjLbdmMQFf
-lIodgPiy1qjuGwuXZQy/3s1tZ4p2R6dQ7FrPWCyDAxkd/Vw5+BWZ/UJD8GDKtvLL
-E9lyYuUg7KUaWiSSdsHmXMyrs+xdW+1GHqAVkuJqjWR2nxtXBDQ7GIaDfZr7nosR
-OR5ABpVtZ0eAiJz7qX3WjxtoQJ/7RRPYOnINzyRVgHHHVekyFdYd1OiQDgVoh+08
-HOOA6ZbXLyOCGqh5Syp0RAn7d8qSfX/Z8l6wnxblNG16noDPRbNGf9rU
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIC583rPcNa4oCAggA
+MBQGCCqGSIb3DQMHBAjHM1pWY5x0HgSCAoD+kPw6X5D7p4pWpQPSysrQCo1bW/TJ
+r/W+N83o9y2a7lU9Y4PYICi7l8dlS1BQl+Wl6Xh9jE9xuHHSCgr4SaUzWj92QwmP
+bg9J0pb/hl9E5VzKn7k+Ldx421RhGT+2XFQZdB63GwtcUbkoBg93/IDkXhFyg/eE
+67D1QikvNUs4LremV/O0xSAVOTkZRf4KMlJ+ovon60NF8A8Qu6fAjcltqvEq+naL
+E9EEZPrSs8ak4t4VxYksHgjryGNFqizdb+eJ/2/t6E2/k1veyiurIL99wnEOe3Zo
+Ejys8kFIAqPFUTOvb3B/F/PS43HsPVWCSnNKbQThv27lYfSZrOQ9PM+csTiGASGd
+pXr05Pmj4Xd5vENm5tivOZdJiQwDSKq1PeqcOdN1G6bePsjlodRK7vqY/CmJWsgT
+4EXCig2p4gIjRXdiiNVG8QtUX+vgrGFuWZz38P9cX2cq/q5hlBaYVbLOwmE0043m
+nPtez8DYCifBVxOy9VOvCy0zBJC3iiDPbt15DLfGdsvpvUSi0kmfMdLdX3t0Wrq8
+pOhm2d7DGBlHD3KgvXj7FdQPM4CLFpaEft+XvhQRZw/dIn+rCQNkgyn0/T///5EB
+mNd5o4QHHyO1gs1YQ8kVC9EQx3XKKXs0SSR3Ewr9ITb6Sz+7uRCpfDyMn3Bz5I3J
+v9apzA1dPvNWvOI7KfLOT8/wZuBD+PqkM//34CG6IUOXQ5UgWGKjk3601SQGjK9W
+alb9OpT55m0bQISOLfEgr6h1d/eAEahKYKv8w4SMjoxkVbdIGrnLVeU5HtYgJzr1
+erA6Y/nrfgQewrwmrvFxuBssqRb7os336KaZ+/3UvvDYttTojVZFQrLy
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
index 3c7ac69..9e54f6e 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
index 71c6b2d..5928da0 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
index 829b621..31e6835 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
index 8549f0e..d10bd6c 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
index 91af59f..a20759e 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12 and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
index 286a0ef..089b64e 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 3A 08 2E BA 85 F0 DD 7E C5 FE 51 92 BD 0B C7 35 9D 56 6B A5
+ localKeyID: 3F 8B 78 56 29 DE F6 65 7D 18 12 99 E8 77 FB 31 9B 07 55 61
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwNFoXDTM4MDEwMTEyMzQwNFowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
-ZS5uZXQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAr20bGUprpXdQGlk/FW+RJ19l
-FZ//slFysFeG3PEVjVjCnvsoxBFZJFVyfHhyxTvVYdoC6BVZfs9HRAjgZuBImQID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJldm9rZWQxLmV4YW1w
-bGUubmV0MA0GCSqGSIb3DQEBBQUAA0EACw87yNDj6DBkvF+i1qUyw6vqijmPyOQZ
-4S+UOCyyNSsJrA1VMjRjAqGTgyU0OFtfcGuhvZ1ZnlFrvVog/icGcw==
+MzQwOVoXDTM4MDEwMTEyMzQwOVowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
+ZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJ13iNp2v6uOyJMqKudP
+F5guDxevS6AiPrp1UauKmSDifGfNXGuX/+/IT8RDV+xqmN9ToTymt93CnXVMnkYv
+2bh5Ni2UvIZCYETSY8yu1+J/WMZjICPUpA1XEhigp2tLmBn06LowiY+eeB9K/V56
+XE4EAOFLeOc24WMDZNG/9VIdAgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm5ldC8wHwYDVR0R
+BBgwFoIUcmV2b2tlZDEuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAU8xh
+9mZgc77/yN26QBsTtOLARJ/AJ6VNlUNNTUy2qntzLX0l2Y2A1yEPvRNoJSunUsUX
+5g2TwqfklzqwCCrv7fI7gNvMdAFslgkdjgA1ojcD4+L8BCN3c9M2OkLl40Y4P5Yk
+2AjK1m9xMMd5o9FHgnOdBCm3ixJ/GpB/GQGPbR8=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
index 412042f..092e056 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAK9tGxlKa6V3UBpZPxVvkSdfZRWf/7JRcrBXhtzxFY1Ywp77KMQR
-WSRVcnx4csU71WHaAugVWX7PR0QI4GbgSJkCAwEAAQJAMvRiFqqDMgDCB6U8qaFK
-bEFNP0bGIql9wrLpvWtZc0CFyhV6LSjMBQSQp92r1tMlB4NKQ7leLb7XXgrPRswY
-AQIhANW94AFeO6+yIhd1OQuizl8SBQwCi0gvlMqsrf3kyDrZAiEA0hv3G/VQWPKY
-n/wikupIE/8jbJvLWLRYYWn6eGg6Y8ECIQC7RN0a1cFdsqkD/IS6mS5PRa5+U0xN
-NsMawCjBps14IQIhAL24JLypGSEIBYrIl8uDIwxzYGBMmSQCzJ9Bm7onmznBAiAe
-YGSy1e3Vji/YwZGuEyGrVl+BEIQ1p0vUgRZ7aEpVpQ==
+MIICXAIBAAKBgQCdd4jadr+rjsiTKirnTxeYLg8Xr0ugIj66dVGripkg4nxnzVxr
+l//vyE/EQ1fsapjfU6E8prfdwp11TJ5GL9m4eTYtlLyGQmBE0mPMrtfif1jGYyAj
+1KQNVxIYoKdrS5gZ9Oi6MImPnngfSv1eelxOBADhS3jnNuFjA2TRv/VSHQIDAQAB
+AoGBAIMdx1xxSIPnbmfr0rGsD+9tWq/UDNqX6TeE/K4jyAGz1Pbx7qTAeiIE3zaD
+BLEcyZIbpsRD5hHHPSkw1RGIQnakQn2yFuvl8IdOTFvSiGoCGIIjxw/CzXKZV+BZ
+KSTFnQfbHN2HnwN/VQdWmJY+NBvtFjBWHRhPxPxv28sjzBWZAkEAy4IOwpSBYRkR
+hO6djmib2UJGjDPL8ss18Fj6g6toZV9odMLlBUkZJH6g3TI7YQ0+ReflZzcp5Gmc
+pk0ZOPJ19wJBAMYVUDd+QzaBmauouKZ/0vX6G2PGtmRoT6lm5C5fWlvg1Eo+BIKv
+K58nnWSIi8QFUJtwNLNu55YD8C/GPS2lo4sCQGMKpdJO4fR2dc9DLcy73nVKyvi6
+0JwWB+cz9p+UERec6kJBA6Kh46meMv3Tz5A5GMB+zmeAMlQmjgVlakwLvBsCQFFC
+Sw8Iz//bOLQv2dgL1fosaPIMgaQ9GnjvCapwWXwZhl0Shf0qaSW4NZwZW+TFHWU2
+qZf2ZjCnWu/uTgicy7MCQA6PIFhwp45IkzLoN/BvYewl5FaqbUlume2c8LMtuI/g
+EdUeWm2HO2u1Ff7ULnQOWAlMstAqW6M+0NlWO1+5vIw=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/secmod.db
index d38550f..2b46ffb 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/secmod.db and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
index 9bd3617..98dbef8 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.net/CN=clica CA
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAp2tm7DhEtMNQPz23MpsxYVje
-SgMgmkDx8qdr97SBBVqtPcHMMrCEZ9dQiYCFxbshxXfeova+DbLZISDlHA9xjQID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAG/rfiV0UE6Q//VIKN5CprvNXDGQFfcFCWNRCu6ZGTPpaDf2
-iPqVISD9trZrvtlUIgKjGgOQQbdNH9RBj5+6QKo=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANxsitxvuTf1LtcvBkHf
+Ph8vuxdyWei/ZKWmlycMyMjFbjCIDbCGFhux+92S9OIzCkvq2KPpVQB5Lgf2bKwi
+b9KMtmWWdXej3lSqQOapf6h8aUc/F3flUsadTKFQPzHZi4+hOi4+t1aXzaBuopVX
+IqO2MjTQcIorxEZ9fUO+c4blAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAFjeFqPGxfNLnC1K/PPE
+QEA05z2oadv0m5trTvO3YNNYvQHdh0whiFiRRo3rc2gOSL0b4mxKDz9n4i5wdWN3
+sfx0a1RNG6rqJP4ZSF+GNye3Kux6amnHEI/tNbo/LDHxq8FQ9crva8v/pgAVXrhP
+qYhEcoGqK3DkLcSqc0LCLJMs
-----END CERTIFICATE-----
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 60 8E D5 FB A7 97 B2 E8 F9 84 11 4F 91 1D 3C 91 B8 19 E8 97
+ localKeyID: BB 59 48 61 DC F6 A1 F3 30 60 C2 84 89 8C 07 60 12 85 97 CC
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDRaFw0zODAxMDExMjM0MDRaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
-bGUubmV0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMj2mEnZY8N38XJ5ZLTymH2J
-hBNiubBU4ddvVQ0y48E/b5fbYwJI458bKgyNhqQtO/MG15oIndFpbazcp1p8++8C
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAfBgNVHREEGDAWghRyZXZva2VkMi5leGFt
-cGxlLm5ldDANBgkqhkiG9w0BAQUFAANBAD46Iw05ofRAaw9+yeTDPIydjl1Pkb1/
-ma4/qSK7p8BU/pMN3SH4qxKW7z6nNregMW48d5KcSxUPBmWmDCM8u70=
+MjM0MTBaFw0zODAxMDExMjM0MTBaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
+bGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJKeUtpILJigykMXlp
+HzCmcJO3JGUxAJUHsvD6QLmNTavi8cmo+6DjYiHQ3nCKLrh49EU/GETxcpAbZiSr
+g5hiJWUeat03YAYEETzqe2REKdJTZl3iKjTYj7X3zOM77KLwJ5uGQMUsNp7JrznZ
+EKxgiL1gYDUNzUqOghjjepQlawIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1Ud
+EQQYMBaCFHJldm9rZWQyLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBACrj
+PYVGKL0Ee94886qmNi/zVqhuFILwmKrln9qXFxWbpgwAvO1iufkK8BxHtTvZM4Pu
+kDCWV7BKC+tkij1XzmRbe4/VIa/R2t8vo6VSQA1P5hLIVkpg0dHLtocET9gbfzBv
+Btqs6VaXp2JIp9+jEK2IOoYi1CaknAmIhy/Wcpw3
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
index b05fa01..2b46ad5 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
index 5f70c4b..6969964 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
index e872801..fde8376 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 60 8E D5 FB A7 97 B2 E8 F9 84 11 4F 91 1D 3C 91 B8 19 E8 97
+ localKeyID: BB 59 48 61 DC F6 A1 F3 30 60 C2 84 89 8C 07 60 12 85 97 CC
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDRaFw0zODAxMDExMjM0MDRaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
-bGUubmV0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMj2mEnZY8N38XJ5ZLTymH2J
-hBNiubBU4ddvVQ0y48E/b5fbYwJI458bKgyNhqQtO/MG15oIndFpbazcp1p8++8C
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAfBgNVHREEGDAWghRyZXZva2VkMi5leGFt
-cGxlLm5ldDANBgkqhkiG9w0BAQUFAANBAD46Iw05ofRAaw9+yeTDPIydjl1Pkb1/
-ma4/qSK7p8BU/pMN3SH4qxKW7z6nNregMW48d5KcSxUPBmWmDCM8u70=
+MjM0MTBaFw0zODAxMDExMjM0MTBaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
+bGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJKeUtpILJigykMXlp
+HzCmcJO3JGUxAJUHsvD6QLmNTavi8cmo+6DjYiHQ3nCKLrh49EU/GETxcpAbZiSr
+g5hiJWUeat03YAYEETzqe2REKdJTZl3iKjTYj7X3zOM77KLwJ5uGQMUsNp7JrznZ
+EKxgiL1gYDUNzUqOghjjepQlawIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1Ud
+EQQYMBaCFHJldm9rZWQyLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBACrj
+PYVGKL0Ee94886qmNi/zVqhuFILwmKrln9qXFxWbpgwAvO1iufkK8BxHtTvZM4Pu
+kDCWV7BKC+tkij1XzmRbe4/VIa/R2t8vo6VSQA1P5hLIVkpg0dHLtocET9gbfzBv
+Btqs6VaXp2JIp9+jEK2IOoYi1CaknAmIhy/Wcpw3
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
index 681886b..3025426 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 60 8E D5 FB A7 97 B2 E8 F9 84 11 4F 91 1D 3C 91 B8 19 E8 97
+ localKeyID: BB 59 48 61 DC F6 A1 F3 30 60 C2 84 89 8C 07 60 12 85 97 CC
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIfHUUKZHRP88CAggA
-MBQGCCqGSIb3DQMHBAiGHts1xOcjYASCAWA+TB8P6+MMx7kHWAIrO7eIwxXI/ivw
-gKWa/XVFtZeZcBYCdjR0Ubfsv3emeWtZ72badVNNOgbUqaMsTraqYePGS9fVIk8e
-Pn3PjKdd7rODvSTN647CrN6ng0x1yYW/RVo5v5CnoantSojUY5eNhO+iSGPFgbvj
-h8s0uKZ3+KxlySpIJX9RU/LJQUfrdCAGkdIuPEi4graL8Z9pjyORqppYNCI+u+VG
-m76zMJq9vxBcn6v3/DpVCFL7gokwD0GgMtWtTeXiP1Yn92dsn3DPVNI/ieE1ogJs
-8WVWmTNBm0UuN0GiUWqQUXv3cqFpNArL/BObHJGWyHObUz3FgDpkP4crmhrFN2Ao
-cT34tYaN9SGfoYA+MI2DqKQ0M8aGBvbL5CVGqJqWiVB71jG+JsdS0Q+7K5JQ5d/O
-xiynUVJ8FhZBQshqPXAkPD8lOeFQ2QZp53RUSlI3d04Cy8FAZr3HzqEZ
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIt0nRf4MHvx8CAggA
+MBQGCCqGSIb3DQMHBAgcDe968rqThQSCAoAInkRNlqwwybAmdru6tyuL7jO+Sn72
+A1wglru8Wtt4T1g98QK+7N7FouDU5mVG6FT1dOO+8147svYTkuxYAZ9Gj+B0ufC9
+Gsg28V/tKtYMsv10DE0QU6cFbau+KWQtqfc62iQ8XywKPyD0z8OFojr7/LMYO2Da
+b3IjcU7g5IvRJiVNJEPk4D7qPxCkt080mw83J7887tozwr8+nRVlOjF52b+yDCBX
+UKB/vFATxqytoceDfKoZlYRgJxJ622yYeagDf2SrlFzuN+xxwPoi6fGJAqrK0TPs
+HWV03Ib+sglgz9Jtzz4knZY6MPSNgy3NEiV3cIwpng07GYOye8PdkKd4ZgwNOrwG
+0MM70SNo3aQD0EI3TbNHo22JkpMWD2Ov/OQrq6Um0isMkc+0i/SGmjv2QJFk7KcH
+fbOC9gtrkz8VKkXdpFbtvecQDtOZqN+DNGEdbNT3X8h1Hw6gFaVEOg606V43EnGg
+8XY3SpVQD4BRupd0fz5bKCrd0JJEdyBQnDSA5sUU0otwKU3cQgaKCZNuryK5YTJm
+RNIT8744xJzi2QWhrKM8YLy74nLBApYPX0oAU9O2uHv9oSXL4GhDPwyVAaYNyCcS
+KtX+VJX2nE2ztJJTj3e9EKG4KQfH5Cl8ITSRVAuxgWDicCguf1wMQTO6WiDz7ofQ
+GWayBYZuVwBGC9qRYHUA/kzC9AeQ+OfqEMb2XNyQPamBITuJCgoTyyO6KpL533vr
+ZNLMA1TV2g5YTrJOXFRhZtBb4tugaidRHMSSCFfCmq0N9PKrR3EzDchP5T63fqNZ
+KyAoLPMbaReGpC79hIRk+/7NW7vXSBD9dZciG2WNcVaSgle/sFTg7P2s
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
index 834df2a..4dfc790 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
index f110fab..8f20db9 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
index 0c271ad..7458067 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
index f110fab..8f20db9 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
index 368429e..9f51cc2 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12 and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
index 8862a6b..33018e1 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 60 8E D5 FB A7 97 B2 E8 F9 84 11 4F 91 1D 3C 91 B8 19 E8 97
+ localKeyID: BB 59 48 61 DC F6 A1 F3 30 60 C2 84 89 8C 07 60 12 85 97 CC
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDRaFw0zODAxMDExMjM0MDRaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
-bGUubmV0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMj2mEnZY8N38XJ5ZLTymH2J
-hBNiubBU4ddvVQ0y48E/b5fbYwJI458bKgyNhqQtO/MG15oIndFpbazcp1p8++8C
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAfBgNVHREEGDAWghRyZXZva2VkMi5leGFt
-cGxlLm5ldDANBgkqhkiG9w0BAQUFAANBAD46Iw05ofRAaw9+yeTDPIydjl1Pkb1/
-ma4/qSK7p8BU/pMN3SH4qxKW7z6nNregMW48d5KcSxUPBmWmDCM8u70=
+MjM0MTBaFw0zODAxMDExMjM0MTBaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
+bGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJKeUtpILJigykMXlp
+HzCmcJO3JGUxAJUHsvD6QLmNTavi8cmo+6DjYiHQ3nCKLrh49EU/GETxcpAbZiSr
+g5hiJWUeat03YAYEETzqe2REKdJTZl3iKjTYj7X3zOM77KLwJ5uGQMUsNp7JrznZ
+EKxgiL1gYDUNzUqOghjjepQlawIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1Ud
+EQQYMBaCFHJldm9rZWQyLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBACrj
+PYVGKL0Ee94886qmNi/zVqhuFILwmKrln9qXFxWbpgwAvO1iufkK8BxHtTvZM4Pu
+kDCWV7BKC+tkij1XzmRbe4/VIa/R2t8vo6VSQA1P5hLIVkpg0dHLtocET9gbfzBv
+Btqs6VaXp2JIp9+jEK2IOoYi1CaknAmIhy/Wcpw3
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
index 4c90105..225f68a 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAMj2mEnZY8N38XJ5ZLTymH2JhBNiubBU4ddvVQ0y48E/b5fbYwJI
-458bKgyNhqQtO/MG15oIndFpbazcp1p8++8CAwEAAQJAdkDE9A+7qLXXmejc3a0z
-FgvpcA7T/XK1QjP89DtR0dAbM0tLdWyhshLNcNSW6urwYKkPmw7jPmW1wC14/Ob3
-IQIhAOg4d+nA1BNR2+L2dDJhdTPWzVWERwsMaBVMsKYg8TbjAiEA3Yq7xYMK0aNU
-XTvzTnmr+y51Ce5BQK9U2q/B1kyIKIUCIDQZ902K5govo5YYlZl4JEOtPgSh2Q6x
-iei9fCTJ31ThAiEAg28IQYCiDYeJyJqFmZwjxSxlsVORkO+0Nt2o8RuMeAUCIQCj
-IPd5zjwu8dkolqvof1uMm3An3YhSLWSlJK1BSAk2Yw==
+MIICWwIBAAKBgQDJKeUtpILJigykMXlpHzCmcJO3JGUxAJUHsvD6QLmNTavi8cmo
++6DjYiHQ3nCKLrh49EU/GETxcpAbZiSrg5hiJWUeat03YAYEETzqe2REKdJTZl3i
+KjTYj7X3zOM77KLwJ5uGQMUsNp7JrznZEKxgiL1gYDUNzUqOghjjepQlawIDAQAB
+AoGADEyidYr0cCwfn75ipPnCOLrzXSQ9h6R4eDMJptNkRO51zvdnlAxmhuCOHr4q
+9Vfr8YFF5piuRnDxvKsfHNl77JCAOTdKclhiO5pe37jpO/ufOWqqA6QKd2Vk3JfH
+5bcXMgk5Bepi6U5dKxv8Sh0BbgooXXjd01yQdQHueA0Z6QkCQQDvngqIa1ltLv2a
+l4JXeWS7Q9KpQ6UovZ1Ex5BIkZ6uN3GYsn6fknYFbC3aQCRxUkK4Dhe0Hw3HwsAS
+Uy7Gw1qFAkEA1urPLABsv+JVlRcfMZeiG76LWeuk8sO945uKzlV6zxGIHWCOR6NN
+ZeAI8XGuaA3UwODigAxGRhG0WGwzGcibLwJAUYmI8gT9iD7OQ3W8/8EqOuMIY1rG
+b8eeJZJ3EYqj4YqyWBCdL/WpvYyjSbo77Gfelj0NadiLWud1bobpyu8c9QJAFie2
+m66fh1hpwijUCmS7TWjjLK3iHzSWirQqJwMg2d/QzFZ71F69R9dElL9HX2qtmASW
+1ORvCiIhGUxuKCZJ+QJATQ8Xe/RE+OjuK7jJoFd3EW5X76tNnw65FDh1FUPQQRpj
++sSOYhqhqdurwUFHUf70Ww8uYxeRGkYYmj2GFaPW9Q==
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/secmod.db
index a2fa5b6..294739e 100644
Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/secmod.db and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
index 4696e4e..5ce23eb 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.net/CN=clica CA
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAp2tm7DhEtMNQPz23MpsxYVje
-SgMgmkDx8qdr97SBBVqtPcHMMrCEZ9dQiYCFxbshxXfeova+DbLZISDlHA9xjQID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAG/rfiV0UE6Q//VIKN5CprvNXDGQFfcFCWNRCu6ZGTPpaDf2
-iPqVISD9trZrvtlUIgKjGgOQQbdNH9RBj5+6QKo=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANxsitxvuTf1LtcvBkHf
+Ph8vuxdyWei/ZKWmlycMyMjFbjCIDbCGFhux+92S9OIzCkvq2KPpVQB5Lgf2bKwi
+b9KMtmWWdXej3lSqQOapf6h8aUc/F3flUsadTKFQPzHZi4+hOi4+t1aXzaBuopVX
+IqO2MjTQcIorxEZ9fUO+c4blAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAFjeFqPGxfNLnC1K/PPE
+QEA05z2oadv0m5trTvO3YNNYvQHdh0whiFiRRo3rc2gOSL0b4mxKDz9n4i5wdWN3
+sfx0a1RNG6rqJP4ZSF+GNye3Kux6amnHEI/tNbo/LDHxq8FQ9crva8v/pgAVXrhP
+qYhEcoGqK3DkLcSqc0LCLJMs
-----END CERTIFICATE-----
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 4C 81 72 95 D9 D6 9C FD 7A B1 C0 66 9F 85 A7 01 93 A4 6E D7
+ localKeyID: 1B A7 36 8E 89 BC 90 F7 FE 52 F0 A1 10 9A D7 44 34 04 12 F5
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAjCCAaygAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIIChzCCAfCgAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwNFoXDTM4MDEwMTEyMzQwNFowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
-Lm5ldDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDCtN2Y0S4oROnlfkTeUH2ULUVs
-RShAIKdxlXRo+F09rEBzNKKNC4ZWIr+pc8U+iQzGGTiiCTfeq9bI0Uef1493AgMB
-AAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUu
-bmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRw
-Oi8vb3NjcC9leGFtcGxlLm5ldC8wHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-Lm5ldDANBgkqhkiG9w0BAQUFAANBAEMi4SnbMDOvnQk2UkvvNVGyBEXNsuskNzo9
-5wAY6x0bUZ6XWZ8+kM60gbmOqwfPA6pw/w7ui3XJ1Ac3BAUverQ=
+MzQwOVoXDTM4MDEwMTEyMzQwOVowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
+Lm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnIdsW9FhsVKz3U41e4NG
+nWW4oB1oQNiyjpnsDJ6x6VHrrO9LGx7rL2awjeRp8wVeLEioCplx/h1vrlb7HcKU
+HQNymlJQYOrkFZ/dmkQgBEt/cVW0y7xhxfmyR2XX8K7po/4vMy55MTlXtqyTWGsy
+6BDkJq5IeLCmtu9tRkmbdY0CAwEAAaOBvzCBvDAOBgNVHQ8BAf8EBAMCBPAwIAYD
+VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOG
+IWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQo
+MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAeBgNVHREE
+FzAVghNzZXJ2ZXIxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBAGcy72Le
+STsrRiAKi+tLVTCSuGn7HSKcW2jGxFyoM/FlAAYcOFDfybtH6jETiJzHJE7O1zqG
+eij7YDUza6hjHrC4uLVxpYW9Jb/pf7NYf+uhbwi0jKh1yqUTy6TzJl8yteekIBbX
+h6PCWx82d9cSXqwmQDXlyNuC38O8CXRjXLA2
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
index 3c1b67c..3cfef30 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db and b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
index f9104cf..f99967a 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db and b/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/secmod.db
index 5353087..31dd52e 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/secmod.db and b/test/aux-fixed/exim-ca/example.net/server1.example.net/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
index 4d4431b..1c4b50a 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 4C 81 72 95 D9 D6 9C FD 7A B1 C0 66 9F 85 A7 01 93 A4 6E D7
+ localKeyID: 1B A7 36 8E 89 BC 90 F7 FE 52 F0 A1 10 9A D7 44 34 04 12 F5
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAjCCAaygAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIIChzCCAfCgAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwNFoXDTM4MDEwMTEyMzQwNFowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
-Lm5ldDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDCtN2Y0S4oROnlfkTeUH2ULUVs
-RShAIKdxlXRo+F09rEBzNKKNC4ZWIr+pc8U+iQzGGTiiCTfeq9bI0Uef1493AgMB
-AAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUu
-bmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRw
-Oi8vb3NjcC9leGFtcGxlLm5ldC8wHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-Lm5ldDANBgkqhkiG9w0BAQUFAANBAEMi4SnbMDOvnQk2UkvvNVGyBEXNsuskNzo9
-5wAY6x0bUZ6XWZ8+kM60gbmOqwfPA6pw/w7ui3XJ1Ac3BAUverQ=
+MzQwOVoXDTM4MDEwMTEyMzQwOVowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
+Lm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnIdsW9FhsVKz3U41e4NG
+nWW4oB1oQNiyjpnsDJ6x6VHrrO9LGx7rL2awjeRp8wVeLEioCplx/h1vrlb7HcKU
+HQNymlJQYOrkFZ/dmkQgBEt/cVW0y7xhxfmyR2XX8K7po/4vMy55MTlXtqyTWGsy
+6BDkJq5IeLCmtu9tRkmbdY0CAwEAAaOBvzCBvDAOBgNVHQ8BAf8EBAMCBPAwIAYD
+VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOG
+IWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQo
+MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAeBgNVHREE
+FzAVghNzZXJ2ZXIxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBAGcy72Le
+STsrRiAKi+tLVTCSuGn7HSKcW2jGxFyoM/FlAAYcOFDfybtH6jETiJzHJE7O1zqG
+eij7YDUza6hjHrC4uLVxpYW9Jb/pf7NYf+uhbwi0jKh1yqUTy6TzJl8yteekIBbX
+h6PCWx82d9cSXqwmQDXlyNuC38O8CXRjXLA2
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
index d01d43b..8091fb3 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 4C 81 72 95 D9 D6 9C FD 7A B1 C0 66 9F 85 A7 01 93 A4 6E D7
+ localKeyID: 1B A7 36 8E 89 BC 90 F7 FE 52 F0 A1 10 9A D7 44 34 04 12 F5
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQItqv8KkyfDOECAggA
-MBQGCCqGSIb3DQMHBAi+cLfRJYwdhASCAWDijpItKwM1N1Tk9po65/Et0DLcJt8h
-UNc26UWxg4uGMcbyHJv5+OZDhAjla1GwFLBZDQwCsnvwfjHfpwFpSx4Mxj4SMGrx
-YCwSB8smLl5cZNJpm2N3JVlrX/ZHR1plwtVccOf9Ry7MFoyj9YcXTs9N39zmpYDD
-Oi81eD2CzGEP2NqyycJK3Fu0OMUNT5RYHF7Nja6mGjzyul8rDPHPOcwQ0CCEHUmF
-3FaMqji+aCpJ+BeFwcVYZjiuQx4ajKXnu8g4KEa1S59KgSRiAdL8Ih1dN5qrDJB5
-dDTo37DneR1RkudMs2OcbMnbhyWQZ/AhfUqqFM7NLnDSVwhUtL9kPzjqIA1+l9V6
-27ANditdhs3fS6026sC3MMJRrPXmZGU3GuItxi1hU/CjiCb54VsK8MEhWpzU6QiS
-+UXkPYKauZKsGtfn0sI8ZUCEyo2vF79KAIGK6DYQ6dIOmjvKqz2xgng/
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIdKakTEl07H8CAggA
+MBQGCCqGSIb3DQMHBAiD0tS4ZDxH2gSCAoAhrLEOGZdimKBiQbLS4cqa2dXICIkm
+B2K8rNUsIpxVibK72fT9xwEKiCQPevgJ7eCQIM5ByfOv4gumhbnEGpRTJOM2ZWZM
+Kvu6FypxkU9qX+tlaJE3K7aOjG92JKfuGgg8WShiQwGrD7SxE+/Bc93xIXZmA3QA
+VnW7NcddWiRj9sOJOv++i8wzkBluJ6QEZNLldH/QDOHLmU7yPUX4Als0KeNVaqxr
+xmAiAYc8eYJIbTFITJh4AkWi9oP/0SCHS0bP6Kb9DrsKCzTRjDmtoNdxGyaIEM5X
++NJkFaIXY5uwDvUsGUUgU+RhCg3qVhR73gRjNBchD1+pluR9tXSRpxwODkWxuo93
+OBdjYzgMfXz3oxWshKiWsRZil6vEoyFiLvciL2pN3RQib2a0Pki9MFrgvS1rhLTK
+NHcmVs8qEkz2v7BTxSTSCK29byUb27iH+pIusjNzUTKvqFWACm6h+IHOP1R1GQjT
+b08eau/+8Wfz516pgGkAnAC6kYJq281iS/iKGeF2HMfhuwTUwOsmtKHQKnLSBydn
+Kstwvyg6eUrPpG31nqHCPV77uvNrU4yxAUTfpFRRx6HXtflFwKapRkb6Knh2R0IS
+bnPaBEc9dFbM6rRxZnTT3CHDemhHKUVlzCNAFTcxNTTagG7BGIGNLVEawRMOOQaA
+eZ1c/rrljl5LOmv02lkZkZbYK72nZKsBQTkFA4XR/RTMUmTq/eJu1Hys/KEQFnVt
+DdUYFUVVcNE3082L1VkYpIAu/hocjjeHpJyhGfkR8Ipd7/+OIbuTvZ1ehsY+d8qF
+xePlxMfQfGbC9hP4XyEwtWRNrwoJmxLbnk0JdOlJJv/cIASwII8rX5sE
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
index 8dc2a09..c285577 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
index b2cb446..3c04ff2 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
index 0057816..cc562c7 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
index 5e9cee6..072509a 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
index 9596af0..c0a2592 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12 and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
index 4d14e20..088cae1 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 4C 81 72 95 D9 D6 9C FD 7A B1 C0 66 9F 85 A7 01 93 A4 6E D7
+ localKeyID: 1B A7 36 8E 89 BC 90 F7 FE 52 F0 A1 10 9A D7 44 34 04 12 F5
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAjCCAaygAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIIChzCCAfCgAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwNFoXDTM4MDEwMTEyMzQwNFowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
-Lm5ldDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDCtN2Y0S4oROnlfkTeUH2ULUVs
-RShAIKdxlXRo+F09rEBzNKKNC4ZWIr+pc8U+iQzGGTiiCTfeq9bI0Uef1493AgMB
-AAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUu
-bmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRw
-Oi8vb3NjcC9leGFtcGxlLm5ldC8wHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-Lm5ldDANBgkqhkiG9w0BAQUFAANBAEMi4SnbMDOvnQk2UkvvNVGyBEXNsuskNzo9
-5wAY6x0bUZ6XWZ8+kM60gbmOqwfPA6pw/w7ui3XJ1Ac3BAUverQ=
+MzQwOVoXDTM4MDEwMTEyMzQwOVowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
+Lm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnIdsW9FhsVKz3U41e4NG
+nWW4oB1oQNiyjpnsDJ6x6VHrrO9LGx7rL2awjeRp8wVeLEioCplx/h1vrlb7HcKU
+HQNymlJQYOrkFZ/dmkQgBEt/cVW0y7xhxfmyR2XX8K7po/4vMy55MTlXtqyTWGsy
+6BDkJq5IeLCmtu9tRkmbdY0CAwEAAaOBvzCBvDAOBgNVHQ8BAf8EBAMCBPAwIAYD
+VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOG
+IWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQo
+MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAeBgNVHREE
+FzAVghNzZXJ2ZXIxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBAGcy72Le
+STsrRiAKi+tLVTCSuGn7HSKcW2jGxFyoM/FlAAYcOFDfybtH6jETiJzHJE7O1zqG
+eij7YDUza6hjHrC4uLVxpYW9Jb/pf7NYf+uhbwi0jKh1yqUTy6TzJl8yteekIBbX
+h6PCWx82d9cSXqwmQDXlyNuC38O8CXRjXLA2
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
index 4224283..caa5c95 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAMK03ZjRLihE6eV+RN5QfZQtRWxFKEAgp3GVdGj4XT2sQHM0oo0L
-hlYiv6lzxT6JDMYZOKIJN96r1sjRR5/Xj3cCAwEAAQJAYR333g6QeFOPWwH1dfIu
-ASfnlc6U+g+PlY8XhnhDgcu2le3IQuOaI0sw/X0vZdhEKJpDHJ1hKGxIQpOB2R/P
-EQIhAPUMh9+sUsZSnNbhEggO8h6F4TeLoAVJNzUtW5UvmBgvAiEAy2hlFkLXlP0t
-VYwmNqyCs8Jhf0SIrnhPw3ynJhxgYzkCIQDlHd48yAZs3/k9ABu35SGEYHD/WlE4
-IAi6c7pZdrKiiQIgEH48hBuTY29L973Pc2t1haHjSfCCrLLwtMcsvnhakHECIEuy
-0/MQz7IYZNJ7g36j3jjv8vFkAdDCGyKzuMGLoq9p
+MIICWwIBAAKBgQCch2xb0WGxUrPdTjV7g0adZbigHWhA2LKOmewMnrHpUeus70sb
+HusvZrCN5GnzBV4sSKgKmXH+HW+uVvsdwpQdA3KaUlBg6uQVn92aRCAES39xVbTL
+vGHF+bJHZdfwrumj/i8zLnkxOVe2rJNYazLoEOQmrkh4sKa2721GSZt1jQIDAQAB
+AoGAGNM5kk5g6hitwhmXTeGCH5B0eaBwWmiD2S38S/wXR2Pgtuq0xLZgooHs2nQx
+gYOGbguP6y5u79iHT+Unqo6jor7QZ2mDc3ivSi9dscqf6XuFFNe3nF/6d7Wi6P9u
+rLeAWfasUVc8OjT7LBQmwI2IL45B7iEotB5vYlsb3uLDhJkCQQDP7GhQlKAWbF/B
+EWf7l/C4sN6Y2h4jYyRUZhE0slAoLySbDO7BPkDp4VuynJLSuGzYaXRE+zXLX8sn
+GlbB4TV7AkEAwLjUBbO/vi8IHfNtb41YNJwGOxgmvHDFzKP5105o9SQr91kLDP0I
+nVs8maRLbQN+XL8oXDpD2k3yE1cS1VmelwJAdiRH6XFpvRP7HIK9aLGer/KfqI5X
+DZhpriMIp76h2RNgY1Fn4Bl1XO8V4Vkh++WawyS4UfHDUTmu/xryLNvAPQJAdwCq
+S2sW90TrajMqXDuXP8UoQ81B/hJU0Wxflgeg396aF34wSLDmZOQ1o1nECWii2npf
+XbPMujxvQmn+Ayf3uQJASEMtiGMXx02Cdbzq0nUJxcJ45UW4vTmMD/62l3m9rKi2
+yTUFhFoKByKIecVU1RIsDgXBYJUJytk05mcx6uwPrw==
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
index 39e5eed..408a652 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.net/CN=clica CA
issuer=/O=example.net/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAp2tm7DhEtMNQPz23MpsxYVje
-SgMgmkDx8qdr97SBBVqtPcHMMrCEZ9dQiYCFxbshxXfeova+DbLZISDlHA9xjQID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAG/rfiV0UE6Q//VIKN5CprvNXDGQFfcFCWNRCu6ZGTPpaDf2
-iPqVISD9trZrvtlUIgKjGgOQQbdNH9RBj5+6QKo=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANxsitxvuTf1LtcvBkHf
+Ph8vuxdyWei/ZKWmlycMyMjFbjCIDbCGFhux+92S9OIzCkvq2KPpVQB5Lgf2bKwi
+b9KMtmWWdXej3lSqQOapf6h8aUc/F3flUsadTKFQPzHZi4+hOi4+t1aXzaBuopVX
+IqO2MjTQcIorxEZ9fUO+c4blAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAFjeFqPGxfNLnC1K/PPE
+QEA05z2oadv0m5trTvO3YNNYvQHdh0whiFiRRo3rc2gOSL0b4mxKDz9n4i5wdWN3
+sfx0a1RNG6rqJP4ZSF+GNye3Kux6amnHEI/tNbo/LDHxq8FQ9crva8v/pgAVXrhP
+qYhEcoGqK3DkLcSqc0LCLJMs
-----END CERTIFICATE-----
Bag Attributes
friendlyName: server2.example.net
- localKeyID: E6 14 E8 D3 C2 D6 33 C5 46 4A 62 47 B7 C2 BA D6 3B 26 F2 56
+ localKeyID: 72 7D 82 E8 0E C8 D0 9F 59 C2 7B 2A AA A6 00 90 39 72 2F 4B
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAzCCAa2gAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDRaFw0zODAxMDExMjM0MDRaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
-ZS5uZXQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoXux6WdUK5xq7w+eMCFo2iEE
-GCUYpmqc4H6AmgxmglEfrndnKMv/fLRJpMUMe65a2fIPdMaZO6uX/fBDYSeUjwID
-AQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5uZXQvMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBs
-ZS5uZXQwDQYJKoZIhvcNAQEFBQADQQBhKq+CoKmxvdEJ4+AlNsJGpByKiwsDo0Cz
-mtgyGnn4a+3kkKYb2/KWosrBBLIzZbuzQ6sAjDKKioKJy7+ENuki
+MjM0MTBaFw0zODAxMDExMjM0MTBaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
+ZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN4Omf5pudP+zovmhwpA
+MWQTcp6nF6pcccb4LChs7+p8M2BYDSnFvOctnDmMH3kTuj+ePdZ/XelBw/Ksy4Yq
+8/AGAsXTc2WJZ3CmN+pL7EhndEyrU9rgFe7MEnam6v9F5QDvy3KAjTUzo4JTJIXC
+0Q7NfH4Zf5CZaUPgctGF5Dh3AgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm5ldC8wHgYDVR0R
+BBcwFYITc2VydmVyMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQUFAAOBgQBLvPS8
+77ziXVwDFPQDjDAJoSPNyYjSI+WvFWvKYWe2S0lduWff1gZvi/rnrenQm/RTHTJ8
+e+5QW3ub8Qx56iJLy73JcgPtjXpPHpNQOC6ELyeT98P6g5FegULkOjZbbmzrUEfa
+DFphi+a1KnRzYKbLggMkHlec9q6f9PY7mIySUA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
index 0478b4b..de6bfbe 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db and b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
index 11649e0..30775f4 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db and b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/secmod.db
index 4bdbe54..410a6d0 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/secmod.db and b/test/aux-fixed/exim-ca/example.net/server2.example.net/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
index 8f2b6af..1d9585e 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: E6 14 E8 D3 C2 D6 33 C5 46 4A 62 47 B7 C2 BA D6 3B 26 F2 56
+ localKeyID: 72 7D 82 E8 0E C8 D0 9F 59 C2 7B 2A AA A6 00 90 39 72 2F 4B
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAzCCAa2gAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDRaFw0zODAxMDExMjM0MDRaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
-ZS5uZXQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoXux6WdUK5xq7w+eMCFo2iEE
-GCUYpmqc4H6AmgxmglEfrndnKMv/fLRJpMUMe65a2fIPdMaZO6uX/fBDYSeUjwID
-AQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5uZXQvMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBs
-ZS5uZXQwDQYJKoZIhvcNAQEFBQADQQBhKq+CoKmxvdEJ4+AlNsJGpByKiwsDo0Cz
-mtgyGnn4a+3kkKYb2/KWosrBBLIzZbuzQ6sAjDKKioKJy7+ENuki
+MjM0MTBaFw0zODAxMDExMjM0MTBaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
+ZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN4Omf5pudP+zovmhwpA
+MWQTcp6nF6pcccb4LChs7+p8M2BYDSnFvOctnDmMH3kTuj+ePdZ/XelBw/Ksy4Yq
+8/AGAsXTc2WJZ3CmN+pL7EhndEyrU9rgFe7MEnam6v9F5QDvy3KAjTUzo4JTJIXC
+0Q7NfH4Zf5CZaUPgctGF5Dh3AgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm5ldC8wHgYDVR0R
+BBcwFYITc2VydmVyMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQUFAAOBgQBLvPS8
+77ziXVwDFPQDjDAJoSPNyYjSI+WvFWvKYWe2S0lduWff1gZvi/rnrenQm/RTHTJ8
+e+5QW3ub8Qx56iJLy73JcgPtjXpPHpNQOC6ELyeT98P6g5FegULkOjZbbmzrUEfa
+DFphi+a1KnRzYKbLggMkHlec9q6f9PY7mIySUA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
index 0375904..c49b6a4 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: E6 14 E8 D3 C2 D6 33 C5 46 4A 62 47 B7 C2 BA D6 3B 26 F2 56
+ localKeyID: 72 7D 82 E8 0E C8 D0 9F 59 C2 7B 2A AA A6 00 90 39 72 2F 4B
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQId2/8mqWfInACAggA
-MBQGCCqGSIb3DQMHBAgvDNlX6TpnZQSCAWD27NSWhbC88NONthVEEIHARSoUieXl
-Hsker9qC52voq+kSQf4sFmifD9SgestoXFoxBOWi4mnO2uwUqu/yC3Igrr0DE0VH
-zXapBoEbd7Yr4y5BN7M5+oQPGjxCUocP3Bp9dxvo5T3lFLtmaBvdBucVHvn6UqzX
-uUZw3O1LdoMm6PqZXBh8vzhapYq5I5oMOhWJsJrauSfXaBJObeo3MgFF6WfUQlnI
-fR/O7uJ00t+ArvdkQVIDT70FWWAFvt9DDtVIUcva8BfiGEjPjqso0tElTzPRqRrs
-WmS1jn1Lf/EVaVSOIIecjHodxeA7R/vMlG+5U/PcgfeYMEFyn0Aj/tUvdR6tTAUy
-1K5zFEGG5YCY2e0HmVyc/qvOoSPwi7f8eJEziTuv2nXlPrjd74OcGn1ffXyMeDZ6
-gDAQB9pe/7m9OZ9MAxuak4DEyFMdNJTFJ3il0ILAi8R2GOGA+TVSrGAT
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI6dDZ4GOM1XYCAggA
+MBQGCCqGSIb3DQMHBAi9CkUH/zN3wQSCAoAXJfw9YWtwTpC0c40oX/0rFOpwe7Uo
+GxJX1XtO26c92wSf1rGDT0kMLrEZ4YcHSwrxo+yworq+gDz+nQS0ITdCC1RCq5au
+HjoJgEhkj4h2SlbpDtyzydcEu4Aiw5zrZVIswO/Gu7WWjf15nbDW9wKfUy5bt4kr
+fA4FbB4O697whZ8EjB2HR2PjKOKfH9ned+EM1XnEaaXmd9OF9P7UYnKnU1siz78f
+lhuUyA6r7K7hZeNoXllEBZo8fUWx72BOi5ze9UvAp6x0AJ9sD8BXc5BjSkWS61Qj
+99WUoONC3fWZzrtYKmE5YQVaky+np/rxtRl+g4naG8aJK9Qi4PQZ4Q+/vk+lfncE
+PXY6D2KraTGZeH7qrzmWIQgqZeAeUCxeghBIKTKVnEbjsBqHY0MJfCT1xaCmGzft
+zi3ncbo8NKi4qims1doU2lwzgu1vwFxt60rON1omaoQcLHG+qTPmCnt1Y+88f0AE
+QXbniX9kPPBZ6zQQibCYCuFJgrp8luuPCSy6xJHA8thwhNuiKHIVyaYu2n85YA6z
+15XIuia2xhqYB8VwZOG6IG6FXc8065xdTMZxVSgu8RLjqwf0M9idU08zjdv/NIg0
+El6EwONVwylaWORhFrW18hAo0A2fi+MtyYB5BaqX0IyUD9tup0opdl7zbrUzWK/D
+upnlbZqO4okXvDDilCYscLFwZ3Q2qnpEyjMA+7Z1lwuZ+kQW/+FqhvY8IoTTPO0Y
+ZpAdT7DNKIUyfouHKS3t1I28uChsyQvFq7U+kAaK5lsGzUbXKiq6Ky2f4XddZ9jX
+wsx4dVeUuQ7wqOTG3ilGe2hH3WlSJatUu8xajqV2eU8APFfr49+zlME/
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
index edb418a..ba20072 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
index dcb27f2..b52bb86 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
index 54d932e..f5b22e6 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
index dda468d..b52bb86 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
index e54fff3..a603b66 100644
Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12 and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
index e973e00..69a53de 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: E6 14 E8 D3 C2 D6 33 C5 46 4A 62 47 B7 C2 BA D6 3B 26 F2 56
+ localKeyID: 72 7D 82 E8 0E C8 D0 9F 59 C2 7B 2A AA A6 00 90 39 72 2F 4B
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAzCCAa2gAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDRaFw0zODAxMDExMjM0MDRaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
-ZS5uZXQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoXux6WdUK5xq7w+eMCFo2iEE
-GCUYpmqc4H6AmgxmglEfrndnKMv/fLRJpMUMe65a2fIPdMaZO6uX/fBDYSeUjwID
-AQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5uZXQvMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBs
-ZS5uZXQwDQYJKoZIhvcNAQEFBQADQQBhKq+CoKmxvdEJ4+AlNsJGpByKiwsDo0Cz
-mtgyGnn4a+3kkKYb2/KWosrBBLIzZbuzQ6sAjDKKioKJy7+ENuki
+MjM0MTBaFw0zODAxMDExMjM0MTBaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
+ZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN4Omf5pudP+zovmhwpA
+MWQTcp6nF6pcccb4LChs7+p8M2BYDSnFvOctnDmMH3kTuj+ePdZ/XelBw/Ksy4Yq
+8/AGAsXTc2WJZ3CmN+pL7EhndEyrU9rgFe7MEnam6v9F5QDvy3KAjTUzo4JTJIXC
+0Q7NfH4Zf5CZaUPgctGF5Dh3AgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm5ldC8wHgYDVR0R
+BBcwFYITc2VydmVyMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQUFAAOBgQBLvPS8
+77ziXVwDFPQDjDAJoSPNyYjSI+WvFWvKYWe2S0lduWff1gZvi/rnrenQm/RTHTJ8
+e+5QW3ub8Qx56iJLy73JcgPtjXpPHpNQOC6ELyeT98P6g5FegULkOjZbbmzrUEfa
+DFphi+a1KnRzYKbLggMkHlec9q6f9PY7mIySUA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
index 74b3501..47f1f55 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAKF7selnVCucau8PnjAhaNohBBglGKZqnOB+gJoMZoJRH653ZyjL
-/3y0SaTFDHuuWtnyD3TGmTurl/3wQ2EnlI8CAwEAAQJAGXXkRjWperrNzWV7/oC2
-BHZiK+Blc4+prmejpSZBX1hk5XFL8vMx3H1yYnYj3LLr2MzuZ7W410GXBvZkfOy5
-uQIhANSjR5qV2dgzdI7nTjPXZOVPHfh9S4RbgCa8nbm+Yg59AiEAwmnlkEP8BMHx
-8GeuItJyuIQYXU/TRFIAB5N9nDWO4PsCIFvZj/OJaUlHqMCVz6T7FL0suMB+tuEc
-eTXCYcs7HrYtAiEAi4ivv+xbbBq7B72SSOHcfrwoNIi/bBCifs2H4N67zpMCIBpU
-fl/bfvpZ2FtBsZ1yMTgTXzaZyOllhYkaZO3bvQYU
+MIICXQIBAAKBgQDeDpn+abnT/s6L5ocKQDFkE3KepxeqXHHG+CwobO/qfDNgWA0p
+xbznLZw5jB95E7o/nj3Wf13pQcPyrMuGKvPwBgLF03NliWdwpjfqS+xIZ3RMq1Pa
+4BXuzBJ2pur/ReUA78tygI01M6OCUySFwtEOzXx+GX+QmWlD4HLRheQ4dwIDAQAB
+AoGBAK9P/dozZGfvquge14yLQ7NL+1kweGmi1J0Ov+Ymo3+QEQvGWJYbLFmj08xH
+SW3Q2mFxsEaRhfYrWuVT8Nb7QFxOFifBElNBMrR8Y6V4tel8J7kO8JbMcpDuh8KI
+FgezJI2FHOlK6B2gqzX96+uUQo9JhuelSoEyeVJSk14ih1MBAkEA8C3K9/6zV/VA
+0P9jNeeBXQHU3UvqZXmxxuxZvBmH9H484To/wpbtkfKTO9ldYO1FOsm0vTYQAIma
+J96+OZVugQJBAOyvNvnTFkmzMQon46GgaDZkSq2mYarynmVN7U0Y0rsv+LUOS1ub
+9iOGa3xlTxUil08ITBLHMRoswmVTHP29mvcCQEVrFuUCytc7XZaKmiQ0W2GEa//i
+N0dJGycBnRYO0wrJidMXQOJ/OP8b+44qzyB6s63AKusdOxbMrq+jY5vFIwECQADa
+MKx9ohrp1kdfFWbDmRx5B/vQGZHwBbn/qdcZO8kIxzB/uK2/xgciuMhd5QcCdOEH
++p4msXqSprCOuBAB2skCQQDpuyddtsWqIsFn4NKrXAe0yGOMLW9ZdKf6uFzw491o
+KJnL/vIvWY/gHcRlOb6ezcV3GR0Ok2nOQwA1QhKmZ3EZ
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
index bdb4c06..bbdba70 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
@@ -1,10 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxY7JyBAI+e4vb4bz0HcjtE+O
-x0nLBB19Kz04yNARj1z/ZvY2c+uvOR3muHROCgFUQxGobP3n2HaTS/cmv2SVPwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAJLhs/m5Jx4oV++aylcAvIHa0vHSK4eh3zX1HqWwqK9I0/nl
-LqwwPgtgHQOpe7nd2g2B9wPZ82i6LiqY76A+9hI=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKVtsAGe7PATQiOvMyxM
+PL8bA1VwmS+auXRgcHWPi1Jgkd1QmS0+lZqqm5VQ1kym7vUvhggfdX5uljC6nFJ3
+41b/e0zbRB1lhyLDNxarSxPg9+Lkv/9U8r0emvwpm9PfEZnqGQKil4rKX3cdZy21
+196jOwq5X/L1S5RjYFzcVaqZAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAEHHENxfpDuyHeYT/wTW
+MaHwBbycWFoFIlIA/PBt7J3WFHiyV6IomjWMy1hMg9URN2mlGodQMYk64IDrFwZp
+9Cni9eVuWB/SlJRDi8c3WOHrkzqybuysT7DDbGQDLQUy2HuOCpyJQDikd9XlO775
+tCx603UJ6mmBZHv/vzgk35Zc
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
index bbcf3ac..f01a852 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
@@ -1,11 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db
index 173ac18..af613e1 100644
Binary files a/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db and b/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/key3.db b/test/aux-fixed/exim-ca/example.org/BLANK/key3.db
index f4cc9de..b8f34c5 100644
Binary files a/test/aux-fixed/exim-ca/example.org/BLANK/key3.db and b/test/aux-fixed/exim-ca/example.org/BLANK/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/secmod.db b/test/aux-fixed/exim-ca/example.org/BLANK/secmod.db
index 8a83193..b709dd8 100644
Binary files a/test/aux-fixed/exim-ca/example.org/BLANK/secmod.db and b/test/aux-fixed/exim-ca/example.org/BLANK/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/CA.pem b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
index bdb4c06..bbdba70 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
@@ -1,10 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxY7JyBAI+e4vb4bz0HcjtE+O
-x0nLBB19Kz04yNARj1z/ZvY2c+uvOR3muHROCgFUQxGobP3n2HaTS/cmv2SVPwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAJLhs/m5Jx4oV++aylcAvIHa0vHSK4eh3zX1HqWwqK9I0/nl
-LqwwPgtgHQOpe7nd2g2B9wPZ82i6LiqY76A+9hI=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKVtsAGe7PATQiOvMyxM
+PL8bA1VwmS+auXRgcHWPi1Jgkd1QmS0+lZqqm5VQ1kym7vUvhggfdX5uljC6nFJ3
+41b/e0zbRB1lhyLDNxarSxPg9+Lkv/9U8r0emvwpm9PfEZnqGQKil4rKX3cdZy21
+196jOwq5X/L1S5RjYFzcVaqZAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAEHHENxfpDuyHeYT/wTW
+MaHwBbycWFoFIlIA/PBt7J3WFHiyV6IomjWMy1hMg9URN2mlGodQMYk64IDrFwZp
+9Cni9eVuWB/SlJRDi8c3WOHrkzqybuysT7DDbGQDLQUy2HuOCpyJQDikd9XlO775
+tCx603UJ6mmBZHv/vzgk35Zc
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.key b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
index 4248964..eaf129d 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
@@ -1,14 +1,20 @@
Bag Attributes
friendlyName: OCSP Signer
- localKeyID: 89 7C 3C C4 3E 60 FD AA 47 69 0A 11 1B 17 C9 BD 6B D2 DA 1E
+ localKeyID: E8 D4 D3 29 AE F0 FC 77 0F 79 A8 A3 D2 71 5E 90 8F 82 33 BE
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAl1EzD7A3887Wit6D
-uE5WOuTdCD4RVQFBa85RFHZd/Q3Yiw5SXh7gQaykL/4mrFHzgbKNgj6WmjBp4tNI
-FQYqJQIDAQABAkBNigd/X46cef5IdRPMayAW19ZH9f5Nr/IFO1kjAjDRjfASDkBN
-V/rMV+78Rh5fOAj1S74VILvKTaaLWhvkDOF1AiEAxxhzyV1rOrdo/tp7W6uD5m0g
-OTxUZYn/6Ec/Kkb6SjsCIQDCkN8rSD+IkhJ3zQOvCi2Onxjon5mE4mkbhZLq84W3
-HwIhAJbbRlCbwnY5JwuEjNgG++iLY1E7D0/o4skjww7LvTalAiBCCbH1mtwVmp6y
-Et/BNY8o7U8jBaixtbc/JCMto+IquQIhAI6flaLC9nQbBh6BX6GVeGu3XS9M/jFe
-EK9fMWn71opJ
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALutg6gkViRT8tWN
+Pxd8PcPpbZNdqUsLyBxFrqI7GS6vxwLWsEmoorRCG+hqgHz1PIRqqnrCOVE1tVR6
+5QAoyHqbVo1F8XWNd3MN1RXjIQsFlyygfp4mrfYCJTewna/Oxod+uL2X3IdvWx9Q
+49TjpoXtKRE76M3yH/TGryyKM/LFAgMBAAECgYAN1l0+qG8xfn8I/8EHGkHzj+Jk
+WyOARP4cF4corvLMXmlt7CZTR/u3DqjAGhofHHW5zaOEKY3QTwVvlSANQvSE9RPs
+irPmbn7hKiPrYXzFHhkzEOD/Aj9QQJX2ekmv9kA0IMpb0OJvGTGP/P7KUz80KFTZ
++Qf3OkKWv7KndBukAQJBAPo25w2TtgUhAv57xIv45cJytHb0OfsOQDaTerLHPlri
+YbakSnb/8zQOZPAl3einFqHaiFrXZhSD5KpPbi1qA50CQQDABHAKkWWNJHFHBszQ
+yozzjKwvQlghimK6SU+glXnuy9zUBxEMnCf1wTjCSkrLBdLr45rK7PESflcx6mJ0
+XCdJAkBbsd0Qs64DySpAuni31vnUPZb29N9+qqVLmtZfR/cI9WdbuG91lqy4ygGh
+pC7jgMAhhmVr7P4CzKby5vL4f55dAkByP7GyeARmUHKeAivHZ10qZF7m16C8hCxu
+DsS0FXwxW1cPSQ0Z5afZD5iH8dBCsDppZElryEM/77BN4NmnxlURAkADBclq96ur
+WVnof9gDDRzks15OvNfbkjfdRWCfH56ALwjIJROCk/e9tzluxDphp5e559Wl6Vlk
+GzlwiLgMhyM6
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
index e247406..38a87b6 100644
Binary files a/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12 and b/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
index 287e61e..8c6580a 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
@@ -1,11 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIBgDCCASqgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICBTCCAW6gAwIBAgIBAzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMloXDTM4MDEwMTEyMzQwMlowMjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxGjAY
-BgNVBAMTEWNsaWNhIE9DU1AgU2lnbmVyMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJB
-AJdRMw+wN/PO1oreg7hOVjrk3Qg+EVUBQWvOURR2Xf0N2IsOUl4e4EGspC/+JqxR
-84GyjYI+lpowaeLTSBUGKiUCAwEAAaMqMCgwDgYDVR0PAQH/BAQDAgeAMBYGA1Ud
-JQEB/wQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBBQUAA0EAZe2NAm2FGEJuLkyZ
-AiGPi2pdu5ngE+vQhyTFR3EJ4L6HDkNGE5Mv7lrsSSWU47N3R+Oo+glEau6SyTb1
-zMIYxQ==
+MzQwNVoXDTM4MDEwMTEyMzQwNVowMjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxGjAY
+BgNVBAMTEWNsaWNhIE9DU1AgU2lnbmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQC7rYOoJFYkU/LVjT8XfD3D6W2TXalLC8gcRa6iOxkur8cC1rBJqKK0Qhvo
+aoB89TyEaqp6wjlRNbVUeuUAKMh6m1aNRfF1jXdzDdUV4yELBZcsoH6eJq32AiU3
+sJ2vzsaHfri9l9yHb1sfUOPU46aF7SkRO+jN8h/0xq8sijPyxQIDAQABoyowKDAO
+BgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwkwDQYJKoZIhvcN
+AQEFBQADgYEAm6jduZih+cPktPque/PwpU5DaKFcPrJV1uJ7Ix9X0jguoOu+TrN4
++JEcwFmtSiltEGbzGqWdjXGQIJblt9dON1GtFex9GuwNYXjX9T5vBiw4jPE714kX
+KwelPLzOifbqlgkSluejw+0R2v57pLyJiVxEn8fYqKKDYboIM3p8E4o=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
index bbcf3ac..f01a852 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
@@ -1,11 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/ca.conf b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
index 9d6d2ed..4330c5a 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
@@ -1,5 +1,5 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:02 2012
+; Thu Nov 1 12:34:05 2012
[CLICA]
crl_url=
http://crl.example.org/latest.crl
@@ -13,6 +13,6 @@ ocsp_url=
http://oscp/example.org/
org=example.org
subject=clica CA
name=Certificate Authority
-bits=512
+bits=1024
diff --git a/test/aux-fixed/exim-ca/example.org/CA/cert8.db b/test/aux-fixed/exim-ca/example.org/CA/cert8.db
index 7f25f8d..0c5a2b8 100644
Binary files a/test/aux-fixed/exim-ca/example.org/CA/cert8.db and b/test/aux-fixed/exim-ca/example.org/CA/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty b/test/aux-fixed/exim-ca/example.org/CA/crl.empty
index f35edb0..36d5c2f 100644
Binary files a/test/aux-fixed/exim-ca/example.org/CA/crl.empty and b/test/aux-fixed/exim-ca/example.org/CA/crl.empty differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
index 250311c..c77ccca 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20130127152434Z
+update=20131215221458Z
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
index 292e871..f87febc 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
@@ -1,6 +1,7 @@
-----BEGIN X509 CRL-----
-MIGsMFgCAQEwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhhbXBsZS5vcmcx
-GzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydBgPMjAxMzAxMjcxNTI0MzRaMA0G
-CSqGSIb3DQEBBQUAA0EAL3N9NbP2jClLBlaFsAFB959JN6Hm7B6H5uYdGo55Rvt6
-1BZvz36DEQemcEmzrelVOR+bCBTTBkH8SC6jv9dsAQ==
+MIHtMFgCAQEwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhhbXBsZS5vcmcx
+GzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydBgPMjAxMzEyMTUyMjE0NThaMA0G
+CSqGSIb3DQEBBQUAA4GBAG8ZVJrELnQuBcpuKhiU8qh7L8b87qa5Df/BL9x5Gab8
+TL5j7f0+BVzY374K0G09gTpSzBDhmC2kVlNWUQn5BJ02UX13suUgGqUR9rZAPDgm
+zvxoZ+oiYlHedkiPjbiJXFyazaZI5LbpjQIHVuMvz+JGIus2fqgxuTwT/VPX1e7R
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2 b/test/aux-fixed/exim-ca/example.org/CA/crl.v2
index 8c7f4d4..292ecb2 100644
Binary files a/test/aux-fixed/exim-ca/example.org/CA/crl.v2 and b/test/aux-fixed/exim-ca/example.org/CA/crl.v2 differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
index 434045f..5bb688b 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20130127152437Z
-addcert 102 20130127152437Z
-addcert 202 20130127152437Z
+update=20131215221500Z
+addcert 102 20131215221500Z
+addcert 202 20131215221500Z
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
index bff5953..c3e61aa 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
@@ -1,7 +1,9 @@
-----BEGIN X509 CRL-----
-MIHcMIGHAgEBMA0GCSqGSIb3DQEBBQUAMDMxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRswGQYDVQQDExJjbGljYSBTaWduaW5nIENlcnQYDzIwMTMwMTI3MTUyNDM3WjAt
-MBQCAWYYDzIwMTMwMTI3MTUyNDM3WjAVAgIAyhgPMjAxMzAxMjcxNTI0MzdaMA0G
-CSqGSIb3DQEBBQUAA0EAVWskomLMAt1QAPrpuIC7WsNrAmPRG1XL+Ggm8d4rESya
-WGQxA0p4ZM6THLfJ3ZWAxlMHEGVkqAUQpUnZhNHmEQ==
+MIIBHTCBhwIBATANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFtcGxlLm9y
+ZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0GA8yMDEzMTIxNTIyMTUwMFow
+LTAUAgFmGA8yMDEzMTIxNTIyMTUwMFowFQICAMoYDzIwMTMxMjE1MjIxNTAwWjAN
+BgkqhkiG9w0BAQUFAAOBgQCGFIVdQwsF2p1VEwk4JAs519e08iDHQRo49Wk3jueS
+bkn1jV5Y4FFIo5MSEDkqZR4Y0XfyUYLq0RRJD44vC7v/KtkNQvdXeQbp4w5td67A
+qMeqPSfUu3R2vo0Hz7Y40gy0veK3PWjrqpxT7h0mw+GBscKSKRJLu98T96v62fBq
+UQ==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/key3.db b/test/aux-fixed/exim-ca/example.org/CA/key3.db
index e11319f..a27bd8a 100644
Binary files a/test/aux-fixed/exim-ca/example.org/CA/key3.db and b/test/aux-fixed/exim-ca/example.org/CA/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/noise.file b/test/aux-fixed/exim-ca/example.org/CA/noise.file
index 8641648..9ce6886 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.org/CA/noise.file
@@ -1,301 +1,243 @@
processor : 0
vendor_id : GenuineIntel
cpu family : 6
-model : 26
-model name : Intel(R) Xeon(R) CPU E5520 @ 2.27GHz
-stepping : 5
-cpu MHz : 2260.628
-cache size : 8192 KB
+model : 13
+model name : QEMU Virtual CPU version (cpu64-rhel6)
+stepping : 3
+cpu MHz : 1994.999
+cache size : 4096 KB
fpu : yes
fpu_exception : yes
-cpuid level : 11
+cpuid level : 4
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts mmx fxsr sse sse2 ss syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts xtopology tsc_reliable nonstop_tsc aperfmperf unfair_spinlock pni ssse3 cx16 sse4_1 sse4_2 x2apic popcnt hypervisor lahf_lm ida dts
-bogomips : 4521.25
+flags : fpu de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm up unfair_spinlock pni cx16 hypervisor lahf_lm
+bogomips : 3989.99
clflush size : 64
cache_alignment : 64
-address sizes : 40 bits physical, 48 bits virtual
+address sizes : 38 bits physical, 48 bits virtual
power management:
-processor : 1
-vendor_id : GenuineIntel
-cpu family : 6
-model : 26
-model name : Intel(R) Xeon(R) CPU E5520 @ 2.27GHz
-stepping : 5
-cpu MHz : 2260.628
-cache size : 8192 KB
-fpu : yes
-fpu_exception : yes
-cpuid level : 11
-wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts mmx fxsr sse sse2 ss syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts xtopology tsc_reliable nonstop_tsc aperfmperf unfair_spinlock pni ssse3 cx16 sse4_1 sse4_2 x2apic popcnt hypervisor lahf_lm ida dts
-bogomips : 4521.25
-clflush size : 64
-cache_alignment : 64
-address sizes : 40 bits physical, 48 bits virtual
-power management:
-
- CPU0 CPU1
- 0: 2481 0 IO-APIC-edge timer
- 1: 21441 346 IO-APIC-edge i8042
- 3: 1 0 IO-APIC-edge
- 4: 1 0 IO-APIC-edge
- 7: 0 0 IO-APIC-edge parport0
- 8: 1 0 IO-APIC-edge rtc0
- 9: 0 0 IO-APIC-fasteoi acpi
- 12: 78986 1718 IO-APIC-edge i8042
- 14: 0 0 IO-APIC-edge ata_piix
- 15: 2423330 1435 IO-APIC-edge ata_piix
- 16: 1025 0 IO-APIC-fasteoi Ensoniq AudioPCI
- 17: 239850 2559 IO-APIC-fasteoi ehci_hcd:usb1, ioc0
- 18: 246 0 IO-APIC-fasteoi uhci_hcd:usb2
- 19: 1868741 51479 IO-APIC-fasteoi eth0
- 24: 0 0 PCI-MSI-edge pciehp
- 25: 0 0 PCI-MSI-edge pciehp
- 26: 0 0 PCI-MSI-edge pciehp
- 27: 0 0 PCI-MSI-edge pciehp
- 28: 0 0 PCI-MSI-edge pciehp
- 29: 0 0 PCI-MSI-edge pciehp
- 30: 0 0 PCI-MSI-edge pciehp
- 31: 0 0 PCI-MSI-edge pciehp
- 32: 0 0 PCI-MSI-edge pciehp
- 33: 0 0 PCI-MSI-edge pciehp
- 34: 0 0 PCI-MSI-edge pciehp
- 35: 0 0 PCI-MSI-edge pciehp
- 36: 0 0 PCI-MSI-edge pciehp
- 37: 0 0 PCI-MSI-edge pciehp
- 38: 0 0 PCI-MSI-edge pciehp
- 39: 0 0 PCI-MSI-edge pciehp
- 40: 0 0 PCI-MSI-edge pciehp
- 41: 0 0 PCI-MSI-edge pciehp
- 42: 0 0 PCI-MSI-edge pciehp
- 43: 0 0 PCI-MSI-edge pciehp
- 44: 0 0 PCI-MSI-edge pciehp
- 45: 0 0 PCI-MSI-edge pciehp
- 46: 0 0 PCI-MSI-edge pciehp
- 47: 0 0 PCI-MSI-edge pciehp
- 48: 0 0 PCI-MSI-edge pciehp
- 49: 0 0 PCI-MSI-edge pciehp
- 50: 0 0 PCI-MSI-edge pciehp
- 51: 0 0 PCI-MSI-edge pciehp
- 52: 0 0 PCI-MSI-edge pciehp
- 53: 0 0 PCI-MSI-edge pciehp
- 54: 0 0 PCI-MSI-edge pciehp
- 55: 0 0 PCI-MSI-edge pciehp
- 56: 1 0 PCI-MSI-edge vmci
- 57: 0 0 PCI-MSI-edge vmci
-NMI: 0 0 Non-maskable interrupts
-LOC: 12398298 14241637 Local timer interrupts
-SPU: 0 0 Spurious interrupts
-PMI: 0 0 Performance monitoring interrupts
-IWI: 0 0 IRQ work interrupts
-RES: 282673 309097 Rescheduling interrupts
-CAL: 1955 163548 Function call interrupts
-TLB: 17977 15562 TLB shootdowns
-TRM: 0 0 Thermal event interrupts
-THR: 0 0 Threshold APIC interrupts
-MCE: 0 0 Machine check exceptions
-MCP: 2310 2310 Machine check polls
+ CPU0
+ 0: 249 IO-APIC-edge timer
+ 1: 7 IO-APIC-edge i8042
+ 4: 1 IO-APIC-edge
+ 8: 0 IO-APIC-edge rtc0
+ 9: 0 IO-APIC-fasteoi acpi
+ 10: 953 IO-APIC-fasteoi virtio3
+ 11: 78 IO-APIC-fasteoi uhci_hcd:usb1, snd_hda_intel
+ 12: 102 IO-APIC-edge i8042
+ 14: 0 IO-APIC-edge ata_piix
+ 15: 106 IO-APIC-edge ata_piix
+ 24: 0 PCI-MSI-edge virtio2-config
+ 25: 561173 PCI-MSI-edge virtio2-requests
+ 26: 0 PCI-MSI-edge virtio0-config
+ 27: 7973128 PCI-MSI-edge virtio0-input
+ 28: 2 PCI-MSI-edge virtio0-output
+ 29: 0 PCI-MSI-edge virtio1-config
+ 30: 571569 PCI-MSI-edge virtio1-input
+ 31: 1 PCI-MSI-edge virtio1-output
+NMI: 0 Non-maskable interrupts
+LOC: 18458340 Local timer interrupts
+SPU: 0 Spurious interrupts
+PMI: 0 Performance monitoring interrupts
+IWI: 0 IRQ work interrupts
+RES: 0 Rescheduling interrupts
+CAL: 0 Function call interrupts
+TLB: 0 TLB shootdowns
+TRM: 0 Thermal event interrupts
+THR: 0 Threshold APIC interrupts
+MCE: 0 Machine check exceptions
+MCP: 8673 Machine check polls
ERR: 0
MIS: 0
-MemTotal: 1914844 kB
-MemFree: 134216 kB
-Buffers: 142048 kB
-Cached: 952796 kB
-SwapCached: 108 kB
-Active: 981384 kB
-Inactive: 540556 kB
-Active(anon): 287092 kB
-Inactive(anon): 143480 kB
-Active(file): 694292 kB
-Inactive(file): 397076 kB
+MemTotal: 488092 kB
+MemFree: 85648 kB
+Buffers: 94000 kB
+Cached: 142360 kB
+SwapCached: 1900 kB
+Active: 124548 kB
+Inactive: 141900 kB
+Active(anon): 8320 kB
+Inactive(anon): 22668 kB
+Active(file): 116228 kB
+Inactive(file): 119232 kB
Unevictable: 0 kB
Mlocked: 0 kB
-SwapTotal: 4194296 kB
-SwapFree: 4193560 kB
-Dirty: 1732 kB
+SwapTotal: 524280 kB
+SwapFree: 511568 kB
+Dirty: 1640 kB
Writeback: 0 kB
-AnonPages: 427116 kB
-Mapped: 70924 kB
-Shmem: 3400 kB
-Slab: 190944 kB
-SReclaimable: 125404 kB
-SUnreclaim: 65540 kB
-KernelStack: 2312 kB
-PageTables: 23536 kB
+AnonPages: 28696 kB
+Mapped: 13324 kB
+Shmem: 924 kB
+Slab: 108996 kB
+SReclaimable: 58160 kB
+SUnreclaim: 50836 kB
+KernelStack: 768 kB
+PageTables: 3760 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 5151716 kB
-Committed_AS: 973184 kB
+CommitLimit: 768324 kB
+Committed_AS: 109440 kB
VmallocTotal: 34359738367 kB
-VmallocUsed: 280772 kB
-VmallocChunk: 34359441168 kB
+VmallocUsed: 12116 kB
+VmallocChunk: 34359711712 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 249856 kB
+AnonHugePages: 0 kB
HugePages_Total: 0
HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 8192 kB
-DirectMap2M: 2088960 kB
+DirectMap4k: 7156 kB
+DirectMap2M: 1492992 kB
slabinfo - version: 2.1
# name <active_objs> <num_objs> <objsize> <objperslab> <pagesperslab> : tunables <limit> <batchcount> <sharedfactor> : slabdata <active_slabs> <num_slabs> <sharedavail>
-bridge_fdb_cache 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-fuse_request 0 0 632 6 1 : tunables 54 27 8 : slabdata 0 0 0
-fuse_inode 0 0 768 5 1 : tunables 54 27 8 : slabdata 0 0 0
-rpc_buffers 8 8 2048 2 1 : tunables 24 12 8 : slabdata 4 4 0
-rpc_tasks 8 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-rpc_inode_cache 8 8 832 4 1 : tunables 54 27 8 : slabdata 2 2 0
-hgfsInodeCache 1 6 640 6 1 : tunables 54 27 8 : slabdata 1 1 0
-AF_VMCI 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-nf_conntrack_expect 0 0 240 16 1 : tunables 120 60 8 : slabdata 0 0 0
-nf_conntrack_ffffffff8200cec0 22 26 304 13 1 : tunables 54 27 8 : slabdata 2 2 0
-fib6_nodes 22 59 64 59 1 : tunables 120 60 8 : slabdata 1 1 0
-ip6_dst_cache 13 30 384 10 1 : tunables 54 27 8 : slabdata 3 3 0
-ndisc_cache 1 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-ip6_mrt_cache 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-RAWv6 67 68 1024 4 1 : tunables 54 27 8 : slabdata 17 17 0
-UDPLITEv6 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-UDPv6 4 4 1024 4 1 : tunables 54 27 8 : slabdata 1 1 0
-tw_sock_TCPv6 0 0 320 12 1 : tunables 54 27 8 : slabdata 0 0 0
-request_sock_TCPv6 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-TCPv6 9 10 1856 2 1 : tunables 24 12 8 : slabdata 5 5 0
-jbd2_1k 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-avtab_node 502203 502416 24 144 1 : tunables 120 60 8 : slabdata 3489 3489 0
-ext4_inode_cache 74816 74820 1024 4 1 : tunables 54 27 8 : slabdata 18705 18705 0
-ext4_xattr 9 44 88 44 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_free_block_extents 32 67 56 67 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_alloc_context 28 28 136 28 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_prealloc_space 18 37 104 37 1 : tunables 120 60 8 : slabdata 1 1 0
-ext4_system_zone 0 0 40 92 1 : tunables 120 60 8 : slabdata 0 0 0
-jbd2_journal_handle 32 144 24 144 1 : tunables 120 60 8 : slabdata 1 1 0
-jbd2_journal_head 74 102 112 34 1 : tunables 120 60 8 : slabdata 3 3 0
-jbd2_revoke_table 4 202 16 202 1 : tunables 120 60 8 : slabdata 1 1 0
-jbd2_revoke_record 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-dm_crypt_io 50 50 152 25 1 : tunables 120 60 8 : slabdata 2 2 0
-sd_ext_cdb 2 112 32 112 1 : tunables 120 60 8 : slabdata 1 1 0
-scsi_sense_cache 25 60 128 30 1 : tunables 120 60 8 : slabdata 2 2 0
-scsi_cmd_cache 28 45 256 15 1 : tunables 120 60 8 : slabdata 3 3 0
-dm_raid1_read_record 0 0 1064 7 2 : tunables 24 12 8 : slabdata 0 0 0
-kcopyd_job 0 0 3240 2 2 : tunables 24 12 8 : slabdata 0 0 0
-io 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-dm_uevent 0 0 2608 3 2 : tunables 24 12 8 : slabdata 0 0 0
-dm_rq_clone_bio_info 0 0 16 202 1 : tunables 120 60 8 : slabdata 0 0 0
-dm_rq_target_io 0 0 392 10 1 : tunables 54 27 8 : slabdata 0 0 0
-dm_target_io 844 864 24 144 1 : tunables 120 60 8 : slabdata 6 6 0
-dm_io 828 828 40 92 1 : tunables 120 60 8 : slabdata 9 9 0
-flow_cache 0 0 96 40 1 : tunables 120 60 8 : slabdata 0 0 0
-uhci_urb_priv 6 67 56 67 1 : tunables 120 60 8 : slabdata 1 1 0
-cfq_io_context 4 28 136 28 1 : tunables 120 60 8 : slabdata 1 1 0
-cfq_queue 5 16 240 16 1 : tunables 120 60 8 : slabdata 1 1 0
-bsg_cmd 0 0 312 12 1 : tunables 54 27 8 : slabdata 0 0 0
-mqueue_inode_cache 1 4 896 4 1 : tunables 54 27 8 : slabdata 1 1 0
-isofs_inode_cache 0 0 640 6 1 : tunables 54 27 8 : slabdata 0 0 0
-hugetlbfs_inode_cache 1 6 608 6 1 : tunables 54 27 8 : slabdata 1 1 0
-dquot 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-kioctx 0 0 384 10 1 : tunables 54 27 8 : slabdata 0 0 0
-kiocb 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-inotify_event_private_data 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-inotify_inode_mark_entry 186 204 112 34 1 : tunables 120 60 8 : slabdata 6 6 0
-dnotify_mark_entry 1 34 112 34 1 : tunables 120 60 8 : slabdata 1 1 0
-dnotify_struct 1 112 32 112 1 : tunables 120 60 8 : slabdata 1 1 0
-fasync_cache 6 144 24 144 1 : tunables 120 60 8 : slabdata 1 1 0
-khugepaged_mm_slot 83 92 40 92 1 : tunables 120 60 8 : slabdata 1 1 0
-ksm_mm_slot 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-ksm_stable_node 0 0 40 92 1 : tunables 120 60 8 : slabdata 0 0 0
-ksm_rmap_item 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-utrace_engine 0 0 56 67 1 : tunables 120 60 8 : slabdata 0 0 0
-utrace 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-pid_namespace 0 0 2120 3 2 : tunables 24 12 8 : slabdata 0 0 0
-nsproxy 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-posix_timers_cache 0 0 176 22 1 : tunables 120 60 8 : slabdata 0 0 0
-uid_cache 10 60 128 30 1 : tunables 120 60 8 : slabdata 2 2 0
-UNIX 459 480 768 5 1 : tunables 54 27 8 : slabdata 96 96 0
-ip_mrt_cache 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-UDP-Lite 0 0 832 9 2 : tunables 54 27 8 : slabdata 0 0 0
-tcp_bind_bucket 15 59 64 59 1 : tunables 120 60 8 : slabdata 1 1 0
-inet_peer_cache 4 59 64 59 1 : tunables 120 60 8 : slabdata 1 1 0
-secpath_cache 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-xfrm_dst_cache 0 0 384 10 1 : tunables 54 27 8 : slabdata 0 0 0
-ip_fib_alias 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-ip_fib_hash 10 106 72 53 1 : tunables 120 60 8 : slabdata 2 2 0
-ip_dst_cache 29 50 384 10 1 : tunables 54 27 8 : slabdata 5 5 0
-arp_cache 4 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-RAW 65 72 832 9 2 : tunables 54 27 8 : slabdata 8 8 0
-UDP 6 18 832 9 2 : tunables 54 27 8 : slabdata 2 2 0
-tw_sock_TCP 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-request_sock_TCP 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-TCP 20 24 1664 4 2 : tunables 24 12 8 : slabdata 6 6 0
-eventpoll_pwq 126 212 72 53 1 : tunables 120 60 8 : slabdata 4 4 0
-eventpoll_epi 126 180 128 30 1 : tunables 120 60 8 : slabdata 6 6 0
-sgpool-128 2 2 4096 1 1 : tunables 24 12 8 : slabdata 2 2 0
-sgpool-64 2 2 2048 2 1 : tunables 24 12 8 : slabdata 1 1 0
-sgpool-32 2 4 1024 4 1 : tunables 54 27 8 : slabdata 1 1 0
-sgpool-16 2 8 512 8 1 : tunables 54 27 8 : slabdata 1 1 0
-sgpool-8 15 15 256 15 1 : tunables 120 60 8 : slabdata 1 1 0
-scsi_data_buffer 0 0 24 144 1 : tunables 120 60 8 : slabdata 0 0 0
-blkdev_integrity 0 0 112 34 1 : tunables 120 60 8 : slabdata 0 0 0
-blkdev_queue 29 30 2856 2 2 : tunables 24 12 8 : slabdata 15 15 0
-blkdev_requests 42 66 352 11 1 : tunables 54 27 8 : slabdata 5 6 0
-blkdev_ioc 5 48 80 48 1 : tunables 120 60 8 : slabdata 1 1 0
-fsnotify_event_holder 0 0 24 144 1 : tunables 120 60 8 : slabdata 0 0 0
-fsnotify_event 0 0 104 37 1 : tunables 120 60 8 : slabdata 0 0 0
-bio-0 180 180 192 20 1 : tunables 120 60 8 : slabdata 9 9 0
-biovec-256 66 66 4096 1 1 : tunables 24 12 8 : slabdata 66 66 0
-biovec-128 0 0 2048 2 1 : tunables 24 12 8 : slabdata 0 0 0
-biovec-64 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-biovec-16 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
+nf_conntrack_expect 0 0 240 16 1 : tunables 120 60 0 : slabdata 0 0 0
+nf_conntrack_ffffffff81b165c0 23 24 312 12 1 : tunables 54 27 0 : slabdata 2 2 0
+fib6_nodes 48 118 64 59 1 : tunables 120 60 0 : slabdata 2 2 0
+ip6_dst_cache 29 40 384 10 1 : tunables 54 27 0 : slabdata 4 4 0
+ndisc_cache 17 45 256 15 1 : tunables 120 60 0 : slabdata 3 3 0
+ip6_mrt_cache 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+RAWv6 4 4 1024 4 1 : tunables 54 27 0 : slabdata 1 1 0
+UDPLITEv6 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+UDPv6 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+tw_sock_TCPv6 0 0 320 12 1 : tunables 54 27 0 : slabdata 0 0 0
+request_sock_TCPv6 0 0 192 20 1 : tunables 120 60 0 : slabdata 0 0 0
+TCPv6 9 10 1856 2 1 : tunables 24 12 0 : slabdata 5 5 0
+jbd2_1k 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+avtab_node 551034 551232 24 144 1 : tunables 120 60 0 : slabdata 3828 3828 0
+ext4_inode_cache 19168 19168 1024 4 1 : tunables 54 27 0 : slabdata 4792 4792 0
+ext4_xattr 12 44 88 44 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_free_block_extents 16 67 56 67 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_alloc_context 16 28 136 28 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_prealloc_space 4 37 104 37 1 : tunables 120 60 0 : slabdata 1 1 0
+ext4_system_zone 0 0 40 92 1 : tunables 120 60 0 : slabdata 0 0 0
+jbd2_journal_handle 16 144 24 144 1 : tunables 120 60 0 : slabdata 1 1 0
+jbd2_journal_head 102 102 112 34 1 : tunables 120 60 0 : slabdata 3 3 0
+jbd2_revoke_table 4 202 16 202 1 : tunables 120 60 0 : slabdata 1 1 0
+jbd2_revoke_record 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+scsi_sense_cache 2 30 128 30 1 : tunables 120 60 0 : slabdata 1 1 0
+scsi_cmd_cache 2 15 256 15 1 : tunables 120 60 0 : slabdata 1 1 0
+dm_raid1_read_record 0 0 1064 7 2 : tunables 24 12 0 : slabdata 0 0 0
+kcopyd_job 0 0 3240 2 2 : tunables 24 12 0 : slabdata 0 0 0
+io 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+dm_uevent 0 0 2608 3 2 : tunables 24 12 0 : slabdata 0 0 0
+dm_rq_clone_bio_info 0 0 16 202 1 : tunables 120 60 0 : slabdata 0 0 0
+dm_rq_target_io 0 0 392 10 1 : tunables 54 27 0 : slabdata 0 0 0
+dm_target_io 588 720 24 144 1 : tunables 120 60 0 : slabdata 5 5 0
+dm_io 588 736 40 92 1 : tunables 120 60 0 : slabdata 8 8 0
+flow_cache 0 0 96 40 1 : tunables 120 60 0 : slabdata 0 0 0
+uhci_urb_priv 0 0 56 67 1 : tunables 120 60 0 : slabdata 0 0 0
+cfq_io_context 0 0 136 28 1 : tunables 120 60 0 : slabdata 0 0 0
+cfq_queue 0 0 240 16 1 : tunables 120 60 0 : slabdata 0 0 0
+bsg_cmd 0 0 312 12 1 : tunables 54 27 0 : slabdata 0 0 0
+mqueue_inode_cache 1 4 896 4 1 : tunables 54 27 0 : slabdata 1 1 0
+isofs_inode_cache 0 0 640 6 1 : tunables 54 27 0 : slabdata 0 0 0
+hugetlbfs_inode_cache 1 6 608 6 1 : tunables 54 27 0 : slabdata 1 1 0
+dquot 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+kioctx 0 0 384 10 1 : tunables 54 27 0 : slabdata 0 0 0
+kiocb 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+inotify_event_private_data 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+inotify_inode_mark_entry 110 136 112 34 1 : tunables 120 60 0 : slabdata 4 4 0
+dnotify_mark_entry 0 0 112 34 1 : tunables 120 60 0 : slabdata 0 0 0
+dnotify_struct 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+fasync_cache 0 0 24 144 1 : tunables 120 60 0 : slabdata 0 0 0
+khugepaged_mm_slot 18 92 40 92 1 : tunables 120 60 0 : slabdata 1 1 0
+ksm_mm_slot 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+ksm_stable_node 0 0 40 92 1 : tunables 120 60 0 : slabdata 0 0 0
+ksm_rmap_item 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+utrace_engine 0 0 56 67 1 : tunables 120 60 0 : slabdata 0 0 0
+utrace 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+pid_namespace 0 0 2120 3 2 : tunables 24 12 0 : slabdata 0 0 0
+nsproxy 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+posix_timers_cache 0 0 176 22 1 : tunables 120 60 0 : slabdata 0 0 0
+uid_cache 4 30 128 30 1 : tunables 120 60 0 : slabdata 1 1 0
+UNIX 113 115 768 5 1 : tunables 54 27 0 : slabdata 23 23 0
+ip_mrt_cache 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+UDP-Lite 0 0 832 9 2 : tunables 54 27 0 : slabdata 0 0 0
+tcp_bind_bucket 9 59 64 59 1 : tunables 120 60 0 : slabdata 1 1 0
+inet_peer_cache 3 59 64 59 1 : tunables 120 60 0 : slabdata 1 1 0
+secpath_cache 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+xfrm_dst_cache 0 0 384 10 1 : tunables 54 27 0 : slabdata 0 0 0
+ip_fib_alias 1 112 32 112 1 : tunables 120 60 0 : slabdata 1 1 0
+ip_fib_hash 14 53 72 53 1 : tunables 120 60 0 : slabdata 1 1 0
+ip_dst_cache 18 40 384 10 1 : tunables 54 27 0 : slabdata 4 4 0
+arp_cache 5 15 256 15 1 : tunables 120 60 0 : slabdata 1 1 0
+PING 0 0 832 9 2 : tunables 54 27 0 : slabdata 0 0 0
+RAW 2 9 832 9 2 : tunables 54 27 0 : slabdata 1 1 0
+UDP 1 9 832 9 2 : tunables 54 27 0 : slabdata 1 1 0
+tw_sock_TCP 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+request_sock_TCP 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+TCP 10 16 1664 4 2 : tunables 24 12 0 : slabdata 4 4 0
+eventpoll_pwq 59 106 72 53 1 : tunables 120 60 0 : slabdata 2 2 0
+eventpoll_epi 59 90 128 30 1 : tunables 120 60 0 : slabdata 3 3 0
+sgpool-128 2 2 4096 1 1 : tunables 24 12 0 : slabdata 2 2 0
+sgpool-64 2 2 2048 2 1 : tunables 24 12 0 : slabdata 1 1 0
+sgpool-32 2 4 1024 4 1 : tunables 54 27 0 : slabdata 1 1 0
+sgpool-16 2 8 512 8 1 : tunables 54 27 0 : slabdata 1 1 0
+sgpool-8 2 15 256 15 1 : tunables 120 60 0 : slabdata 1 1 0
+scsi_data_buffer 0 0 24 144 1 : tunables 120 60 0 : slabdata 0 0 0
+blkdev_integrity 0 0 112 34 1 : tunables 120 60 0 : slabdata 0 0 0
+blkdev_queue 28 28 2864 2 2 : tunables 24 12 0 : slabdata 14 14 0
+blkdev_requests 11 11 352 11 1 : tunables 54 27 0 : slabdata 1 1 0
+blkdev_ioc 4 48 80 48 1 : tunables 120 60 0 : slabdata 1 1 0
+fsnotify_event_holder 0 0 24 144 1 : tunables 120 60 0 : slabdata 0 0 0
+fsnotify_event 0 0 104 37 1 : tunables 120 60 0 : slabdata 0 0 0
+bio-0 140 140 192 20 1 : tunables 120 60 0 : slabdata 7 7 0
+biovec-256 34 34 4096 1 1 : tunables 24 12 0 : slabdata 34 34 0
+biovec-128 0 0 2048 2 1 : tunables 24 12 0 : slabdata 0 0 0
+biovec-64 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+biovec-16 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
bip-256 2 2 4224 1 2 : tunables 8 4 0 : slabdata 2 2 0
-bip-128 0 0 2176 3 2 : tunables 24 12 8 : slabdata 0 0 0
-bip-64 0 0 1152 7 2 : tunables 24 12 8 : slabdata 0 0 0
-bip-16 0 0 384 10 1 : tunables 54 27 8 : slabdata 0 0 0
-bip-4 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-bip-1 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-sock_inode_cache 667 685 704 5 1 : tunables 54 27 8 : slabdata 137 137 0
-skbuff_fclone_cache 35 35 512 7 1 : tunables 54 27 8 : slabdata 5 5 0
-skbuff_head_cache 302 450 256 15 1 : tunables 120 60 8 : slabdata 30 30 0
-file_lock_cache 38 44 176 22 1 : tunables 120 60 8 : slabdata 2 2 0
-net_namespace 0 0 2112 3 2 : tunables 24 12 8 : slabdata 0 0 0
-shmem_inode_cache 774 775 800 5 1 : tunables 54 27 8 : slabdata 155 155 0
-Acpi-Operand 4563 4664 72 53 1 : tunables 120 60 8 : slabdata 88 88 0
-Acpi-ParseExt 0 0 72 53 1 : tunables 120 60 8 : slabdata 0 0 0
-Acpi-Parse 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-Acpi-State 0 0 80 48 1 : tunables 120 60 8 : slabdata 0 0 0
-Acpi-Namespace 3311 3312 40 92 1 : tunables 120 60 8 : slabdata 36 36 0
-task_delay_info 332 340 112 34 1 : tunables 120 60 8 : slabdata 10 10 0
-taskstats 5 12 328 12 1 : tunables 54 27 8 : slabdata 1 1 0
-proc_inode_cache 1008 1008 640 6 1 : tunables 54 27 8 : slabdata 168 168 0
-sigqueue 35 48 160 24 1 : tunables 120 60 8 : slabdata 2 2 0
-bdev_cache 32 36 832 4 1 : tunables 54 27 8 : slabdata 9 9 0
-sysfs_dir_cache 11356 11367 144 27 1 : tunables 120 60 8 : slabdata 421 421 0
-mnt_cache 37 45 256 15 1 : tunables 120 60 8 : slabdata 3 3 0
-filp 4614 4700 192 20 1 : tunables 120 60 8 : slabdata 235 235 0
-inode_cache 6883 7308 592 6 1 : tunables 54 27 8 : slabdata 1218 1218 0
-dentry 61120 63960 192 20 1 : tunables 120 60 8 : slabdata 3198 3198 0
-names_cache 26 26 4096 1 1 : tunables 24 12 8 : slabdata 26 26 0
-avc_node 518 1239 64 59 1 : tunables 120 60 8 : slabdata 21 21 0
-selinux_inode_security 84146 86072 72 53 1 : tunables 120 60 8 : slabdata 1624 1624 0
-radix_tree_node 11579 11781 560 7 1 : tunables 54 27 8 : slabdata 1683 1683 0
-key_jar 11 20 192 20 1 : tunables 120 60 8 : slabdata 1 1 0
-buffer_head 221286 230214 104 37 1 : tunables 120 60 8 : slabdata 6222 6222 0
-vm_area_struct 12992 13034 200 19 1 : tunables 120 60 8 : slabdata 686 686 60
-mm_struct 145 145 1408 5 2 : tunables 24 12 8 : slabdata 29 29 0
-fs_cache 177 177 64 59 1 : tunables 120 60 8 : slabdata 3 3 0
-files_cache 162 165 704 11 2 : tunables 54 27 8 : slabdata 15 15 0
-signal_cache 208 208 1024 4 1 : tunables 54 27 8 : slabdata 52 52 0
-sighand_cache 198 198 2112 3 2 : tunables 24 12 8 : slabdata 66 66 0
-task_xstate 232 232 512 8 1 : tunables 54 27 8 : slabdata 29 29 0
-task_struct 303 303 2656 3 2 : tunables 24 12 8 : slabdata 101 101 0
-cred_jar 580 580 192 20 1 : tunables 120 60 8 : slabdata 29 29 0
-anon_vma_chain 7904 8162 48 77 1 : tunables 120 60 8 : slabdata 106 106 60
-anon_vma 5773 5888 40 92 1 : tunables 120 60 8 : slabdata 64 64 0
-pid 322 330 128 30 1 : tunables 120 60 8 : slabdata 11 11 0
-shared_policy_node 0 0 48 77 1 : tunables 120 60 8 : slabdata 0 0 0
-numa_policy 1 28 136 28 1 : tunables 120 60 8 : slabdata 1 1 0
-idr_layer_cache 428 434 544 7 1 : tunables 54 27 8 : slabdata 62 62 0
+bip-128 0 0 2176 3 2 : tunables 24 12 0 : slabdata 0 0 0
+bip-64 0 0 1152 7 2 : tunables 24 12 0 : slabdata 0 0 0
+bip-16 0 0 384 10 1 : tunables 54 27 0 : slabdata 0 0 0
+bip-4 0 0 192 20 1 : tunables 120 60 0 : slabdata 0 0 0
+bip-1 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+sock_inode_cache 156 170 704 5 1 : tunables 54 27 0 : slabdata 34 34 0
+skbuff_fclone_cache 7 7 512 7 1 : tunables 54 27 0 : slabdata 1 1 0
+skbuff_head_cache 120 240 256 15 1 : tunables 120 60 0 : slabdata 16 16 0
+file_lock_cache 20 22 176 22 1 : tunables 120 60 0 : slabdata 1 1 0
+net_namespace 0 0 2240 3 2 : tunables 24 12 0 : slabdata 0 0 0
+shmem_inode_cache 654 655 784 5 1 : tunables 54 27 0 : slabdata 131 131 0
+Acpi-Operand 1196 1219 72 53 1 : tunables 120 60 0 : slabdata 23 23 0
+Acpi-ParseExt 0 0 72 53 1 : tunables 120 60 0 : slabdata 0 0 0
+Acpi-Parse 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+Acpi-State 0 0 80 48 1 : tunables 120 60 0 : slabdata 0 0 0
+Acpi-Namespace 394 460 40 92 1 : tunables 120 60 0 : slabdata 5 5 0
+task_delay_info 111 170 112 34 1 : tunables 120 60 0 : slabdata 5 5 0
+taskstats 0 0 328 12 1 : tunables 54 27 0 : slabdata 0 0 0
+proc_inode_cache 864 864 640 6 1 : tunables 54 27 0 : slabdata 144 144 0
+sigqueue 16 24 160 24 1 : tunables 120 60 0 : slabdata 1 1 0
+bdev_cache 31 32 896 4 1 : tunables 54 27 0 : slabdata 8 8 0
+sysfs_dir_cache 7509 7533 144 27 1 : tunables 120 60 0 : slabdata 279 279 0
+mnt_cache 27 30 256 15 1 : tunables 120 60 0 : slabdata 2 2 0
+filp 960 960 192 20 1 : tunables 120 60 0 : slabdata 48 48 0
+inode_cache 5700 5700 592 6 1 : tunables 54 27 0 : slabdata 950 950 0
+dentry 148640 148640 192 20 1 : tunables 120 60 0 : slabdata 7432 7432 0
+names_cache 2 2 4096 1 1 : tunables 24 12 0 : slabdata 2 2 0
+avc_node 500 708 64 59 1 : tunables 120 60 0 : slabdata 12 12 0
+selinux_inode_security 26597 26659 72 53 1 : tunables 120 60 0 : slabdata 503 503 0
+radix_tree_node 2828 2828 560 7 1 : tunables 54 27 0 : slabdata 404 404 0
+key_jar 8 20 192 20 1 : tunables 120 60 0 : slabdata 1 1 0
+buffer_head 27828 28416 104 37 1 : tunables 120 60 0 : slabdata 768 768 0
+vm_area_struct 2869 2869 200 19 1 : tunables 120 60 0 : slabdata 151 151 0
+mm_struct 51 55 1408 5 2 : tunables 24 12 0 : slabdata 11 11 0
+fs_cache 54 118 64 59 1 : tunables 120 60 0 : slabdata 2 2 0
+files_cache 55 88 704 11 2 : tunables 54 27 0 : slabdata 8 8 0
+signal_cache 101 112 1088 7 2 : tunables 24 12 0 : slabdata 16 16 0
+sighand_cache 101 102 2112 3 2 : tunables 24 12 0 : slabdata 34 34 0
+task_xstate 60 72 512 8 1 : tunables 54 27 0 : slabdata 9 9 0
+task_struct 106 108 2656 3 2 : tunables 24 12 0 : slabdata 36 36 0
+cred_jar 285 300 192 20 1 : tunables 120 60 0 : slabdata 15 15 0
+anon_vma_chain 1926 2464 48 77 1 : tunables 120 60 0 : slabdata 32 32 0
+anon_vma 1348 1656 40 92 1 : tunables 120 60 0 : slabdata 18 18 0
+pid 113 180 128 30 1 : tunables 120 60 0 : slabdata 6 6 0
+shared_policy_node 0 0 48 77 1 : tunables 120 60 0 : slabdata 0 0 0
+numa_policy 0 0 136 28 1 : tunables 120 60 0 : slabdata 0 0 0
+idr_layer_cache 271 273 544 7 1 : tunables 54 27 0 : slabdata 39 39 0
size-4194304(DMA) 0 0 4194304 1 1024 : tunables 1 1 0 : slabdata 0 0 0
size-4194304 0 0 4194304 1 1024 : tunables 1 1 0 : slabdata 0 0 0
size-2097152(DMA) 0 0 2097152 1 512 : tunables 1 1 0 : slabdata 0 0 0
@@ -307,36 +249,36 @@ size-524288 0 0 524288 1 128 : tunables 1 1 0 : sla
size-262144(DMA) 0 0 262144 1 64 : tunables 1 1 0 : slabdata 0 0 0
size-262144 0 0 262144 1 64 : tunables 1 1 0 : slabdata 0 0 0
size-131072(DMA) 0 0 131072 1 32 : tunables 8 4 0 : slabdata 0 0 0
-size-131072 1 1 131072 1 32 : tunables 8 4 0 : slabdata 1 1 0
+size-131072 0 0 131072 1 32 : tunables 8 4 0 : slabdata 0 0 0
size-65536(DMA) 0 0 65536 1 16 : tunables 8 4 0 : slabdata 0 0 0
size-65536 2 2 65536 1 16 : tunables 8 4 0 : slabdata 2 2 0
size-32768(DMA) 0 0 32768 1 8 : tunables 8 4 0 : slabdata 0 0 0
size-32768 3 3 32768 1 8 : tunables 8 4 0 : slabdata 3 3 0
size-16384(DMA) 0 0 16384 1 4 : tunables 8 4 0 : slabdata 0 0 0
-size-16384 12 12 16384 1 4 : tunables 8 4 0 : slabdata 12 12 0
+size-16384 7 7 16384 1 4 : tunables 8 4 0 : slabdata 7 7 0
size-8192(DMA) 0 0 8192 1 2 : tunables 8 4 0 : slabdata 0 0 0
-size-8192 27 27 8192 1 2 : tunables 8 4 0 : slabdata 27 27 0
-size-4096(DMA) 0 0 4096 1 1 : tunables 24 12 8 : slabdata 0 0 0
-size-4096 425 425 4096 1 1 : tunables 24 12 8 : slabdata 425 425 0
-size-2048(DMA) 0 0 2048 2 1 : tunables 24 12 8 : slabdata 0 0 0
-size-2048 578 578 2048 2 1 : tunables 24 12 8 : slabdata 289 289 0
-size-1024(DMA) 0 0 1024 4 1 : tunables 54 27 8 : slabdata 0 0 0
-size-1024 1332 1332 1024 4 1 : tunables 54 27 8 : slabdata 333 333 0
-size-512(DMA) 0 0 512 8 1 : tunables 54 27 8 : slabdata 0 0 0
-size-512 1123 1176 512 8 1 : tunables 54 27 8 : slabdata 147 147 0
-size-256(DMA) 0 0 256 15 1 : tunables 120 60 8 : slabdata 0 0 0
-size-256 930 930 256 15 1 : tunables 120 60 8 : slabdata 62 62 0
-size-192(DMA) 0 0 192 20 1 : tunables 120 60 8 : slabdata 0 0 0
-size-192 2119 2160 192 20 1 : tunables 120 60 8 : slabdata 108 108 0
-size-128(DMA) 0 0 128 30 1 : tunables 120 60 8 : slabdata 0 0 0
-size-64(DMA) 0 0 64 59 1 : tunables 120 60 8 : slabdata 0 0 0
-size-64 33063 40887 64 59 1 : tunables 120 60 8 : slabdata 693 693 60
-size-32(DMA) 0 0 32 112 1 : tunables 120 60 8 : slabdata 0 0 0
-size-128 3921 4800 128 30 1 : tunables 120 60 8 : slabdata 160 160 0
-size-32 332419 332976 32 112 1 : tunables 120 60 8 : slabdata 2973 2973 60
-kmem_cache 191 191 32896 1 16 : tunables 8 4 0 : slabdata 191 191 0
+size-8192 12 12 8192 1 2 : tunables 8 4 0 : slabdata 12 12 0
+size-4096(DMA) 0 0 4096 1 1 : tunables 24 12 0 : slabdata 0 0 0
+size-4096 115 115 4096 1 1 : tunables 24 12 0 : slabdata 115 115 0
+size-2048(DMA) 0 0 2048 2 1 : tunables 24 12 0 : slabdata 0 0 0
+size-2048 206 206 2048 2 1 : tunables 24 12 0 : slabdata 103 103 0
+size-1024(DMA) 0 0 1024 4 1 : tunables 54 27 0 : slabdata 0 0 0
+size-1024 584 584 1024 4 1 : tunables 54 27 0 : slabdata 146 146 0
+size-512(DMA) 0 0 512 8 1 : tunables 54 27 0 : slabdata 0 0 0
+size-512 584 584 512 8 1 : tunables 54 27 0 : slabdata 73 73 0
+size-256(DMA) 0 0 256 15 1 : tunables 120 60 0 : slabdata 0 0 0
+size-256 775 795 256 15 1 : tunables 120 60 0 : slabdata 53 53 0
+size-192(DMA) 0 0 192 20 1 : tunables 120 60 0 : slabdata 0 0 0
+size-192 1119 1140 192 20 1 : tunables 120 60 0 : slabdata 57 57 0
+size-128(DMA) 0 0 128 30 1 : tunables 120 60 0 : slabdata 0 0 0
+size-64(DMA) 0 0 64 59 1 : tunables 120 60 0 : slabdata 0 0 0
+size-64 19262 20650 64 59 1 : tunables 120 60 0 : slabdata 350 350 0
+size-32(DMA) 0 0 32 112 1 : tunables 120 60 0 : slabdata 0 0 0
+size-128 3817 3930 128 30 1 : tunables 120 60 0 : slabdata 131 131 0
+size-32 352187 352688 32 112 1 : tunables 120 60 0 : slabdata 3149 3149 0
+kmem_cache 182 182 32896 1 16 : tunables 8 4 0 : slabdata 182 182 0
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- lo:267102759 105357 0 0 0 0 0 0 267102759 105357 0 0 0 0 0 0
- eth0:1013758516 1354506 0 0 0 0 0 0 245531629 966810 0 0 0 0 0 0
- pan0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ lo: 7419513 35803 0 0 0 0 0 0 7419513 35803 0 0 0 0 0 0
+ eth0:585894435 8311881 0 0 0 0 0 0 163699897 110116 0 0 0 0 0 0
+ eth1:163385408 637834 0 0 0 0 0 0 2289952 35156 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.org/CA/secmod.db b/test/aux-fixed/exim-ca/example.org/CA/secmod.db
index c7f115b..f8cc0e7 100644
Binary files a/test/aux-fixed/exim-ca/example.org/CA/secmod.db and b/test/aux-fixed/exim-ca/example.org/CA/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem
index 45c5c63..5b26d7c 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.org/CN=clica CA
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxY7JyBAI+e4vb4bz0HcjtE+O
-x0nLBB19Kz04yNARj1z/ZvY2c+uvOR3muHROCgFUQxGobP3n2HaTS/cmv2SVPwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAJLhs/m5Jx4oV++aylcAvIHa0vHSK4eh3zX1HqWwqK9I0/nl
-LqwwPgtgHQOpe7nd2g2B9wPZ82i6LiqY76A+9hI=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKVtsAGe7PATQiOvMyxM
+PL8bA1VwmS+auXRgcHWPi1Jgkd1QmS0+lZqqm5VQ1kym7vUvhggfdX5uljC6nFJ3
+41b/e0zbRB1lhyLDNxarSxPg9+Lkv/9U8r0emvwpm9PfEZnqGQKil4rKX3cdZy21
+196jOwq5X/L1S5RjYFzcVaqZAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAEHHENxfpDuyHeYT/wTW
+MaHwBbycWFoFIlIA/PBt7J3WFHiyV6IomjWMy1hMg9URN2mlGodQMYk64IDrFwZp
+9Cni9eVuWB/SlJRDi8c3WOHrkzqybuysT7DDbGQDLQUy2HuOCpyJQDikd9XlO775
+tCx603UJ6mmBZHv/vzgk35Zc
-----END CERTIFICATE-----
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 0B 77 EA 83 E1 31 8B 71 88 DB 88 4E DE 08 91 19 A5 4A 4D A6
+ localKeyID: 99 D2 95 F9 ED CC 0E 01 49 48 24 1F 6B A0 AA 2E 31 36 63 72
subject=/CN=expired1.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwM1oXDTEyMTIwMTEyMzQwM1owHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5vcmcwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA4TTv655lwyf5lL4RkuLHqPdg
-mXI36dkjEL/864WoszwLRYYfnlOj4hmKfjq9VoslfDRnOoZSm0NebJJ9Y/ea2wID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUub3JnMA0GCSqGSIb3DQEBBQUAA0EABG4yReI+VPyFc3kEejJr31rOi3BpgEfP
-FsN+9WoTa0B+VW125F47/FySYat+M6KBSW8fe6HFexU6FXQF+mCNvQ==
+MzQwNloXDTEyMTIwMTEyMzQwNlowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN/iT8XAEsfNjvvzAeQh
+/mY4TnKNq5YxfUMS+Oyk4NIinZINQB+3qFi4V4UWoQclP7FO8r2qj3jVaW54xmTF
+c+dYDR+XnpDr0+lPj0AeM/mABtPymN1/cv4xFnrknKui4O0rpthmMiJCIJryEnOy
+Wxz5LWR/GMVL9q+IwEYJjHn5AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm9yZy8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQEFBQADgYEALRLT
+3R6jETZdnwRIIDlvZECIB/5iqzxn5dD3rRqhi8kwbS+Rw77S1ynnYULq1MRbL3dI
+BMmBW9S9jY+MZ22puKMfxUivbTfQIrFoXNgwuSfUEq5s32y6nfKo9D6xhSuD1vXx
+6B8E0XY7CtAdwWLjp6clUdr2FMXu4AWCAx7jIeI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db
index 133a82f..d7dca87 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem
index d4f9ee3..f43062a 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 0B 77 EA 83 E1 31 8B 71 88 DB 88 4E DE 08 91 19 A5 4A 4D A6
+ localKeyID: 99 D2 95 F9 ED CC 0E 01 49 48 24 1F 6B A0 AA 2E 31 36 63 72
subject=/CN=expired1.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwM1oXDTEyMTIwMTEyMzQwM1owHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5vcmcwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA4TTv655lwyf5lL4RkuLHqPdg
-mXI36dkjEL/864WoszwLRYYfnlOj4hmKfjq9VoslfDRnOoZSm0NebJJ9Y/ea2wID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUub3JnMA0GCSqGSIb3DQEBBQUAA0EABG4yReI+VPyFc3kEejJr31rOi3BpgEfP
-FsN+9WoTa0B+VW125F47/FySYat+M6KBSW8fe6HFexU6FXQF+mCNvQ==
+MzQwNloXDTEyMTIwMTEyMzQwNlowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN/iT8XAEsfNjvvzAeQh
+/mY4TnKNq5YxfUMS+Oyk4NIinZINQB+3qFi4V4UWoQclP7FO8r2qj3jVaW54xmTF
+c+dYDR+XnpDr0+lPj0AeM/mABtPymN1/cv4xFnrknKui4O0rpthmMiJCIJryEnOy
+Wxz5LWR/GMVL9q+IwEYJjHn5AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm9yZy8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQEFBQADgYEALRLT
+3R6jETZdnwRIIDlvZECIB/5iqzxn5dD3rRqhi8kwbS+Rw77S1ynnYULq1MRbL3dI
+BMmBW9S9jY+MZ22puKMfxUivbTfQIrFoXNgwuSfUEq5s32y6nfKo9D6xhSuD1vXx
+6B8E0XY7CtAdwWLjp6clUdr2FMXu4AWCAx7jIeI=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key
index fab9097..40dcc08 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 0B 77 EA 83 E1 31 8B 71 88 DB 88 4E DE 08 91 19 A5 4A 4D A6
+ localKeyID: 99 D2 95 F9 ED CC 0E 01 49 48 24 1F 6B A0 AA 2E 31 36 63 72
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIL+kummor3pQCAggA
-MBQGCCqGSIb3DQMHBAhpvl78t5As+QSCAWBlOt1XpYY+o5G0MSANfiL7BfKlwwYh
-MDpKzsNWfwxrNZNmeT293TKVlXEav4FsEnbU0yVJ0HSLC1peXM32mjdezDdMQAwq
-QPrIRj5r5m4mTTWhUPnDUrzdwrYbD4flg0H6eO7gX1w2gJw8E/LS8nhAy6ZOfEvL
-jlghGljcALDPVDvNEAtcx+Wd4p71vp6wm/3kl3SAl7WXO1HcKwYYIEEL9DFZ/P4n
-kqlgCu3pcgKbH9HHjImOkYRWP2Poy3OLJ7h+i/rIEaxiaJFt/1zTm+DxkkM6nbwR
-2C0VnX6/gSbpz58xBlJUMiZqvh9ciFhuLCYeiJx+HnKKzTEIfnSyKV7Y7GSzqkUE
-kKPVa6NTXq0nlH1fuecTGv3iUE4AXWJPmGNYS0caR8oTFd5pFlOQGazRjLDxTIb/
-N6zXiTCpQt4MWHi71a/GnfUrv0e/Bl24ARJnVWcP4brT8jA/oiPeQGEq
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIsm+oI07f/HACAggA
+MBQGCCqGSIb3DQMHBAjckgTj9bkctwSCAoBKskb6J8ZN3ff0/3Z15+0cg20Rk6z2
+LOqc2IvuTG7l/60qVQacaCbkFG9KhEiGvN9HYCaE8q1eJam0axcRYFjIJUhU8aTi
+laaPowzj19qfx1W0yk+cm0M4YkYE2uHoQiY6p13fK4pqUxKj5KMm3TkbQEUN89Nf
+Df5knbW+cCG0xcX/7H4fms2sPw4jwrtYxrK2W0e9iXF7dLGU7Q35bksAWoOXljCp
+cmUwgxHLy/cVaAWJCIV5BMbBCdeVu2vhN34RONGgEiFRbjpetven3qP19Ii3M3H4
+xr0GY83LCSDBi5KW0IaCjaZz5DIEKLbiDJOeEkyyKdHqK2Vxxa+uKEJOJF09ORs5
+J17RJfnVA1HQFFa0OsCxo6sSOX3oFeU3q0r8HeGHNUi2RQJYhcnY5lGSP280rJOZ
+fFnOceP8uU/5etR3VsnTlZmeLkbcb6MQutOtsM1C+JL5Wgs/l7YqQv4ehYQqrJZO
+iGbVN9CjGuB5l/NeT1qx0kldxo8pawH6C9gRx1V8Pn+WsdXemYnWXr8ra3UzXw80
+1MfpP+3K2t1hCxl6pcAtEzWBNQRwrfGhvOkBQJ6iMOvlIha3NvY4frxroUHSBpJr
+pmMa9rPiQF0EwXlJW5zVJV558NJPt4ZHrK/2TCszSapHkU33EqIEQY81Wli7gNnP
+ZbtSuYzirbYnLtybp8VtXT6E/czsfbK9Tlepm0QlSYOusP06kUDVoFH5RK/EjINf
+3a76T4Z6nux/pN14omQtzBP7zjNtOJF+dkRLmcJLMv5ODB0ebcusv2WqgJVytVQh
+f2xRX8HN/9JYRlogA/HPAWY5dFiVx9rg9OywQE6N0VRabcbXKqtG4Mk6
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp
index 0825ec7..1543dc7 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp
index e786da6..131619a 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req
index 75ffacf..b667440 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp
index f8709f4..2a007b7 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12 b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12
index f7ef5e6..0c7b8cd 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12 and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem
index 13da50b..b144cc7 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 0B 77 EA 83 E1 31 8B 71 88 DB 88 4E DE 08 91 19 A5 4A 4D A6
+ localKeyID: 99 D2 95 F9 ED CC 0E 01 49 48 24 1F 6B A0 AA 2E 31 36 63 72
subject=/CN=expired1.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwM1oXDTEyMTIwMTEyMzQwM1owHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5vcmcwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA4TTv655lwyf5lL4RkuLHqPdg
-mXI36dkjEL/864WoszwLRYYfnlOj4hmKfjq9VoslfDRnOoZSm0NebJJ9Y/ea2wID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUub3JnMA0GCSqGSIb3DQEBBQUAA0EABG4yReI+VPyFc3kEejJr31rOi3BpgEfP
-FsN+9WoTa0B+VW125F47/FySYat+M6KBSW8fe6HFexU6FXQF+mCNvQ==
+MzQwNloXDTEyMTIwMTEyMzQwNlowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN/iT8XAEsfNjvvzAeQh
+/mY4TnKNq5YxfUMS+Oyk4NIinZINQB+3qFi4V4UWoQclP7FO8r2qj3jVaW54xmTF
+c+dYDR+XnpDr0+lPj0AeM/mABtPymN1/cv4xFnrknKui4O0rpthmMiJCIJryEnOy
+Wxz5LWR/GMVL9q+IwEYJjHn5AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm9yZy8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQEFBQADgYEALRLT
+3R6jETZdnwRIIDlvZECIB/5iqzxn5dD3rRqhi8kwbS+Rw77S1ynnYULq1MRbL3dI
+BMmBW9S9jY+MZ22puKMfxUivbTfQIrFoXNgwuSfUEq5s32y6nfKo9D6xhSuD1vXx
+6B8E0XY7CtAdwWLjp6clUdr2FMXu4AWCAx7jIeI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key
index 132d2da..15afb3b 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAOE07+ueZcMn+ZS+EZLix6j3YJlyN+nZIxC//OuFqLM8C0WGH55T
-o+IZin46vVaLJXw0ZzqGUptDXmySfWP3mtsCAwEAAQJAbjXB08TIeCDv+uKpJwDk
-RMQK+gzzX/VrO5843umiDVPBs3FoDJJMMI1YIxiqmj61BNvh6YdTeYMbgsqdvUT/
-AQIhAP2hXPtUNCfSMbDZujRe7weCDynq2SdT9v5GwCABKNRLAiEA40+XExCBf3zV
-Eibj6fEWBlJjQPjCEvFLkbeOi44UmbECIF8u9qkvkZ88J//ZxiKvWf80VSKDC1nS
-DgihXqrkJIF/AiAhsUBhUQcA0I38fMs3d8ad9URE8xpBGIbs+FomkU64YQIhALds
-zCAiNfSE9O4vQvnSlbPdKT5KSbux/uGuPIhK+RA0
+MIICXQIBAAKBgQDf4k/FwBLHzY778wHkIf5mOE5yjauWMX1DEvjspODSIp2SDUAf
+t6hYuFeFFqEHJT+xTvK9qo941WlueMZkxXPnWA0fl56Q69PpT49AHjP5gAbT8pjd
+f3L+MRZ65JyrouDtK6bYZjIiQiCa8hJzslsc+S1kfxjFS/aviMBGCYx5+QIDAQAB
+AoGAB3bbJAOwXJr83meOs5VyjuPnsagJhXtm6rqSNAmXOUpQKJNqhOQxp6uVt2k2
+uy9BvV6ddzddizDKUBWUv71ZjNgKuBFw54UnfkkITUbVDqrn+NjRVsSLQ5eiTYqF
+kW0Exi6t19b9KE7pxgSvY5cGmQkqNC4+xbtKce8iYYiv4xECQQDyJqqsX+ZYllUN
+NoX/CKYgmpMVOQIJW7TpWa/qupS3/mrtzAADLpl9ypo89lDMTSarfZ8PgLCr8vaz
+kdfv9jc1AkEA7LAylhImLLjIVboNhpWmj/hom4HiCT5JDs8MuYxVLeDYTY05EMQd
+UhfMKjmDClpYR3LsZf4Dvwq5s8DODExcNQJAMaqgow5gbpcXBsjCHxclC9boiBfT
+RRwcNSiCHoD6c+qo//Exp3VtYhGmJQ7Yb677WX1AnKtmkT4aP6aQRdWYaQJBALTI
+LAs2F5RnGxVng3c9jLhAi13jycs3mMPH37dFebYOHAi4ClNFCAQxCw9hWDarJOyF
+2gxZBXGA9rBWXstD89UCQQCH0RSSVvLpnU9sgsrvQJcKug47o0xndvP5F5/bn9C0
+3bouD1s2R1PGuevAul17tkGO6FI2+UZ2XwDxkQMunR6h
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db
index 4122a84..bb9d769 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/secmod.db
index fb95521..b1dfe28 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/secmod.db and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem
index 1ca5e28..9a1aba2 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.org/CN=clica CA
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxY7JyBAI+e4vb4bz0HcjtE+O
-x0nLBB19Kz04yNARj1z/ZvY2c+uvOR3muHROCgFUQxGobP3n2HaTS/cmv2SVPwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAJLhs/m5Jx4oV++aylcAvIHa0vHSK4eh3zX1HqWwqK9I0/nl
-LqwwPgtgHQOpe7nd2g2B9wPZ82i6LiqY76A+9hI=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKVtsAGe7PATQiOvMyxM
+PL8bA1VwmS+auXRgcHWPi1Jgkd1QmS0+lZqqm5VQ1kym7vUvhggfdX5uljC6nFJ3
+41b/e0zbRB1lhyLDNxarSxPg9+Lkv/9U8r0emvwpm9PfEZnqGQKil4rKX3cdZy21
+196jOwq5X/L1S5RjYFzcVaqZAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAEHHENxfpDuyHeYT/wTW
+MaHwBbycWFoFIlIA/PBt7J3WFHiyV6IomjWMy1hMg9URN2mlGodQMYk64IDrFwZp
+9Cni9eVuWB/SlJRDi8c3WOHrkzqybuysT7DDbGQDLQUy2HuOCpyJQDikd9XlO775
+tCx603UJ6mmBZHv/vzgk35Zc
-----END CERTIFICATE-----
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: C5 6F 48 06 54 0E B3 BB 1A BF 6D F3 86 B8 E6 D7 37 A4 65 F3
+ localKeyID: 9C 5C 4A 89 BB 86 B6 6A 43 03 EE 9E 29 AC C0 5F 1C 79 B8 3B
subject=/CN=expired2.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUub3JnMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK1KoNb3Cu3dTkQQssg1cXUb
-0Oo/o0v/BCm5A9JjE8eL0K694hJrk2pSmI+nF1ujtC+0Ilylzd2JyXvyu6jZqRUC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUub3JnLzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLm9yZzANBgkqhkiG9w0BAQUFAANBAATDk4AOeRU7z4FPpjK6J2BvKeStcuon
-xoli6qipNnf95JXgo4ZOktbGD5eankcp4QRFEUMQ79DJuTCkOl/Zgs4=
+MjM0MDhaFw0xMjEyMDExMjM0MDhaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7KAlGbpBhRJ3HO5/z
+R0lIzJgczsORlecZo5pvaUPhCT8j3nUEZQc7ix/PKRyRKa9H6dZga5tLAEKWN4k5
+Q+6aRyiMXVMdzTC0EvtcLzM0DRijsEdAjSKOzG6EW7+Xw6Bo2MvP+iyfYAsR60RA
+XK6NegM8p3w0otRVcpeVS1ca9QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBBQUAA4GBAIv2
+XCRSWNHTuuE2cvsn4c8yiAEhtIfySz/zh0Dnm8jA/9OHETWz661a3huHM4nOu2fS
+xjUf3E95jGdNyVFW/8VqN5haGqjYEBsL88o6hx5P1igKXtqUQlzcgvXz1a8ZolQ6
+781puhovcg6anbIfhhIxSdK14aHDN5KhhweXanyX
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db
index 24ee82e..60f4096 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem
index 3bbfb4c..ad7e382 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: C5 6F 48 06 54 0E B3 BB 1A BF 6D F3 86 B8 E6 D7 37 A4 65 F3
+ localKeyID: 9C 5C 4A 89 BB 86 B6 6A 43 03 EE 9E 29 AC C0 5F 1C 79 B8 3B
subject=/CN=expired2.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUub3JnMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK1KoNb3Cu3dTkQQssg1cXUb
-0Oo/o0v/BCm5A9JjE8eL0K694hJrk2pSmI+nF1ujtC+0Ilylzd2JyXvyu6jZqRUC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUub3JnLzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLm9yZzANBgkqhkiG9w0BAQUFAANBAATDk4AOeRU7z4FPpjK6J2BvKeStcuon
-xoli6qipNnf95JXgo4ZOktbGD5eankcp4QRFEUMQ79DJuTCkOl/Zgs4=
+MjM0MDhaFw0xMjEyMDExMjM0MDhaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7KAlGbpBhRJ3HO5/z
+R0lIzJgczsORlecZo5pvaUPhCT8j3nUEZQc7ix/PKRyRKa9H6dZga5tLAEKWN4k5
+Q+6aRyiMXVMdzTC0EvtcLzM0DRijsEdAjSKOzG6EW7+Xw6Bo2MvP+iyfYAsR60RA
+XK6NegM8p3w0otRVcpeVS1ca9QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBBQUAA4GBAIv2
+XCRSWNHTuuE2cvsn4c8yiAEhtIfySz/zh0Dnm8jA/9OHETWz661a3huHM4nOu2fS
+xjUf3E95jGdNyVFW/8VqN5haGqjYEBsL88o6hx5P1igKXtqUQlzcgvXz1a8ZolQ6
+781puhovcg6anbIfhhIxSdK14aHDN5KhhweXanyX
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key
index 6bbf07e..e1e3b57 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: C5 6F 48 06 54 0E B3 BB 1A BF 6D F3 86 B8 E6 D7 37 A4 65 F3
+ localKeyID: 9C 5C 4A 89 BB 86 B6 6A 43 03 EE 9E 29 AC C0 5F 1C 79 B8 3B
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIqYRYZdwd4cwCAggA
-MBQGCCqGSIb3DQMHBAguS/XNjyFFMASCAWBxEYbvvuvMpVOunc6orT3lMpGxNbCV
-kNeLvBHH2LkW1lQfLoo0zgqzyvjF7hTbeNm9NS8dL3ZzMG7Xb3hiR22ypuP7gdaA
-NFxt7XfO7pCLsFScmOthYseIBvuxAGN8Qze2KDrXTVnOyrgPGk2q6XTIblUnGekt
-MuxJAJIIGW0le9Ci23Z+156zv7BAPWiAR7qL4Lm6V3T4ppfSeGkpBhGVpCmdjnT1
-IhR4rcrLjvqE+QhqEY/gA4chFcnkZsmcLNjMAMgHXdsGgpkrv8WrbS4nTsNY71p5
-d+qA6Z6ORVyUOrxzr34NpAM9tpsvHniMEvlJAq5DMz64qnG/iZymTKH8tOhgvD9d
-a7pENj+x1Eo+qb/2g6zut4+O5WnkWfXQXtuh+rnUOB09IteV33o8OYOlLR0eQxqJ
-BOLi5FgNVfoSJuCZrR9oqufOb4ue7x7lmOw0r3EQYUp0weYLvDyh0ih+
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIv47IHfvWFtoCAggA
+MBQGCCqGSIb3DQMHBAgEiRvoVqoQ6QSCAoAfr6sILAuWexJ2jaxJH+JGAlIjOq7a
+WXZn8dNMMsoZQKgl77w5EU0zg03XjoJAdjJ+7qNL30N4ikY1wqL54b61lJpxtQio
+6K/Cmsybr+9l7hnoKwPejl9/mSEK5xw6KAEk1sn5s4RNOLqT0qiLP8ZL24AVLS0+
+ereA64ZlNaFRM4SW4jjRKVPY/wjPPakNysmzUsIh8/33JdLldgVDYf0C6nnzn4QF
+AgFaPwTMP6pt8c0OuIDb1ndeXH2ihUgDEKflM4gpS+qpZTr1Jwnv40nO5SOqZG8J
+a52gD1sbQgRxruBt51ykIqMpYv//17j4kUySKbmvYopaPzoHpX5+BnozOqej0ore
+PEPaQOo6gH5lO6Xo5DY8ofVkq5vrN4Y7HA9MY5dcwOZ/jcv3hJ40sNRthREEaI9F
+4JHISj8wm6HMpppHTG/vLTEN8q4En+Vi4in/eHU2YHsfVUEBVSH8ikOr1gbjVROo
+BhzaP8bL+5mJd7XQI8owGOWgXFEdjjrDhkI3pu/xcQMqf3Rx/BbpsjgT2aLgdYxp
+aKVoNR7oYUT7Frnazx+lKNzEd5JjGxKo+w4SbmlA4CF4fgX2CQftTSxnRa6jYu3u
+8IHD2LbJ6vU9ZTvraQudp9u+kKF++IsA8deqBQx36OxSXto6BwxuhN8xBBbSO4MM
+JHBksGMFDLXDb5CM7SYoRb6XabfAQT04ROX9SamvI27mrR0LhDamdtP+xW4bcUlv
+rokMKav/dkYsUMw3Kbt3KDJ4TGa1VW567X4fs9HNQm44YCBTFeTPcjHzD6ztU9CI
+82vOUwe+b9PXLq3MK7DZKTmiK+bhNCkIl4wP7pXNxqYvp2kzJy/V22UL
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp
index 44f9d00..7a19829 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp
index 0760bb3..63a8450 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req
index 96cb53d..79b3733 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp
index 0760bb3..63a8450 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12
index 5bd498b..e031162 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12 and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem
index a2cdafe..a96ba43 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: C5 6F 48 06 54 0E B3 BB 1A BF 6D F3 86 B8 E6 D7 37 A4 65 F3
+ localKeyID: 9C 5C 4A 89 BB 86 B6 6A 43 03 EE 9E 29 AC C0 5F 1C 79 B8 3B
subject=/CN=expired2.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUub3JnMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK1KoNb3Cu3dTkQQssg1cXUb
-0Oo/o0v/BCm5A9JjE8eL0K694hJrk2pSmI+nF1ujtC+0Ilylzd2JyXvyu6jZqRUC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUub3JnLzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLm9yZzANBgkqhkiG9w0BAQUFAANBAATDk4AOeRU7z4FPpjK6J2BvKeStcuon
-xoli6qipNnf95JXgo4ZOktbGD5eankcp4QRFEUMQ79DJuTCkOl/Zgs4=
+MjM0MDhaFw0xMjEyMDExMjM0MDhaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7KAlGbpBhRJ3HO5/z
+R0lIzJgczsORlecZo5pvaUPhCT8j3nUEZQc7ix/PKRyRKa9H6dZga5tLAEKWN4k5
+Q+6aRyiMXVMdzTC0EvtcLzM0DRijsEdAjSKOzG6EW7+Xw6Bo2MvP+iyfYAsR60RA
+XK6NegM8p3w0otRVcpeVS1ca9QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBBQUAA4GBAIv2
+XCRSWNHTuuE2cvsn4c8yiAEhtIfySz/zh0Dnm8jA/9OHETWz661a3huHM4nOu2fS
+xjUf3E95jGdNyVFW/8VqN5haGqjYEBsL88o6hx5P1igKXtqUQlzcgvXz1a8ZolQ6
+781puhovcg6anbIfhhIxSdK14aHDN5KhhweXanyX
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key
index 873f59f..293c6b8 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBAK1KoNb3Cu3dTkQQssg1cXUb0Oo/o0v/BCm5A9JjE8eL0K694hJr
-k2pSmI+nF1ujtC+0Ilylzd2JyXvyu6jZqRUCAwEAAQJBAIKMYjcPzW/89OVaHxWt
-DVhIKE8Quhiaeaxk8Xgho9kDQXb9VUnY9uY+hQFL8jAlmr1xyqPL1ztA8Rx7b7DH
-toECIQDifcfwxsjaF2XMdkDdEtmoYlEow5sRoGzgNz29EQtUiQIhAMPedhNwRb2J
-0Vc6OgL4DCwu4oyjxcyGU3TywinwhCUtAiAnnYaGR87DzsngfGKWCIEHocK+VZBf
-AedpRGBJHJ0VuQIhALHy6Ylthh7WGBfMcaoC22RE0FR/8hOHskjcyGQ7/IKdAiEA
-lLVprJ0QmF5Z1+6RbIOcWwRWNOHEqAz4xY6HR65E2HE=
+MIICXQIBAAKBgQC7KAlGbpBhRJ3HO5/zR0lIzJgczsORlecZo5pvaUPhCT8j3nUE
+ZQc7ix/PKRyRKa9H6dZga5tLAEKWN4k5Q+6aRyiMXVMdzTC0EvtcLzM0DRijsEdA
+jSKOzG6EW7+Xw6Bo2MvP+iyfYAsR60RAXK6NegM8p3w0otRVcpeVS1ca9QIDAQAB
+AoGAfEJApjqSMYJVHwo/UE5sIaF0/OtqfSaBoUw2JPJG1wpEmZQBLUHGY4ojPG+X
+P+nlLmHaq3nGSS2LCCEnQpYPu8wGVAPW1DFfg1PfVBhu/CIWBatEw9nJD2DEwREs
+bDeSzYbbR+yUjUP+MEj5OYRLuBRopXpOVj9/maQF1JCBJaECQQDdP15Ha8y2isD/
+VrKKF4eYMoWQX5nK7sxiY77tpT4NRScGoxAy9/IfS+VVlZ8ORBi0uid2x/lsMFAo
+nOrt7dxnAkEA2I3SYqdmIF6RTDPjoiv6rS3NiZqneR/j3lJNj7lQCjyKAz7s0pHc
+COeIaxPDcd+4+H2ZVp4zUZ9+18vsjTK0QwJBAJfXj6rQrxRwsfgL1kiz0VmBAu2M
+zw3ZSegUsMqEZ8vPs/L4Inv4cvFLsz9Din/N+G7Ae6knoWTA26Kj3xAf+O0CQAgw
+/SdMK7nHuflG8TJeNYI9fEvbNMCJK0ZqmJJ6MQPiHFpZE/43FDql/2wFeFwjWUzU
++2riWxCYVuT0ysLgix8CQQDDGEl3Eu2AtfgjPtbZ+YXXwJJ0MoZqXurLI5hTPwU4
+oLP9fsl8CvF+2Y5sqRVh1cX/FeA4E0gkKFNdPZyOVInn
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db
index 22278dd..fcdca1d 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/secmod.db
index 7201c72..864618e 100644
Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/secmod.db and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem
index 6e46899..b2afc1d 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.org/CN=clica CA
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxY7JyBAI+e4vb4bz0HcjtE+O
-x0nLBB19Kz04yNARj1z/ZvY2c+uvOR3muHROCgFUQxGobP3n2HaTS/cmv2SVPwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAJLhs/m5Jx4oV++aylcAvIHa0vHSK4eh3zX1HqWwqK9I0/nl
-LqwwPgtgHQOpe7nd2g2B9wPZ82i6LiqY76A+9hI=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKVtsAGe7PATQiOvMyxM
+PL8bA1VwmS+auXRgcHWPi1Jgkd1QmS0+lZqqm5VQ1kym7vUvhggfdX5uljC6nFJ3
+41b/e0zbRB1lhyLDNxarSxPg9+Lkv/9U8r0emvwpm9PfEZnqGQKil4rKX3cdZy21
+196jOwq5X/L1S5RjYFzcVaqZAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAEHHENxfpDuyHeYT/wTW
+MaHwBbycWFoFIlIA/PBt7J3WFHiyV6IomjWMy1hMg9URN2mlGodQMYk64IDrFwZp
+9Cni9eVuWB/SlJRDi8c3WOHrkzqybuysT7DDbGQDLQUy2HuOCpyJQDikd9XlO775
+tCx603UJ6mmBZHv/vzgk35Zc
-----END CERTIFICATE-----
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: CB 4F CF EE 43 43 65 BB 23 74 E0 40 65 36 FE 99 31 DF AB A8
+ localKeyID: 50 E1 3B 8D 7E A7 C9 95 F1 B6 53 46 E3 53 5B 94 D4 EA 49 58
subject=/CN=revoked1.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMloXDTM4MDEwMTEyMzQwMlowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
-ZS5vcmcwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAtH5k2k62LbnSi/B5Bgxk+zMn
-GiOYjeojLffbE73oSIws/sAwigOroZRxeDCK1Bvqlt3CsRlh1j7qGHTdf3JPEQID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFHJldm9rZWQxLmV4YW1w
-bGUub3JnMA0GCSqGSIb3DQEBBQUAA0EAh2MZRLrAaQlspQCSvzB8GauDjhyc1ZMz
-/YeE550dEXzC3YtnTK6PKmDfm0xw/eVcSnwlsYUdLFzB5xBGbkxQbg==
+MzQwNloXDTM4MDEwMTEyMzQwNlowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
+ZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN81f2TUIoWVBMw1tkzd
+rSpexfNwKTcN5SVic7fCm0DXKTpqCYbU4AJQEqYkSy6XQZXbEoD1yRD1taVVz/M7
+lBZfAaqan5LvXiED6eAl93OmNnD5q7+59B7vR3gPn1RxcQHOmhHANHpBlU5yca9c
+XjyHN4UVekDb79k+4f+dq4fTAgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm9yZy8wHwYDVR0R
+BBgwFoIUcmV2b2tlZDEuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQEFBQADgYEAQaHd
+di28K2dsvOzTaJUJs7ojgtK4e+maGKhjAfuFEhFyi1kDWbub5i7Z/VOvoeor33M7
+KkXZpIfhFbbXPQ+QzaNTk3Wx/ypr5OlnfgtXBK9cMp7Dwrw7lpi2knsNK/j5nnzJ
+RnzZHkuQP7sD8GZO43BeQovXaGLHu66R+pV9RnQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db
index 276490b..b275281 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db
index d0a1a89..782b2b5 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem
index 44a69f4..7b31f7f 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: CB 4F CF EE 43 43 65 BB 23 74 E0 40 65 36 FE 99 31 DF AB A8
+ localKeyID: 50 E1 3B 8D 7E A7 C9 95 F1 B6 53 46 E3 53 5B 94 D4 EA 49 58
subject=/CN=revoked1.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMloXDTM4MDEwMTEyMzQwMlowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
-ZS5vcmcwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAtH5k2k62LbnSi/B5Bgxk+zMn
-GiOYjeojLffbE73oSIws/sAwigOroZRxeDCK1Bvqlt3CsRlh1j7qGHTdf3JPEQID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFHJldm9rZWQxLmV4YW1w
-bGUub3JnMA0GCSqGSIb3DQEBBQUAA0EAh2MZRLrAaQlspQCSvzB8GauDjhyc1ZMz
-/YeE550dEXzC3YtnTK6PKmDfm0xw/eVcSnwlsYUdLFzB5xBGbkxQbg==
+MzQwNloXDTM4MDEwMTEyMzQwNlowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
+ZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN81f2TUIoWVBMw1tkzd
+rSpexfNwKTcN5SVic7fCm0DXKTpqCYbU4AJQEqYkSy6XQZXbEoD1yRD1taVVz/M7
+lBZfAaqan5LvXiED6eAl93OmNnD5q7+59B7vR3gPn1RxcQHOmhHANHpBlU5yca9c
+XjyHN4UVekDb79k+4f+dq4fTAgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm9yZy8wHwYDVR0R
+BBgwFoIUcmV2b2tlZDEuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQEFBQADgYEAQaHd
+di28K2dsvOzTaJUJs7ojgtK4e+maGKhjAfuFEhFyi1kDWbub5i7Z/VOvoeor33M7
+KkXZpIfhFbbXPQ+QzaNTk3Wx/ypr5OlnfgtXBK9cMp7Dwrw7lpi2knsNK/j5nnzJ
+RnzZHkuQP7sD8GZO43BeQovXaGLHu66R+pV9RnQ=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key
index cd759c4..ce8c761 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: CB 4F CF EE 43 43 65 BB 23 74 E0 40 65 36 FE 99 31 DF AB A8
+ localKeyID: 50 E1 3B 8D 7E A7 C9 95 F1 B6 53 46 E3 53 5B 94 D4 EA 49 58
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBnjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIYvHqW0ndOlQCAggA
-MBQGCCqGSIb3DQMHBAgXAj3LlhSYaQSCAVhHtecAjwqd7AvQnGWaErxhdo/AMfio
-SWCovkatfN0ExC0Q43QX2P7HKcP6ysQDg+oLHWiIP+2N6lOkQLBxF4KCAfEa9hcR
-GJhbBDLiL5mNgfxdPzM+NUfxGainUfwiGFM5ZZg4vZgvP8hMoVeCRJ+sBP4rHzyw
-0AdAMzAeJym8MVONUMadr/D7ReMGgxQdGGl/GrrmwOAeJNCh8KJVfI7hQZE0Ell7
-XWWZPl1VafuzErUz0Lm4NdbstlfpVE/ZWWuXCxGgJ5cPyMu5oloHPpPm+x0oR4Ik
-NxPkXZ74OZtc58nTgh+SEVe/myWTujMdj9jCxfJknyAlMwZCv/wu/EwcRFopvo16
-zLCsb2x4+sW5Uhduv0mQYEIPBjl+9Eg5eHrX6z+E/AhikE3C7OmQ7MM/8PLPqoUo
-xoXYK2O5seWWA5IjCbm7I9mMQpmZi847H9WpHLEaoh8gew==
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIfcTUCjC2BK4CAggA
+MBQGCCqGSIb3DQMHBAiK9Tq8tW41IwSCAoBwhuO5qx1RkkScR3dR8y4YcHh3q6e0
++dKjfUTez521nw+t+d5RI8ldj1F98+byh8XA3/tSE+6yiiZA+XlUWpyU+SZC38/5
+kjP5tYbhIrQ7reQbSCyVpox5reac1VLz3zlYlETh9lwnEslhbkabBjzF+hxVf7E1
+WGb0/QW73/7McdunqIMU3KmAcTzLNgWRuu7TNVMtBFoQKiSJAjLR6ZiNQTSP+eln
+hGhKXghFgRQchr3SMUzVkdqXjvz6aL1AhkeEdUYXc35WojeC431OZWS+q5z+FQna
+4FJBL90MwgFdbd3lS9QGrM5It+ccd5r9r3PQUcAFn9DsNVV8H7zo7CAT3zfSid9T
+lvGQ8LLBvpWIlfef3EV9f2dxN0CRXUqEb/Qrw6FmRMmIrtIBnxjaFgFhZq1EdByQ
+dPgiKAFYyjRyKp2G/idqVMf9Ud10bXaeWDGDUn1W7nElsmhgkTFTAO9BrMfuOXG8
+jKJ1oRt/67sV1oOr8EXGW6CNYSgmUTcXUcZB8jHkO5Hat2YmmaYKEA7X4Mz+gKUa
+Bsf1B1xT8/q6mNxEgSuA81B8hGy2q/iVEyLUM8wTJGiYlib8tzxI7faiy7fEX9tZ
+Averd7TG/1ZcgY2pVkpJ4DY+w3bHMAkQgvV/I8t+VPiKx7y53AtRviSEOo+zA9oW
+sl29S7lsrLzwM2picvhr2LdxJuMhD5cl8gq8gjh/8IGlSDj9JxFFkwLwoD9raWKi
+3VgqtIHyEiUEv2N7CHZh1DL/V9sY8rwwEO1LpDxUCyDrf4kDeNk1wiUV/3U0E4EJ
+HxWLzRkRgqiOOY6PTqRlHEC4wjNdWVjipmw1EHS4RWpEIEvvdJZTytTH
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp
index 5a12466..6f1abcf 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp
index 30c30f6..57cf63e 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req
index 90263fd..c8ea5d2 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp
index 6273c03..8eefecf 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12 b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12
index c4392fc..6227772 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12 and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem
index 70bea88..07d81ef 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: CB 4F CF EE 43 43 65 BB 23 74 E0 40 65 36 FE 99 31 DF AB A8
+ localKeyID: 50 E1 3B 8D 7E A7 C9 95 F1 B6 53 46 E3 53 5B 94 D4 EA 49 58
subject=/CN=revoked1.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZjANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMloXDTM4MDEwMTEyMzQwMlowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
-ZS5vcmcwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAtH5k2k62LbnSi/B5Bgxk+zMn
-GiOYjeojLffbE73oSIws/sAwigOroZRxeDCK1Bvqlt3CsRlh1j7qGHTdf3JPEQID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFHJldm9rZWQxLmV4YW1w
-bGUub3JnMA0GCSqGSIb3DQEBBQUAA0EAh2MZRLrAaQlspQCSvzB8GauDjhyc1ZMz
-/YeE550dEXzC3YtnTK6PKmDfm0xw/eVcSnwlsYUdLFzB5xBGbkxQbg==
+MzQwNloXDTM4MDEwMTEyMzQwNlowHzEdMBsGA1UEAxMUcmV2b2tlZDEuZXhhbXBs
+ZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN81f2TUIoWVBMw1tkzd
+rSpexfNwKTcN5SVic7fCm0DXKTpqCYbU4AJQEqYkSy6XQZXbEoD1yRD1taVVz/M7
+lBZfAaqan5LvXiED6eAl93OmNnD5q7+59B7vR3gPn1RxcQHOmhHANHpBlU5yca9c
+XjyHN4UVekDb79k+4f+dq4fTAgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm9yZy8wHwYDVR0R
+BBgwFoIUcmV2b2tlZDEuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQEFBQADgYEAQaHd
+di28K2dsvOzTaJUJs7ojgtK4e+maGKhjAfuFEhFyi1kDWbub5i7Z/VOvoeor33M7
+KkXZpIfhFbbXPQ+QzaNTk3Wx/ypr5OlnfgtXBK9cMp7Dwrw7lpi2knsNK/j5nnzJ
+RnzZHkuQP7sD8GZO43BeQovXaGLHu66R+pV9RnQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key
index 47e917b..39b8f82 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBALR+ZNpOti250ovweQYMZPszJxojmI3qIy332xO96EiMLP7AMIoD
-q6GUcXgwitQb6pbdwrEZYdY+6hh03X9yTxECAwEAAQJADLoAyHfWVqEMnHtnPSrw
-j9nKfwhVgGQq+NnKI7k3QK4rQX1Z+wfSw0rxpE5sFqDUVheeFY/IMolXD32zJwUM
-pQIhAOEb6HbVqVqYr5lgN7CoRSVRXJEm1PvxmI6RKewtAPGTAiEAzUMl+oAfRboT
-tywwc4N8MdvAAapLnP9u7NmhG7fP80sCIHkXgCdcrCs180/4ODzpZ7i5WagjUXLt
-9XjLkdegJd/NAiAweI7bXK4F1S8arkCyxnXpgC8TNZetd1RGcg3tcbaViQIgIDmb
-d9wZOnDeMg3BlC5X+zfOyiGk3+/Jnp7Msya+nfc=
+MIICXQIBAAKBgQDfNX9k1CKFlQTMNbZM3a0qXsXzcCk3DeUlYnO3wptA1yk6agmG
+1OACUBKmJEsul0GV2xKA9ckQ9bWlVc/zO5QWXwGqmp+S714hA+ngJfdzpjZw+au/
+ufQe70d4D59UcXEBzpoRwDR6QZVOcnGvXF48hzeFFXpA2+/ZPuH/nauH0wIDAQAB
+AoGAUnEiAo3PymMGCJ72HGHsKbAjkQymTG1Xa313nDHGwiY2VhsANcq+ilwk5zSU
+iDrZwI3Pwc4GW7tFQjH1wrMIuKHQ1vWtEkoZV/T2AcQKmX6swxhYNIdxkyfseOf0
+7ts2x/T/fE+x/IChwGNjEzELqf92znP2NPISus49E1KrcpECQQD55gkp6NJcKxGO
+dNPE0rv7BnvRU/xjOFZR7Das9Kgi2W0OgXDs/UsrEHNg+S4vkK786CoqKATXeirp
+XJUqAhuVAkEA5KikLz+wcekSJFHCbq08Z187+7LlllX5SkwfhFIk7x3nVEqd/9e5
+Tu2WrCjMboibszWCMKDuPUbc4P9MCcn7xwJBAIJXyLnSVT57vFmIeBh2LlRdamGh
+o8gAz41FXrNRnQ0oSSjCvSrvZrCckQGolr16grspQSzh2LynXRCBGNBjbw0CQCGQ
+b6lP3AKch8E1DylX3In//LoRpInQzOsPCYFO3YUMCqzg1xh6/gSL85YJ1xhSjShd
+LmMc/FuaT0nnr62wLHkCQQCq8QPZU46wBJSHps0BbV0dTco+Og0juJr7FOJPrHga
+ZpZfwPzR/2fuZD9Il6NgYMQiVIOJccZufY8VhnatiZzq
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/secmod.db
index 7621830..0c4efea 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/secmod.db and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem
index d36ac20..0be7715 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.org/CN=clica CA
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxY7JyBAI+e4vb4bz0HcjtE+O
-x0nLBB19Kz04yNARj1z/ZvY2c+uvOR3muHROCgFUQxGobP3n2HaTS/cmv2SVPwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAJLhs/m5Jx4oV++aylcAvIHa0vHSK4eh3zX1HqWwqK9I0/nl
-LqwwPgtgHQOpe7nd2g2B9wPZ82i6LiqY76A+9hI=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKVtsAGe7PATQiOvMyxM
+PL8bA1VwmS+auXRgcHWPi1Jgkd1QmS0+lZqqm5VQ1kym7vUvhggfdX5uljC6nFJ3
+41b/e0zbRB1lhyLDNxarSxPg9+Lkv/9U8r0emvwpm9PfEZnqGQKil4rKX3cdZy21
+196jOwq5X/L1S5RjYFzcVaqZAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAEHHENxfpDuyHeYT/wTW
+MaHwBbycWFoFIlIA/PBt7J3WFHiyV6IomjWMy1hMg9URN2mlGodQMYk64IDrFwZp
+9Cni9eVuWB/SlJRDi8c3WOHrkzqybuysT7DDbGQDLQUy2HuOCpyJQDikd9XlO775
+tCx603UJ6mmBZHv/vzgk35Zc
-----END CERTIFICATE-----
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: B9 99 5C A3 65 F8 67 93 A4 96 45 B2 7C B6 64 28 CB 71 1D 6C
+ localKeyID: 91 79 2B 4F 85 50 DC 01 0A 3B 55 2B FF 9B A4 D6 BC B7 BE 15
subject=/CN=revoked2.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDNaFw0zODAxMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
-bGUub3JnMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANLUlL/Fx0qhl0rhRZ3HTr+d
-wbKi0cDyZa97S5EDr3Dq1qurHmEs92C6P27df1r6ltVT7O1xH1+s40hTL5yzQ3sC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUub3JnLzAfBgNVHREEGDAWghRyZXZva2VkMi5leGFt
-cGxlLm9yZzANBgkqhkiG9w0BAQUFAANBAC0aZSfdH/PlvY+jfQnVAkmmYyawPdSu
-Osv4lwZYhBo2FSJdlufbwo3ElD4JK/BIHHTGiphM9++hpGLWaAcvT4k=
+MjM0MDdaFw0zODAxMDExMjM0MDdaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
+bGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdln63imf3mdI/eK0O
+SIAqrJ9JM/AJan+Ruh/kz2U5bb4Fp7GsMGihlXAQOdWACxDniH1nz1mpbYs4deMG
+AdBSpFJpY+7Yn7IiqeLkj9/VahzHDuWqGNVbfh7DLODZP/Pnsg7OGvBwmdxPchCp
+jK/Jsbm2wkhzK3ZWtPrNuPrztQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1Ud
+EQQYMBaCFHJldm9rZWQyLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBBQUAA4GBADMy
+0I8TYeOYO2uMTcmNv2J+EiJFT31jJl2xOB4bXzIAWDM938O3/5Yp0TPkLipgRF1s
+MhQYiOPwksQ/OQZ89nVH0zss9DjuxtLuNUSlqBuftzsOhi230rb/aOKzjqmfX6KU
+sEQka5d1IWlbaQ7MJpfrz1otnoUNFStGigU9KT7G
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db
index e1c3dae..1dca879 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db
index 52cfbc2..7e7e68a 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem
index 7bc3981..781b04e 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: B9 99 5C A3 65 F8 67 93 A4 96 45 B2 7C B6 64 28 CB 71 1D 6C
+ localKeyID: 91 79 2B 4F 85 50 DC 01 0A 3B 55 2B FF 9B A4 D6 BC B7 BE 15
subject=/CN=revoked2.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDNaFw0zODAxMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
-bGUub3JnMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANLUlL/Fx0qhl0rhRZ3HTr+d
-wbKi0cDyZa97S5EDr3Dq1qurHmEs92C6P27df1r6ltVT7O1xH1+s40hTL5yzQ3sC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUub3JnLzAfBgNVHREEGDAWghRyZXZva2VkMi5leGFt
-cGxlLm9yZzANBgkqhkiG9w0BAQUFAANBAC0aZSfdH/PlvY+jfQnVAkmmYyawPdSu
-Osv4lwZYhBo2FSJdlufbwo3ElD4JK/BIHHTGiphM9++hpGLWaAcvT4k=
+MjM0MDdaFw0zODAxMDExMjM0MDdaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
+bGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdln63imf3mdI/eK0O
+SIAqrJ9JM/AJan+Ruh/kz2U5bb4Fp7GsMGihlXAQOdWACxDniH1nz1mpbYs4deMG
+AdBSpFJpY+7Yn7IiqeLkj9/VahzHDuWqGNVbfh7DLODZP/Pnsg7OGvBwmdxPchCp
+jK/Jsbm2wkhzK3ZWtPrNuPrztQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1Ud
+EQQYMBaCFHJldm9rZWQyLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBBQUAA4GBADMy
+0I8TYeOYO2uMTcmNv2J+EiJFT31jJl2xOB4bXzIAWDM938O3/5Yp0TPkLipgRF1s
+MhQYiOPwksQ/OQZ89nVH0zss9DjuxtLuNUSlqBuftzsOhi230rb/aOKzjqmfX6KU
+sEQka5d1IWlbaQ7MJpfrz1otnoUNFStGigU9KT7G
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key
index 3c2d612..caa6b06 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: B9 99 5C A3 65 F8 67 93 A4 96 45 B2 7C B6 64 28 CB 71 1D 6C
+ localKeyID: 91 79 2B 4F 85 50 DC 01 0A 3B 55 2B FF 9B A4 D6 BC B7 BE 15
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIatK6XJ1l+7MCAggA
-MBQGCCqGSIb3DQMHBAjUZXz3pKENmgSCAWDbQs9Kd21OIstOoQdgYviX33loF2bH
-wpn0IP4P/2dFUmK07M146AEwPgXTI/mCewMgJ/cRQqnFAyoE1hjbZnk3WRi2SRXs
-dmIWAveseDuDsL7og72bHSvHIqsvcYs9SS8KBPCH6wY14a40QO1X26t7S8ZLTspu
-4V/YSNNiug6n8Z3N1Y2tuWPC8CQ9bBtL2jcqZT0WBJ8BXtn69jmVSWNm1DBaByET
-M4dqHGC//hFk1jnKBXaJ/VvBS5E6lOANwfUAr0gQT08NaJ7qJ6WUhpca7Rtky/KQ
-/passZZKeu7/R8VyQLvfk+vH2wW+5EX8+WtutWQJycW57+pnoXORrvIz3lc6B/6+
-Q91EJzABv5n93nynoZgEEr4vKiCCmLGYYJEciqQTERzCDNw3P73R+sd9PiTrku9g
-pKp12ieWWHZjeHcAMUZl8xWSytVT1fkeSPXcA43KoW93s78DegMh/HTr
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI9iSrJPTr2ZYCAggA
+MBQGCCqGSIb3DQMHBAj44W9WrRYkRgSCAoCCGsFWwV2z6O0KQf3eWC74bDDCbQM8
+jHT+fF+fvi9TfrPmg9gmQoK8rL4hZRrRlVKXiAX+WOBIf/oGdw8aw8Tqdtf0S5DW
+A+3thURE091hmahtxnIpiY9yrhy668lCQDgKa8aonffPQf99up5W7Rt4TJ5u1Py9
+w+MwEdBv2DGj1uMIHiObRCboLWZXZhpQQ0AzbKWvNg88CFVIyPA46YGaffaCtA2P
+UEC+DcC12YqRfPgHYMU+BspsGj8U7KbemP6qbkx8+a25wOz4dfy/JHFgQjQM2MS1
+dEAO0mkGJIFeQGKzf3ZlTdw602S5gMGncxJma7nmNJEwdQenFGP44Ldp+oSrrmS4
+Xgec3G+/lGQaZRee/9vRn//5sUnmGvbrexEstssdZ4NloEBoHVWPqqng0uOO9bul
+PGS1LGMkqR2JZivzESg94FpXz41bd2ZBRwtc4X/q0vMVybUBQgyMjpsAzSkDCliU
+nodG5h3vQC/PhL+5wM4l9XuvhptZLNFXdEjSvTKrLEPSHXqX1pElR5SwV7CCIGL0
+lZh2ItNc4wWOGSaO2gJSdpQ/K5/oykbfvPQTIDgrZCcHlnYZ6gBxw/436pVIf1rB
+uLAKSk/1yfA75XOSe1yKDzWZdskVYnMh9gtdLu85nRH998nON62aQd3+yeRY6OIG
+FgFl8P0Aef6EZZRVqHA6n4amHZJKzbIoX77RnR07/42GTQ2hhIFmt7hgTP2UzYAy
+e/vwGjzhGg1DDe8R1ToJY7W+ljbvO1W0Ku1fDmOtzv81hK1onfKYFHCC+/R544DY
+Se7pPZtxV25ufg1IkaYdLTM9xRDHF4uZ22cAiWw4h8KOB8PJHJkZa6Hg
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp
index 00a0d1c..ec731f5 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp
index 3e2585a..82f63cc 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req
index 0348f98..768e411 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp
index 3e2585a..1a4a1ce 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12
index f71eda5..12bfae0 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12 and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem
index 9e24c7c..298dcf0 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: B9 99 5C A3 65 F8 67 93 A4 96 45 B2 7C B6 64 28 CB 71 1D 6C
+ localKeyID: 91 79 2B 4F 85 50 DC 01 0A 3B 55 2B FF 9B A4 D6 BC B7 BE 15
subject=/CN=revoked2.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMowDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDNaFw0zODAxMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
-bGUub3JnMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANLUlL/Fx0qhl0rhRZ3HTr+d
-wbKi0cDyZa97S5EDr3Dq1qurHmEs92C6P27df1r6ltVT7O1xH1+s40hTL5yzQ3sC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUub3JnLzAfBgNVHREEGDAWghRyZXZva2VkMi5leGFt
-cGxlLm9yZzANBgkqhkiG9w0BAQUFAANBAC0aZSfdH/PlvY+jfQnVAkmmYyawPdSu
-Osv4lwZYhBo2FSJdlufbwo3ElD4JK/BIHHTGiphM9++hpGLWaAcvT4k=
+MjM0MDdaFw0zODAxMDExMjM0MDdaMB8xHTAbBgNVBAMTFHJldm9rZWQyLmV4YW1w
+bGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdln63imf3mdI/eK0O
+SIAqrJ9JM/AJan+Ruh/kz2U5bb4Fp7GsMGihlXAQOdWACxDniH1nz1mpbYs4deMG
+AdBSpFJpY+7Yn7IiqeLkj9/VahzHDuWqGNVbfh7DLODZP/Pnsg7OGvBwmdxPchCp
+jK/Jsbm2wkhzK3ZWtPrNuPrztQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5vcmcvMB8GA1Ud
+EQQYMBaCFHJldm9rZWQyLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBBQUAA4GBADMy
+0I8TYeOYO2uMTcmNv2J+EiJFT31jJl2xOB4bXzIAWDM938O3/5Yp0TPkLipgRF1s
+MhQYiOPwksQ/OQZ89nVH0zss9DjuxtLuNUSlqBuftzsOhi230rb/aOKzjqmfX6KU
+sEQka5d1IWlbaQ7MJpfrz1otnoUNFStGigU9KT7G
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key
index c6895f7..56d076c 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBANLUlL/Fx0qhl0rhRZ3HTr+dwbKi0cDyZa97S5EDr3Dq1qurHmEs
-92C6P27df1r6ltVT7O1xH1+s40hTL5yzQ3sCAwEAAQJBALGnYBCY3+4LbCk02iyx
-nbHphSa5/HXRy82q32o66MMEGIfyMaluRfMoQHS9n3yieOn2i41s7+4w52ormZEx
-hEECIQDpSgUGrakvx2mqhAxIkfYTJgS3bMUINlRveYpYNvL65QIhAOda2XxChB3H
-TxTgJURPl1i4LOEm9ecMHlBNhzhadn7fAiEA0pp8BxdnkTaY8dLbs/fxCkBcKasM
-BOnnN+ulNRYGLPECIDrXJFEyKZ/ZPQe2KkRBaeCqlt98pTXqIxuRXD684z5JAiBi
-aAtGEXlUtwnseKyflSrEh0bAwnOsEEA7qEUCl/ExPw==
+MIICXQIBAAKBgQCdln63imf3mdI/eK0OSIAqrJ9JM/AJan+Ruh/kz2U5bb4Fp7Gs
+MGihlXAQOdWACxDniH1nz1mpbYs4deMGAdBSpFJpY+7Yn7IiqeLkj9/VahzHDuWq
+GNVbfh7DLODZP/Pnsg7OGvBwmdxPchCpjK/Jsbm2wkhzK3ZWtPrNuPrztQIDAQAB
+AoGAJG+0ktl0moI9Y6GSWdgXkkZhefqBSJwQLPCdCTmOzQ17vzD72rVCrAGybH4C
+yF1GplIftM3zjEIgy4guWqg2s1gY40GgpxWZkD4xY9vofmkghjlce2l/T7+hi0LL
+dDfYmbVtHxlplsgt0XDRln0dOQ3EY54iNySls48BYBu9agECQQDLyk5OWAgmHxDJ
+JhAgaKwv+scEquXNyMr5zLwybJBtgXKv+we7MiJjSmVAl61RTCxy4zZZAAR3OLOE
+LVpltH01AkEAxfX7C0BWSm2myetoGpUTVqJ5yFRmOc371Ko8BVbJZlwypYy/FWE2
+4tCIHF7/ID6p2Uufo9vDaiUR0duBMY/sgQJBAIrIODGkQ9BqQY0qrbrUbcay+svT
+8nIE9y3M3rFcO7NHf6oWw3oZN0/0/yVQ5ghCXtbSo1VS7LegVqiCFljC5K0CQA+K
+fRfoCB41t4dYlMapd2gwvzDL926ITkHmz2l3473GdS9r+kBabm2mA1l+17aXVMw7
+VKAPi6rUmC6Kdf0HGIECQQCQgmF/yF58lm3AG45X98HS1TpQ1Ky6Xj+7FrtR4Z3V
+xXfwIX+CDxpLpSpRIwe3IgsNdjr82XvEcu9RKoApnib6
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/secmod.db
index f7a91aa..7651954 100644
Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/secmod.db and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem
index 6cdbee1..5430452 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.org/CN=clica CA
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxY7JyBAI+e4vb4bz0HcjtE+O
-x0nLBB19Kz04yNARj1z/ZvY2c+uvOR3muHROCgFUQxGobP3n2HaTS/cmv2SVPwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAJLhs/m5Jx4oV++aylcAvIHa0vHSK4eh3zX1HqWwqK9I0/nl
-LqwwPgtgHQOpe7nd2g2B9wPZ82i6LiqY76A+9hI=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKVtsAGe7PATQiOvMyxM
+PL8bA1VwmS+auXRgcHWPi1Jgkd1QmS0+lZqqm5VQ1kym7vUvhggfdX5uljC6nFJ3
+41b/e0zbRB1lhyLDNxarSxPg9+Lkv/9U8r0emvwpm9PfEZnqGQKil4rKX3cdZy21
+196jOwq5X/L1S5RjYFzcVaqZAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAEHHENxfpDuyHeYT/wTW
+MaHwBbycWFoFIlIA/PBt7J3WFHiyV6IomjWMy1hMg9URN2mlGodQMYk64IDrFwZp
+9Cni9eVuWB/SlJRDi8c3WOHrkzqybuysT7DDbGQDLQUy2HuOCpyJQDikd9XlO775
+tCx603UJ6mmBZHv/vzgk35Zc
-----END CERTIFICATE-----
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 5E 7F 83 85 31 F1 CA DC 88 07 2C 58 95 FA 36 16 65 F6 BB 8D
+ localKeyID: 89 83 15 9C 9D EC 03 C2 1E A7 EA A5 D8 31 6A EA DE 25 18 47
subject=/CN=server1.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAjCCAaygAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIIChzCCAfCgAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMloXDTM4MDEwMTEyMzQwMlowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
-Lm9yZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDFIpfEcK4d3IEq3F7B6AIpepZk
-mKln9pcCm0RbAxm77YlhHucDzyVu9rmW7XSW/c4Dv3clwzHLpaoF2KURKLZ7AgMB
-AAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUu
-b3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRw
-Oi8vb3NjcC9leGFtcGxlLm9yZy8wHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-Lm9yZzANBgkqhkiG9w0BAQUFAANBACfk1MYCSbT2gbaT1Dv9FrMEybkFZtxUfz69
-Gnx/55Wfw936z2en+RImD3qF1qQxUwIMlWGm6SaitfmlQ5qVJ1A=
+MzQwNVoXDTM4MDEwMTEyMzQwNVowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
+Lm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6K6Qdj7lER724C4uldT8
+RN4V6UGSUi4EZlbih2xcsOlYzK2Cb3kvOhRQFv2g3lEoqzKwi9woHpkFHoo8ort+
+07+yrxZlmKlOvCGMxspz0QyfLErFdEs4Pmqo+jhhhUrgXLW+mvYrLZuHHiqfv5/L
+rXgu6/ERq7/CIfZ0jygZy0MCAwEAAaOBvzCBvDAOBgNVHQ8BAf8EBAMCBPAwIAYD
+VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOG
+IWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQo
+MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwL2V4YW1wbGUub3JnLzAeBgNVHREE
+FzAVghNzZXJ2ZXIxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBBQUAA4GBAEUkgcrb
+LVd9hlZA0XY9LDKUURty98fUurFJOG310R/VPcy+WigtWVINbmeeYGhXWcB6OLb+
+EZgQC6w0eK90BKSQff4hehImEvOD6eTb37JrsqSYyXxBQkLg+bFNzdNrtSJJUHR9
+EkywhyrVtlrU+tOYVlrrvhSUDrhrleVO00KU
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db
index c9c908a..7817636 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db and b/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db
index db816ef..56fb647 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db and b/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/secmod.db
index ac46b48..64cb03c 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/secmod.db and b/test/aux-fixed/exim-ca/example.org/server1.example.org/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem
index da43040..89196e2 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 5E 7F 83 85 31 F1 CA DC 88 07 2C 58 95 FA 36 16 65 F6 BB 8D
+ localKeyID: 89 83 15 9C 9D EC 03 C2 1E A7 EA A5 D8 31 6A EA DE 25 18 47
subject=/CN=server1.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAjCCAaygAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIIChzCCAfCgAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMloXDTM4MDEwMTEyMzQwMlowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
-Lm9yZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDFIpfEcK4d3IEq3F7B6AIpepZk
-mKln9pcCm0RbAxm77YlhHucDzyVu9rmW7XSW/c4Dv3clwzHLpaoF2KURKLZ7AgMB
-AAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUu
-b3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRw
-Oi8vb3NjcC9leGFtcGxlLm9yZy8wHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-Lm9yZzANBgkqhkiG9w0BAQUFAANBACfk1MYCSbT2gbaT1Dv9FrMEybkFZtxUfz69
-Gnx/55Wfw936z2en+RImD3qF1qQxUwIMlWGm6SaitfmlQ5qVJ1A=
+MzQwNVoXDTM4MDEwMTEyMzQwNVowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
+Lm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6K6Qdj7lER724C4uldT8
+RN4V6UGSUi4EZlbih2xcsOlYzK2Cb3kvOhRQFv2g3lEoqzKwi9woHpkFHoo8ort+
+07+yrxZlmKlOvCGMxspz0QyfLErFdEs4Pmqo+jhhhUrgXLW+mvYrLZuHHiqfv5/L
+rXgu6/ERq7/CIfZ0jygZy0MCAwEAAaOBvzCBvDAOBgNVHQ8BAf8EBAMCBPAwIAYD
+VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOG
+IWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQo
+MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwL2V4YW1wbGUub3JnLzAeBgNVHREE
+FzAVghNzZXJ2ZXIxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBBQUAA4GBAEUkgcrb
+LVd9hlZA0XY9LDKUURty98fUurFJOG310R/VPcy+WigtWVINbmeeYGhXWcB6OLb+
+EZgQC6w0eK90BKSQff4hehImEvOD6eTb37JrsqSYyXxBQkLg+bFNzdNrtSJJUHR9
+EkywhyrVtlrU+tOYVlrrvhSUDrhrleVO00KU
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key
index 6e41e50..6b19ac6 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 5E 7F 83 85 31 F1 CA DC 88 07 2C 58 95 FA 36 16 65 F6 BB 8D
+ localKeyID: 89 83 15 9C 9D EC 03 C2 1E A7 EA A5 D8 31 6A EA DE 25 18 47
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIhfu7ElRn7TUCAggA
-MBQGCCqGSIb3DQMHBAggde7b8jzc2ASCAWCNar4Td+ZM5Elbb16QeDTfzMoKoScb
-jQo/GS7f5h4An9vh/aTaKBoWDQ8gLcvbTUlpGxRznGt9mmOk9AOWsd03rTJ3TUud
-+Cm4GfyEslvF8zXSPgJOz4YMiMMNZF3sEGGxs+D6Dav7isMrAIE/Se4Uh3pBY3Fg
-kio9fZfJSWorb3XO6LY9wyg33sz0ZxfhLfhenpeuveQfGuwc9l/DtYuhorqa4xXv
-+T5W6HQ7g7nB/GMQF0rkm7BUSqawuLPK7ippBjpNg07iGOYNvQ5GKPahuBTbKyDc
-7LYzGNjZ+mNyL8vDNkwcdnUUqIbYsdMqmEZX+cu2wugXF1GshI9krcDHBXGcZH4G
-sogntcL8qR5KpPfBQCcp9An7TfLJkJtZOH6IYVZVy3/wb+OEou3UNckMe7PF8PWa
-T6/N9/zs49U6RxiYn+Vz/x0hQmRbLvLEsbotT1WStJq8LkcI0Zu9cJab
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQId2PB+j23uIICAggA
+MBQGCCqGSIb3DQMHBAiBLn9ObyWmEQSCAoC2oYcVj7YqFT83XhltFRkGo8MSsLYj
+EZYu5A2nMPrhQn+JwV9SOW9boiMBuOcYwr0pnuygiy2SJgxyoSJDXeA8DTM3EbAW
+UIDnX030QVZJAMfN+tvYJ97ojBiBHGaRSu+FPL4dtVTnI4IqsucBNOCe+VzeCM8s
+9SuVzO9zbsi7/2jVt2bGRKCg1kF7zv1F9iMEosR9Y0VLzJKEXoPizfzGyKAY+udn
+T6CIN9yJikjIIgiLK1cc4MudbTIfZ7wyWnlACDTkymAEUtWn/nIlRFCjKM4tZwj+
+34CoI7hQk81aLOmvIM5urF/7tMkvvgCOhbmg85KxAIIPn+h9LpGDntyKk1T8mCkB
+0SrNW+C9gKj3lJSE9wFjhyenV8H8i3lXQsBg11WT8R8/OANG83DPjocA6hkBggD3
+hVwslSs+W5U/adMS+GCMiqK8QtrhdeQBTrrXzPWGyHmyF5PqEmpgdMJmu3+kfLoU
+mRCXl5Hebuq25hamEO8KNbwCK7Vl9Hi4p8zk9+xMQCmSp8ekHw10E6xkKMUCtqYy
+4IfDj9i9VPjWJKvGAp1kHM2rLDqsZww/dX16Q94BuuMEljSD51iS7fTh5Ku7IxU0
+FlIzvOt/TqP8LJhA0515aPSdirDrl5Q2VC0TBB+bd0uwEBPjRGbNLHJ2kKuga2gG
+IxI10Fnj2WP2i7pprgxa7TpdH7R7Y78L7innTNmVgRC4acmVFdOas+GPrNrnVV1r
+PlhLb5dGmJG936W+2CD4aoxO/aHgD86j6+aw65it4wbHYs3BeWQikJBPTb2ombsj
+jj273JBN8q/NyEY9KAUmYa/iTnzfvTUhMc7/ZNtNtWZJbAhULF9XK9kt
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp
index 43bb173..d564c8e 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp
index 7521479..6ad80a0 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req
index 6ec207d..ad98315 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp
index 90cd6fa..d522c23 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12 b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12
index 585738e..9f8fcac 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12 and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem
index 81679f8..9c59821 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 5E 7F 83 85 31 F1 CA DC 88 07 2C 58 95 FA 36 16 65 F6 BB 8D
+ localKeyID: 89 83 15 9C 9D EC 03 C2 1E A7 EA A5 D8 31 6A EA DE 25 18 47
subject=/CN=server1.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAjCCAaygAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIIChzCCAfCgAwIBAgIBZTANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMloXDTM4MDEwMTEyMzQwMlowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
-Lm9yZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDFIpfEcK4d3IEq3F7B6AIpepZk
-mKln9pcCm0RbAxm77YlhHucDzyVu9rmW7XSW/c4Dv3clwzHLpaoF2KURKLZ7AgMB
-AAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmV4YW1wbGUu
-b3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRw
-Oi8vb3NjcC9leGFtcGxlLm9yZy8wHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-Lm9yZzANBgkqhkiG9w0BAQUFAANBACfk1MYCSbT2gbaT1Dv9FrMEybkFZtxUfz69
-Gnx/55Wfw936z2en+RImD3qF1qQxUwIMlWGm6SaitfmlQ5qVJ1A=
+MzQwNVoXDTM4MDEwMTEyMzQwNVowHjEcMBoGA1UEAxMTc2VydmVyMS5leGFtcGxl
+Lm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6K6Qdj7lER724C4uldT8
+RN4V6UGSUi4EZlbih2xcsOlYzK2Cb3kvOhRQFv2g3lEoqzKwi9woHpkFHoo8ort+
+07+yrxZlmKlOvCGMxspz0QyfLErFdEs4Pmqo+jhhhUrgXLW+mvYrLZuHHiqfv5/L
+rXgu6/ERq7/CIfZ0jygZy0MCAwEAAaOBvzCBvDAOBgNVHQ8BAf8EBAMCBPAwIAYD
+VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOG
+IWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQo
+MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwL2V4YW1wbGUub3JnLzAeBgNVHREE
+FzAVghNzZXJ2ZXIxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBBQUAA4GBAEUkgcrb
+LVd9hlZA0XY9LDKUURty98fUurFJOG310R/VPcy+WigtWVINbmeeYGhXWcB6OLb+
+EZgQC6w0eK90BKSQff4hehImEvOD6eTb37JrsqSYyXxBQkLg+bFNzdNrtSJJUHR9
+EkywhyrVtlrU+tOYVlrrvhSUDrhrleVO00KU
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key
index 1b83abc..c20c03b 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBPQIBAAJBAMUil8Rwrh3cgSrcXsHoAil6lmSYqWf2lwKbRFsDGbvtiWEe5wPP
-JW72uZbtdJb9zgO/dyXDMculqgXYpREotnsCAwEAAQJBAKDzsX4NkduHoV5hNmyT
-BNDg6dGQYyAi0QCrzI+SZHxt8ZYksM//or03aXE7xUUAeFmlSQYc9KfhADAB+mL8
-3YECIQDi4Q5nPCDr99odHTguDlTDi9vEEIiY2N7g8jsGAZH6KwIhAN5wME90eCX/
-oIzlAVqCbq9JuO8Zt3lxvqbasOGT3pzxAiEAwXcifhvDAxUGNF9vQa7Mzzca/vUO
-VjBQ1kcY18VNAqMCIQCxMe/aK67WnldYRcmZP1RLANB4cCUPcoPsyUOkvzXUEQIh
-AJEKAaavDZzn70+xnPw/8QPzHExNxIRtYrxBnc0Kv74r
+MIICXQIBAAKBgQDorpB2PuURHvbgLi6V1PxE3hXpQZJSLgRmVuKHbFyw6VjMrYJv
+eS86FFAW/aDeUSirMrCL3CgemQUeijyiu37Tv7KvFmWYqU68IYzGynPRDJ8sSsV0
+Szg+aqj6OGGFSuBctb6a9istm4ceKp+/n8uteC7r8RGrv8Ih9nSPKBnLQwIDAQAB
+AoGAFbbUvHQ6JFLjbyBgMJNjx3mCSfZYlVq+Bl7tXP372HauVsuKdKS2h5EFuF+K
+97RTO0bLuwGcrN5S3/q+leExgJvBX/z73yCwmED5hXxWU3CUXzO6VF/FmZZTlBHb
+NqZL8r/c85Ocv3gndCrbftDRH+kKlZXhJhsKlLwE4H/RAuECQQD1cAnMv8azLZz+
+JQI8gmuLMARvgAFan4QxX6r1YuLu3gR+s10bis7E0nk1qcxRFKN6Wci8/4DXYH2s
+ZsBs1KeXAkEA8rH/RCDgVj7idoso7zo83bIi/zRd7FQGPWxemuzdkPnDCwW9aW4u
+FDKJvI0RxEDNoE1o1bGPsUSvkM8qyfDPNQJBAKPuUk1UZiX1OF+zXlwGDEiqKLxE
+diMOWmAT8v71Lne3CK+Lo4uq2dIydkz2fYZGT65/24kI6whv5WDKPIo0Oz8CQDU2
+9kPX+ZivnTRk+wrJeEMcJjRTJS0Gl3+sXWoW+dYqDaxDC+8sK4peMnlXbUfc9blq
+f8wrbNhvuRdFdZpl5OkCQQCI28BvR6W9Wj/jDJNFpkAIB4UOw7wJkr2kp+y2eKa+
+jEy8UHinHbx7+461EftArZ2f6r47GuOwQtA2Ie+kuvfh
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
index 35a92fb..61e4342 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
@@ -3,45 +3,54 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority
subject=/O=example.org/CN=clica CA
issuer=/O=example.org/CN=clica CA
-----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxY7JyBAI+e4vb4bz0HcjtE+O
-x0nLBB19Kz04yNARj1z/ZvY2c+uvOR3muHROCgFUQxGobP3n2HaTS/cmv2SVPwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAJLhs/m5Jx4oV++aylcAvIHa0vHSK4eh3zX1HqWwqK9I0/nl
-LqwwPgtgHQOpe7nd2g2B9wPZ82i6LiqY76A+9hI=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjApMRQwEgYDVQQKEwtleGFtcGxlLm9yZzERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKVtsAGe7PATQiOvMyxM
+PL8bA1VwmS+auXRgcHWPi1Jgkd1QmS0+lZqqm5VQ1kym7vUvhggfdX5uljC6nFJ3
+41b/e0zbRB1lhyLDNxarSxPg9+Lkv/9U8r0emvwpm9PfEZnqGQKil4rKX3cdZy21
+196jOwq5X/L1S5RjYFzcVaqZAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAEHHENxfpDuyHeYT/wTW
+MaHwBbycWFoFIlIA/PBt7J3WFHiyV6IomjWMy1hMg9URN2mlGodQMYk64IDrFwZp
+9Cni9eVuWB/SlJRDi8c3WOHrkzqybuysT7DDbGQDLQUy2HuOCpyJQDikd9XlO775
+tCx603UJ6mmBZHv/vzgk35Zc
-----END CERTIFICATE-----
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 86 3E B2 BF BC 60 4F 3F C4 EA AA FE 97 44 A9 48 6B 4F C1 77
+ localKeyID: E9 6E D3 8F 67 3A 61 43 DD 9B 3E D1 A7 52 CD 8A B6 62 74 C9
subject=/CN=server2.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAzCCAa2gAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDNaFw0zODAxMDExMjM0MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
-ZS5vcmcwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1bNd+LEj7UV8Riahrn/3TL1n
-NwaIvqkqCFscP5ae3dB5rJ8vdfIc0hOzh782zpXxJxYa7S340zjxfgdUzMAeWQID
-AQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5vcmcvMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBs
-ZS5vcmcwDQYJKoZIhvcNAQEFBQADQQBCORy4CO4MMENsEtYwU7xE0Ck5i8VefJ6D
-txODMnRUzsthdbfjgXm3BfVPrhOuT0/bIKfyJtoSdCtN1SRPTJxO
+MjM0MDdaFw0zODAxMDExMjM0MDdaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
+ZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKjerGV/oI5wLbpVQ8RK
+ZrYtSE1fP4nHfP4ZqwEUw5fnSKOna2aT3lIRsbdGEP8sPydXrfFF5a/k1Hty36b1
+gCk7H/Y/WH7XI/95MyCrEoRMMPXEz/h7FiLkTtzVwBo2bdl9q8tgzmHh7rIYL/VV
+Q9CREEw9u+aFoPi4Eh/RDFrHAgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm9yZy8wHgYDVR0R
+BBcwFYITc2VydmVyMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQUFAAOBgQCr6YK6
+wi54xdkP3tHxcCh5vZnak9fN2DN9CiExTEbXZx8rTxfal0ynXMxJrvaEjwVd2ZQS
+yN+HzoC9zZVuCBxEWQ1HNaHi3eKFBLo+Vaj5CZVR0u5dyCKtaS52JtESqQUpliql
+zk8/wPMa46guDmzBS+11L4kxKVZH4xVR4GFjZQ==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db
index 2f8358e..8005637 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db and b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db
index df16257..cf52122 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db and b/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/secmod.db
index 92af259..b42fbb6 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/secmod.db and b/test/aux-fixed/exim-ca/example.org/server2.example.org/secmod.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
index 5bcc299..49ee2d8 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
@@ -1,29 +1,35 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 86 3E B2 BF BC 60 4F 3F C4 EA AA FE 97 44 A9 48 6B 4F C1 77
+ localKeyID: E9 6E D3 8F 67 3A 61 43 DD 9B 3E D1 A7 52 CD 8A B6 62 74 C9
subject=/CN=server2.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAzCCAa2gAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDNaFw0zODAxMDExMjM0MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
-ZS5vcmcwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1bNd+LEj7UV8Riahrn/3TL1n
-NwaIvqkqCFscP5ae3dB5rJ8vdfIc0hOzh782zpXxJxYa7S340zjxfgdUzMAeWQID
-AQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5vcmcvMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBs
-ZS5vcmcwDQYJKoZIhvcNAQEFBQADQQBCORy4CO4MMENsEtYwU7xE0Ck5i8VefJ6D
-txODMnRUzsthdbfjgXm3BfVPrhOuT0/bIKfyJtoSdCtN1SRPTJxO
+MjM0MDdaFw0zODAxMDExMjM0MDdaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
+ZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKjerGV/oI5wLbpVQ8RK
+ZrYtSE1fP4nHfP4ZqwEUw5fnSKOna2aT3lIRsbdGEP8sPydXrfFF5a/k1Hty36b1
+gCk7H/Y/WH7XI/95MyCrEoRMMPXEz/h7FiLkTtzVwBo2bdl9q8tgzmHh7rIYL/VV
+Q9CREEw9u+aFoPi4Eh/RDFrHAgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm9yZy8wHgYDVR0R
+BBcwFYITc2VydmVyMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQUFAAOBgQCr6YK6
+wi54xdkP3tHxcCh5vZnak9fN2DN9CiExTEbXZx8rTxfal0ynXMxJrvaEjwVd2ZQS
+yN+HzoC9zZVuCBxEWQ1HNaHi3eKFBLo+Vaj5CZVR0u5dyCKtaS52JtESqQUpliql
+zk8/wPMa46guDmzBS+11L4kxKVZH4xVR4GFjZQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAyWhcNMzgw
-MTAxMTIzNDAyWjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ2Y6E5WBXQE
-zFsWgxK4JXrpPWGEQZ+KNy3iXgmupAA6Yy0umCLu+eGCekkwZ0WfFhhd+Qy7P+qo
-F0mre7VDDHECAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EATmemAFFWLNA8natXhFyhrDYmTv8X
-PEJ3UVt0DmOMxmEBahIeDfplfTfj/NYvy/on7YCZO7F5PwVY2pNJqm8Tmw==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA1WhcNMzgw
+MTAxMTIzNDA1WjAzMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1xDr7
+fjHtnaD838GpZCO0qJign2PlyKNyH6rfggYAo/rVq1Z4a8NKfuddSAAK4eYXglNa
+fze7epYO6lJjVQolmPbKHoKWfrGftAUKXagxQB2gBoMYA5s/OuX+3jDLo5VrjjWp
+kEz/g4yu5STZUM7vm2620X6SSNuKl8GcMbrQ0wIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+cajzqqgDEEQwB0f1qj88VPoI/FUT8lIRHv8DMQsx65kEV65AIOdhVtCUhigFh4PG
+4jITjwHRBZ+1GFJ/QZs5Af6IeVtH0WOG9C7bX4Ddz6ViniqgEvZxNPjQboszJrUP
+wR0/0Y7gk2qcRtWIU21VYyXVq3+yfV61K80oUBPmm9A=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
index 6f62ee0..c461707 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
@@ -1,15 +1,21 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 86 3E B2 BF BC 60 4F 3F C4 EA AA FE 97 44 A9 48 6B 4F C1 77
+ localKeyID: E9 6E D3 8F 67 3A 61 43 DD 9B 3E D1 A7 52 CD 8A B6 62 74 C9
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIjfdds7UVEY0CAggA
-MBQGCCqGSIb3DQMHBAiY22+2lkjkEASCAWDm5MmTuUgMOkSWscoH1Qn/GVM2sawP
-TsknGm/HMV+bJlpGLCXwBrAKe6RDC+zlEmGVUSWJoxoPz1qQT9fcooyEFSCS8asN
-omSw+8wrxXTSB57b1OqpHoV8VlTT60/sdVV8l9B1Ef/vsdjKB0NDwqUwDVg4Xw32
-wV3Tv8pFRLg3CBCEDeykcJ+FkodSope9UL6E95Ukhae335bTmWsxbrR4IZCUhI2t
-/MOLyPnd6huPGlti2SH8PRRnei6TM/O8mH1uUzdSAqxoDA6wV+P6pIDI8GY1k61q
-53oeq9ocSJOQ+q3kIyBQlGgApME47hog3sVZ/WsU3r071g9VKhzlFUFPOOkbUR9+
-gl7MDV/r/6IjOAHEaLFBQrnRVKbs93sTtf8pNhIHJLJtTWjDV/nBbiHxsNFIWqGU
-ZlH0FU2DENHZqPiLxsfH1J9EmtTiHXgu/naD0m7RbmPm6ffIDPuYPVMw
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI8XR6jA/QQF0CAggA
+MBQGCCqGSIb3DQMHBAjthL6gpPbClwSCAoCKOuQQS58wkG/rqVTvlE2luhFqphag
+hEKR4y9xwJU4iSzVPtwp5yUcFqM/j9stE7LuK08C4XBCLETlCo5RNLh9gNtw+FT3
+kVCvKqVBJjgk+5Y2zmNhSY9t3fMaowqVGo8USX8/q494FXEC/wMfMOL1w9ZPakW7
+mZcnHRJtZ2x4wEJ9ue5GIr1eeS4qqcUJcOs7oTAXTaNq09GiHkrb9NDeSeKrRz7g
+57UDJcWSX3sXu2KxlFTB+Rw8L3kOCSQLzdGjb43vm7jzE3amd04ca2NGdZ4vM1iB
+b1cf+6jXgPcbIQZKYgy1A6gUPDZfgWXHGv4H/ioQIab1XxuqoMToOsStARi96n2m
+Hybdm8aNsDY7oS3CtBYeJ7eaZSNN8Z/WiUh6Y1S9YFdKEnTMhq+21V/WCuYHu3x5
+o5aDByXV144y+Xd1lJ+tveqgfjGB/mkezPoz+pUZ8BDAKcRZ5WEi6F1J1YR4XNgm
+KsI/MbA/oDCMOc6TSN9yF7UOQkr+UEZTXe4xBo7KSsAtDuiraCrTY9D6h1CdguIZ
+d43TVACWHNPRbQEXQUB1sZgxfWtl0I+RjPe00y9//K2sdGxBbA+2qsU9h5eABjz3
+Zoj1ZjQRk3Iku59qUqrkvja74deW/DvCzEbMncHJduRDpi0xuxuREkyFBEhZ/suw
+u5vE7AQ8juTI+VLdYKm2VD7Hz6cCVrHNwkAw9J89SzfeGZEd13XFAMHbRBTeJeaN
+MPdIIZ3KCuxk626YSoML7ooAMcbCzi5MjWSHkFdnUhXpyMNu329d0npoS38wNGNb
+n89gB2VcJ7I/68xVAWgF2OAvlF/fKmxN/sZg+imITDJQLZ41Dj395BZ9
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
index b15606a..da6112c 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
index 8fc3f99..acd7e3c 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
index f8731d0..2fea17e 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
index 8fc3f99..acd7e3c 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
index f2f2fe8..a7014cb 100644
Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12 and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12 differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
index ed55c33..83f6188 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
@@ -1,18 +1,21 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 86 3E B2 BF BC 60 4F 3F C4 EA AA FE 97 44 A9 48 6B 4F C1 77
+ localKeyID: E9 6E D3 8F 67 3A 61 43 DD 9B 3E D1 A7 52 CD 8A B6 62 74 C9
subject=/CN=server2.example.org
issuer=/O=example.org/CN=clica Signing Cert
-----BEGIN CERTIFICATE-----
-MIICAzCCAa2gAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICiDCCAfGgAwIBAgICAMkwDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDNaFw0zODAxMDExMjM0MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
-ZS5vcmcwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1bNd+LEj7UV8Riahrn/3TL1n
-NwaIvqkqCFscP5ae3dB5rJ8vdfIc0hOzh782zpXxJxYa7S340zjxfgdUzMAeWQID
-AQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-Lm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5vcmcvMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBs
-ZS5vcmcwDQYJKoZIhvcNAQEFBQADQQBCORy4CO4MMENsEtYwU7xE0Ck5i8VefJ6D
-txODMnRUzsthdbfjgXm3BfVPrhOuT0/bIKfyJtoSdCtN1SRPTJxO
+MjM0MDdaFw0zODAxMDExMjM0MDdaMB4xHDAaBgNVBAMTE3NlcnZlcjIuZXhhbXBs
+ZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKjerGV/oI5wLbpVQ8RK
+ZrYtSE1fP4nHfP4ZqwEUw5fnSKOna2aT3lIRsbdGEP8sPydXrfFF5a/k1Hty36b1
+gCk7H/Y/WH7XI/95MyCrEoRMMPXEz/h7FiLkTtzVwBo2bdl9q8tgzmHh7rIYL/VV
+Q9CREEw9u+aFoPi4Eh/RDFrHAgMBAAGjgb8wgbwwDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUub3JnL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLm9yZy8wHgYDVR0R
+BBcwFYITc2VydmVyMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQUFAAOBgQCr6YK6
+wi54xdkP3tHxcCh5vZnak9fN2DN9CiExTEbXZx8rTxfal0ynXMxJrvaEjwVd2ZQS
+yN+HzoC9zZVuCBxEWQ1HNaHi3eKFBLo+Vaj5CZVR0u5dyCKtaS52JtESqQUpliql
+zk8/wPMa46guDmzBS+11L4kxKVZH4xVR4GFjZQ==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
index 38b2718..9492ae8 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
@@ -1,9 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBANWzXfixI+1FfEYmoa5/90y9ZzcGiL6pKghbHD+Wnt3QeayfL3Xy
-HNITs4e/Ns6V8ScWGu0t+NM48X4HVMzAHlkCAwEAAQJATzDe2+/Y3m5ndR+PvriR
-DhEKFKwJNI4/k0UgHLhWOt/+y02ZfO5zhZaLvYG1BQbGKyhypdAGS8QP19xRVjI9
-uQIhAPs7Ql00hIvZvfRMmgh90otggbrWIrkW8Oh10BMFBdkTAiEA2cG+l36A5NAs
-PlA7sOlQyFs5F4XNXzEy76vPsGR/pGMCIBjo3UGkjWfYZQ8t8S/aWd/b58EArlyv
-u58w3zqjitrlAiEAsJeqlPkGVolsF+zBO6s61AEGv8jG0Ff50twmxgn6abkCIQDJ
-pUSYU/YF7bYj5QuHRyemhzDytTQcAB7A4IEWZsSL9A==
+MIICXQIBAAKBgQCo3qxlf6COcC26VUPESma2LUhNXz+Jx3z+GasBFMOX50ijp2tm
+k95SEbG3RhD/LD8nV63xReWv5NR7ct+m9YApOx/2P1h+1yP/eTMgqxKETDD1xM/4
+exYi5E7c1cAaNm3ZfavLYM5h4e6yGC/1VUPQkRBMPbvmhaD4uBIf0QxaxwIDAQAB
+AoGANoVF9bMh/DrdmKZErdAznye5izlwQySEB2n0GvJAP//tJOE9vK2K/sY1sW1O
+uYPok+QsBZTClmpz67Nn3/itOpwaBV4m0vOZprXeYRMxqEWpeS/QtS++FV5d889y
+qVzVX4wQTbi0cKaJzrSDgM2NnEalm92gii2/CDC+oX9thKkCQQDc5pdnkNG8bta6
+Bmf+SunYbFmPB5PYMefZRChUQ6Q8TG6yEeXGoPWWNEn03lUyYyYru1F99DEQrAqN
+c+rBXCNNAkEAw7OpAcLALdpV0iUG9bPsx/quj4JgfjdyALrNUNS2WWNdDszS2VHJ
+tiHWS1bifFsYnQla9/ZdSfeISNrwz5OEYwJAODVkqTGsbKo3cTZYF9iwECXh1Ac1
+k3l/aUVyjZ54l+9K63yqXxRt6T584xX/z8Zy3AXaApa0NW3RcZThUzpCsQJBAML7
+bZfjgbYtovQNEDIdYfydNu6k557Zfyxa8dVnGYdWCJGGYU1Ev8RHUksd9eoQmSVc
+/NWxEKFxjseH3AX05CECQQCJ9dyAgCWOMU/6zKxAnWsC8Ss1gP+A1lNZFlXdG4E4
+fk01cQIwOmG+ENPtTa7nQuHCvg7fLH6sWgJBlfZg+zpo
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/genall b/test/aux-fixed/exim-ca/genall
index 63a3618..90ebe11 100755
--- a/test/aux-fixed/exim-ca/genall
+++ b/test/aux-fixed/exim-ca/genall
@@ -7,7 +7,7 @@ echo hit return when ready
read junk
for tld in com org net
do
- clica -D example.$tld -p password -B 512 -I -N example.$tld -F -C http://crl.example.$tld/latest.crl -O http://oscp/example.$tld/
+ clica -D example.$tld -p password -B 1024 -I -N example.$tld -F -C http://crl.example.$tld/latest.crl -O http://oscp/example.$tld/
clica -D example.$tld -p password -s 101 -S server1.example.$tld
clica -D example.$tld -p password -s 102 -S revoked1.example.$tld
clica -D example.$tld -p password -s 103 -S expired1.example.$tld -m 1
@@ -58,7 +58,8 @@ done
# and loop again to generate unlocked keys and client cert bundles
for tld in com org net
do
- for server in server1 revoked1 expired1 server2 revoked2 expired2 do
+ for server in server1 revoked1 expired1 server2 revoked2 expired2
+ do
SDIR=example.$tld/$server.example.$tld
SPFX=$SDIR/$server.example.$tld
openssl rsa -in $SPFX.key -passin file:$SDIR/pwdfile -out $SPFX.unlocked.key
@@ -98,4 +99,7 @@ do
openssl crl -in $CADIR/crl.v2 -inform der -out $CADIR/crl.v2.pem
done
+find example.* -type d -print0 | xargs -0 chmod 755
+find example.* -type f -print0 | xargs -0 chmod 644
+
echo "CA, Certificate, CRL and OSCP Response generation complete"
