Testsuite: regen certificates suite with fixed Authority Identifier

19 files changed, 150 insertions, 137 deletions

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 e9e7eaac6..71a967ed7 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
@@ -1,45 +1,49 @@
 Bag Attributes
     friendlyName: Signing Cert rsa
-subject=/O=example.com/CN=clica Signing Cert rsa
-issuer=/O=example.com/CN=clica CA rsa
+subject=O = example.com, CN = clica Signing Cert rsa
+
+issuer=O = example.com, CN = clica CA rsa
+
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+ggEKAoIBAQC57Q8ofMidWz0dTi9jEkJD7PinEs2neEViI6iGaEp1HQhaMa/DsvPP
+4EqfvvNevEQu2SQAOqfTwF2WcEdJeMrmEDM6aTNiqMJbn4EeYvjYeBo4ZvCB31uv
+qYbP8Fw0k6YWlvKtZ5jMmHY/o+hF3AqfidXgtp44H7Qy3URq+bMtbhFAvhJAS9Z/
+DqUbmbzQEG1Aklo7PV1jA4Vj3IJuBpYYk8mCtTTx9EGXu9uiCgy7JeCTW4Js0CpC
+fth+x+lEiuW1EfJ5cJQN3oLM0BsXrlgwQmQltjdA8eyv1LzC9bawgzg8Uv1o7al4
+dwr2kvLYuwiW1LfC+x4pLTq7xErLd6dJAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
 BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
-subject=/O=example.com/CN=clica CA rsa
-issuer=/O=example.com/CN=clica CA rsa
+subject=O = example.com, CN = clica CA rsa
+
+issuer=O = example.com, CN = clica CA rsa
+
 -----BEGIN CERTIFICATE-----
 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
-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
+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
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert9.db
new file mode 100644
index 000000000..a167591d9
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert9.db
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 f451fa86a..76aee5c9b 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,46 +1,48 @@
 Bag Attributes
     friendlyName: expired2.example.com
-    localKeyID: E9 B1 CB 42 2B 3A A9 C8 05 16 4E 06 AE 40 E0 F9 7C C3 D3 06 
-subject=/CN=expired2.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: 54 E2 92 3A C4 2F 95 4E F4 AE 39 55 A5 25 DF 6D C0 9E 1C 91 
+subject=CN = expired2.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
 -----BEGIN CERTIFICATE-----
 MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDE1WhcNMTIxMjAxMTI0MDE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALv14myw
-eRdB1Dmm20HFfqBHjUS5e1xZtoYduT2Uk1vRAvm84LPwmabiIKZN1MbYnmvRh78P
-hpV+OeCU4bPF/r//c2ZD9/scOHKIk4Q08Hjo+JWEj5dwx3ekCt1PtzSQ8SOPqDUe
-QfQEKyNlcIJ3M1+iZLvCcEeRkYMrpel8ZJICPtcqbXbRIK564+8KDHT4pA6ycR1W
-a2p8a0alGRryjTiFesxC9yF7t6ZWhts6a47HgAYvhHLevqL+Z9KnGIV30GGiGA/J
-duRlA4YeGNYuNQujGfMJ4ilrGsxK/0c4KRiJ4tgX84/VK4yfJDLOoRizy47g3EHA
-IhrlR75uaxFSIm0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNDQ0WhcNMTIxMjAxMTIzNDQ0WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFGwb23
+cnqriHuuVXgmXOtaDIfbf3HPNQ+ooRDTBsoTpkSaZDy2OwkNDkPIYKKRkczL0HdV
+Pxwdw9As2v1rDMciLTUt1P5eRjNrj56OmT3MYgVcL6dgXaqWJ0Kxn1SEWZmPyVVq
+DaDDw/ncjam8FyUzaqU/K7mm5PXITskfnqYjzWD2xkO5t3DqYeDiIC9qQiI/yspY
+UYaOK3adJUXSDesfvULy5TShoIcrX6Xx+zlULFUmbVjtIVj1JPcz9sefHVGoCzwh
+J95Kj2dCiHb7U4vMmUDrN/xKz3rdkAISC3nl4EsH8p3dZaHM595wVJzwrPcvafcK
+1MboMS8gm4UGI9MCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
 BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
 Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
 KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAETLDvgZU2NtO
-V4eGjZ/PuFZ/nj+ic3vxf/5uKbPaAbB5mQknFKSebzkDSeBvBcD0qSyiPnaqgG1D
-HpVGU851LprcDKhfm/pfL6CwCkHh5X29nIxwFgP8hre47pn2hlMsQIW1VBq9Slb1
-qvFhdwZSEEZXX2AuGKjoeutGM4Tb/TddHw2vUAVAdGG8PsS13u7bTQclfYeyQpY3
-hbXQ0ybWUuSwWTu21Gyohjrg2XeeO9cqX9cx+ql96R/asecs8Q8BqgMzvH4nJLaq
-hse4w6EPwg4M5ChlriAjSJ8aSazyJZk2JS9/Xb6+ToA7XFHegkBSFXNJ65+ulWbO
-xmABBb/xyA==
+eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAq1Qnp4VkqPjh
+eV3hRE1BMCPCTVvfZn51X/to5Vz3qOTwxiQOwdM2dVNnExi8glpiN5U4nEUUPf8r
+bHAM39gWUI57bME+hlvkcmXU/XwpQPuL3AldCDUcIE2BrIeO1T/sAjLpaLEzFssN
+oP0L8TMUbKWxE6qdM1IOaZalGIAOGZ9cX6gTI6yJM45DSYv37by5rvcio1fhtut0
+BXdNEpfDi4P7RbC0iezyESyGaaULbqiue/L4TrseWkhv1auWY6KAhFvUWIBzLVfT
+KXZk3uIUK9BSoOPkLJpSx+qIODfBSo+n5FyMs8BRqP/I48SE73E8+vzGKdpL3Zvx
+pWgMRKINkg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 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

-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

+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

-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

+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

-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
+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
 -----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 27ca5e94c..fdf69ca9f 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,34 +1,34 @@
 Bag Attributes
     friendlyName: expired2.example.com
-    localKeyID: E9 B1 CB 42 2B 3A A9 C8 05 16 4E 06 AE 40 E0 F9 7C C3 D3 06 
+    localKeyID: 54 E2 92 3A C4 2F 95 4E F4 AE 39 55 A5 25 DF 6D C0 9E 1C 91 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyjVXLE4d3gsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGuLo+ZPK3+SBIIEyK2SW2qwEKwk
-r7tDMizqZkk7NlyUph3nEfyPKpWNp/R2YABGVq+Ib4dDTObmDyKl3W0uM1j1NHkp
-3xSwMK7z6cd6W/hH5twhhOfm6RGuSN0laqNRydLNo3s3eLZJHhgtHKpmpYX+NSah
-TrVQLaivKxDQHWBNfZSxDKwnuW+oqYOPbIbTjceaUF9viRkjVAKWsRE3/1GAqKrG
-tI70IvL8rHgeoxz+Crr/EUTyW42QYMGkCmhsSocs6uJZRoOelhXX5Xu77bbFFP2v
-Dat/ogn+qjlzbpzeKNYTPVX3/YRfm6B+eFL0PLRRwaPS2pvHEjf8PCzrOrdKuAAD
-q7BLtTi6HlOlLQf69ylrLSOx5UzU5wSqz5eYadZSNPYe/0xgq60IAf7qzLCfT2Oz
-qZvvqGWKBx+DIkc5qnwag6xvLovyvJ4vPVCAtClB/gw10dne52T/UEiGme+ymMK7
-ZuCelGiD/snR0ztB1LCkg2C5OGumuKDcqB4Vvnfqng+N647X4nXCzSuZUvOXAlBy
-rdSpRd0wplIHFQ2dGZ7uy1V+6/nZLSrpq2KvnUxMhP1SYdDnKVB+VEkSkxZcX1RN
-x9W0C6nErDvJ+U2DVnLffJjS/w0sCQsVY6idRLGsGZaTJZhjkWXcsuGutKcyacGv
-A5Gp+TsJOYXe+4vD3XS+IEv2FmBL7Z488t3DsxKEV/n863D56Ja6/rzB9ELPpwox
-i9o4Zv0+SMb3/rz4e8kdq6Cxtras/0DRG26sXLRO0/XRW7+8q2T+y4R0zFI+iUL8
-eWfwzqNggUUCKTUpZ9EXWXNEDcrE229JlvBv73jUuqaF1RyPwIgNE1orL8mxYm6Y
-nMe5MpMteKrNX8oo6YRUs8UyFrVH64utTxosrqTaLcHrVTssXlDDm6NISlz0pPB9
-ncaEhPg0X01xqSADHzXV96I6FpIoroXM6ugx5mdCEptJ6AvhDS6G3mjFGL47uSGV
-uQf6hEmXLhwCAVVPf42GATWDC+/6HLuL20rrOQaG3D0jdlht45f1SHlwzGxTMgqP
-qH6dz0chQ9Pgw3PHdJ0ajSU5pa4qx2YZh9A5ywz490mIXbZBdQYZxxDjOyti8mvn
-8vbuHfsGyzTJ6fLWAEoumXil0sBvG4vF6V2eHeIyIgD2u7ohWPq+hnigafSoHJyR
-qcpCVYmu7yxWjPRclDEUoNJhBsNu1dpEbKQe1AyQn9jDVVkS+oe42c0lnh/rbu+o
-Dq5bXmbXFwja8IKBbigcsIYYAg6UK1CVM83AE6KU55Vx8bDKqSIA5J0lXemOtX8j
-j7xcyG83mN4URXCOqPjD5JhMnggJ4JuyBSA6w6+BPv8mynyPfWjXKuQKdRIdkAfC
-H+sU9igx4DfFOgaSdtW1eMnd2++3CChggGAzgfptL4C2MMIlvJaKEjBEoK/T26fb
-uDxdZfps9rGU9zp4vNmVhzTpbqcm7F8knWUmBIl3p5Vw105aW2+9GNXkODLIUZ2X
-u4kerPDal6OLW9fzNN4tnJxl5WVw/MaN2kPBwoj7SPD6PNtCDyROZJ8XmGmzmFxa
-GPNXGnqdnqSpGMXV+/rpNisw8uTT7FHbIjINw3JV62CV7ZTa9Pp+d0fQRWLThMlf
-1RYoy2UDY8sTh5xZlTpjwg==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIdio+cbBMGGQCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCezcQUWnJkVBIIEyL8WBeOvqFRn
+jTHS4QjJOsDRzGx10za3s6fkHo++Rhl8bWfOQ1Mc4445PBpRa15ThJsfcepDU+eL
+ImEu8jGGV0phVMaC6+WT6J3KJYGUERcu/dnQQLiUpyW6wMn51nUaQPQIkDFWATcz
+qfgSwCb/ZfNwrBVkftHSGj0mM4de2qDOEvBcWi8KZBRHQeEn3VTBfb3GYPZcueDB
+l2YAkHPRMohE7cRXShJj9iQMq0omkJcKkWHixVikX10ITw+5X6OKvJ7owZweeSMU
+ahPr18bttecNkZLQ7xBjI4qYlHvA+oi8wc/6szrWVeMOcba8Hp/d6vh6e1lmAlYE
+S7CCtEeZEsXwTEWyJr83NMFElLGKpYs8C3UBuAEvKxnsiep/T8sHfi3Triadh3uG
+11FCB4YdmByrvqne3FbATxIu5/uct3/znarqLSSCD/gKMi4d00E9WDhS6e+nVrHw
+USSrj9KJMk6m62Egm5q4WZ44So/Sdm1LyPM8AvDZmEata1exsepGKo5WEAPmLzRJ
+n8huxrD0ccIyqqMZj0AYWWYxnjKYEF2G+NlDk6bVk4qt/vKkcg2rf9QN//3mCUha
+1W9NRd1hhtjTJzj80bMds5Ldg7Bf/nbhYL4zpu1neETu22iIC1n0z+XXbAOVr8eo
+fAc5L0OXQMzm0WFy26k1c/i14uk3iBI12gqWOBQ9uD7CXCPevkxEm9bR8PXATOSV
+WN5/ScBDRrd5nKKIFdq/xmp7D5/DdiKb5JKaYaEbVJETZhKbANFbkR291Q0tC4FN
+0JlpRa4qPq1MLELBCYvqouz3/K6oP/7l6eC7P4JLPSLAgksvlMrGvoMty2DyusyG
+xrApZ5HvsJofOSFRm5tZayDpSmwHb7EJFLBUxggixBQNuerS2Kpf4dG8ght3J6Wa
+dPP1Ys+EzeyhjnWRGDqRLJhOxhwJBzX4PSaAZ4Lxn3i1pzbmC8amUCyJ2uiwIA1k
+mKrvdkg5dBLUdfAmjqBul12gd25TEmbJwWSoqBPIL4P3O6wetD4XBTfr94cU0ZY/
+EN8tsHtEIH4NKcoJHQNihm8fGybJHaoeZtkDtvEYl33oyXnf2ci0DuoctackRHoX
+e6GRlbqFvSduWaeKN7Zg2+DcHG7zesrYdcmYZ3miV3ZcLdQmt2dOPEdshBg0VzBY
+12sV6X0/iUqUqu0hI6NVDZJtacqmITCjjhr4hl2zpfqtgMWicaaZm76CGjInejKC
+bXMXh3pEI2KGZSpPe+qncykF18zR+6IgUL7EyqU6kPSmDnU7lSfkEv5sdD65QFtO
+pzq9veU0lJLrjLUjZ56cCORz8LN7d4wabB932nP6XJVAqm3msY5cl7m+TR+KWVmT
+f7ATTzBUe3NKVs1CR0mVzXadRN3bGoqeQvUEI2amZc0XZXNsGOhxFVlQ5A7FpSa7
+pPrmPmtjBy/jUOJDOtO0UdKshvHbCQdjNulr7Xyd4OUr1kajt5onV80uoOjbmD+A
+CRDkQwciN7GQPvTvEK3Xzt18LJibyjiXeosOf0afD/YkUDiVEMienkxnLyr11wK8
+BcfJCMs5ftAX2+WpH2nq2TWefDVbJ2dHbYwMJdDrXpSTFfer3V/CJ75waTwuFBZh
+0aDDJp5OA5G1ZBSY9BUR2Q==
 -----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 81fb0a46a..3a76074dc 100644
--- 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
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 39a847706..b1c6ae3de 100644
--- 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
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 546281fff..353e96a47 100644
--- 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
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 39a847706..b1c6ae3de 100644
--- 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
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
index 840a75279..377a976fb 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
index 824234072..0d1b61e93 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
index 824234072..0d1b61e93 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
index 07780be1e..9e057c1b8 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
index 9a95ac59c..edf7400db 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
index 9a95ac59c..edf7400db 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
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 663a89a50..8e0aa6dde 100644
--- 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
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 c05c66b7e..97ca6df92 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,27 +1,29 @@
 Bag Attributes
     friendlyName: expired2.example.com
-    localKeyID: E9 B1 CB 42 2B 3A A9 C8 05 16 4E 06 AE 40 E0 F9 7C C3 D3 06 
-subject=/CN=expired2.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: 54 E2 92 3A C4 2F 95 4E F4 AE 39 55 A5 25 DF 6D C0 9E 1C 91 
+subject=CN = expired2.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
 -----BEGIN CERTIFICATE-----
 MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDE1WhcNMTIxMjAxMTI0MDE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALv14myw
-eRdB1Dmm20HFfqBHjUS5e1xZtoYduT2Uk1vRAvm84LPwmabiIKZN1MbYnmvRh78P
-hpV+OeCU4bPF/r//c2ZD9/scOHKIk4Q08Hjo+JWEj5dwx3ekCt1PtzSQ8SOPqDUe
-QfQEKyNlcIJ3M1+iZLvCcEeRkYMrpel8ZJICPtcqbXbRIK564+8KDHT4pA6ycR1W
-a2p8a0alGRryjTiFesxC9yF7t6ZWhts6a47HgAYvhHLevqL+Z9KnGIV30GGiGA/J
-duRlA4YeGNYuNQujGfMJ4ilrGsxK/0c4KRiJ4tgX84/VK4yfJDLOoRizy47g3EHA
-IhrlR75uaxFSIm0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNDQ0WhcNMTIxMjAxMTIzNDQ0WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFGwb23
+cnqriHuuVXgmXOtaDIfbf3HPNQ+ooRDTBsoTpkSaZDy2OwkNDkPIYKKRkczL0HdV
+Pxwdw9As2v1rDMciLTUt1P5eRjNrj56OmT3MYgVcL6dgXaqWJ0Kxn1SEWZmPyVVq
+DaDDw/ncjam8FyUzaqU/K7mm5PXITskfnqYjzWD2xkO5t3DqYeDiIC9qQiI/yspY
+UYaOK3adJUXSDesfvULy5TShoIcrX6Xx+zlULFUmbVjtIVj1JPcz9sefHVGoCzwh
+J95Kj2dCiHb7U4vMmUDrN/xKz3rdkAISC3nl4EsH8p3dZaHM595wVJzwrPcvafcK
+1MboMS8gm4UGI9MCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
 BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
 Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
 KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAETLDvgZU2NtO
-V4eGjZ/PuFZ/nj+ic3vxf/5uKbPaAbB5mQknFKSebzkDSeBvBcD0qSyiPnaqgG1D
-HpVGU851LprcDKhfm/pfL6CwCkHh5X29nIxwFgP8hre47pn2hlMsQIW1VBq9Slb1
-qvFhdwZSEEZXX2AuGKjoeutGM4Tb/TddHw2vUAVAdGG8PsS13u7bTQclfYeyQpY3
-hbXQ0ybWUuSwWTu21Gyohjrg2XeeO9cqX9cx+ql96R/asecs8Q8BqgMzvH4nJLaq
-hse4w6EPwg4M5ChlriAjSJ8aSazyJZk2JS9/Xb6+ToA7XFHegkBSFXNJ65+ulWbO
-xmABBb/xyA==
+eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAq1Qnp4VkqPjh
+eV3hRE1BMCPCTVvfZn51X/to5Vz3qOTwxiQOwdM2dVNnExi8glpiN5U4nEUUPf8r
+bHAM39gWUI57bME+hlvkcmXU/XwpQPuL3AldCDUcIE2BrIeO1T/sAjLpaLEzFssN
+oP0L8TMUbKWxE6qdM1IOaZalGIAOGZ9cX6gTI6yJM45DSYv37by5rvcio1fhtut0
+BXdNEpfDi4P7RbC0iezyESyGaaULbqiue/L4TrseWkhv1auWY6KAhFvUWIBzLVfT
+KXZk3uIUK9BSoOPkLJpSx+qIODfBSo+n5FyMs8BRqP/I48SE73E8+vzGKdpL3Zvx
+pWgMRKINkg==
 -----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 fa920e65e..98b8e9d16 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,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key4.db
new file mode 100644
index 000000000..7a673e266
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key4.db
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/pkcs11.txt b/test/aux-fixed/exim-ca/example.com/expired2.example.com/pkcs11.txt
new file mode 100644
index 000000000..dd47e838f
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='expired2.example.com' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+