Testsuite: regen certificates suite with fixed Authority Identifier

author Jeremy Harris <jgh146exb@wizmail.org>

Tue, 1 Jun 2021 20:20:38 +0000 (21:20 +0100)

committer Jeremy Harris <jgh146exb@wizmail.org>

Fri, 4 Jun 2021 18:44:02 +0000 (19:44 +0100)
author Jeremy Harris <jgh146exb@wizmail.org>
Tue, 1 Jun 2021 20:20:38 +0000 (21:20 +0100)
committer Jeremy Harris <jgh146exb@wizmail.org>
Fri, 4 Jun 2021 18:44:02 +0000 (19:44 +0100)
diff --git a/.gitignore b/.gitignore

index 8d30d0cdafe59a2ab5e6d04bd97c5982d0e735df..3fd0b2440ac90c2219b0e06d5bbad327706b9496 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
  exim-*
+!/test/aux-fixed/exim-ca
  *~
  *.bak
  .*.swp
diff --git a/test/aux-fixed/exim-ca/README.regenerate b/test/aux-fixed/exim-ca/README.regenerate

index 69046773ba5ba890c8b9db1e60e5316541886e12..a4d7ff9c0adaa12d28efeda3db2150ad9bbec7e7 100755 (executable)
--- a/test/aux-fixed/exim-ca/README.regenerate
+++ b/test/aux-fixed/exim-ca/README.regenerate
@@ -1,4 +1,4 @@
  WARNING for Exim Testsuite:
  
  If you change these certificates you will also need to update the TLSA records in dnszone-src/db.test.ex
-and dnszones-src/db.example.com
+and dnszones-src/db.example.com  (the commands are next to each one).
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 4bcdc4411e1497791a1408cf1a44f7631db007d1..df1f69a4da6937c636e733d5c9e639f1b3ffd19a 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
@@ -1,18 +1,18 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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
+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
  -----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 b05c00a39df3184b44a93ef09f0b9c0b2a5511c4..c12d6959cebcb761cdde6f4ae573e4daf7ce6f98 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
@@ -1,19 +1,19 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG\r
-ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN\r
-jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw\r
-mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ\r
-4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu\r
-fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB\r
+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\r
-CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9\r
-It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB\r
-HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO\r
-a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas\r
-k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn\r
-ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
+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
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/cert9.db b/test/aux-fixed/exim-ca/example.com/BLANK/cert9.db

new file mode 100644 (file)

index 0000000..ea6334a

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/BLANK/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/key4.db b/test/aux-fixed/exim-ca/example.com/BLANK/key4.db

new file mode 100644 (file)

index 0000000..2bc4f86

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/BLANK/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/pkcs11.txt b/test/aux-fixed/exim-ca/example.com/BLANK/pkcs11.txt

new file mode 100644 (file)

index 0000000..89eef7a
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='BLANK' 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})
+
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.key b/test/aux-fixed/exim-ca/example.com/CA/CA.key

new file mode 100644 (file)

index 0000000..96dbbc4
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.key
@@ -0,0 +1,32 @@
+Bag Attributes
+    friendlyName: Certificate Authority rsa
+    localKeyID: E0 FD DA A1 2E AC 21 F8 AB 0D 64 49 1B 47 06 78 F3 C9 61 02 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC9W7YptGduYtgI
+lGo+QteHB1BRh78O854V8pnOYWDCOwNwXXv9Y+d/yKhMsgNnpofLF2rvl3vAm4Ec
+F6p2d6RQ7JO9xMYM9b1cKoJb8jXutiyku1GV7syGS3+iVko7TrQKMYC3FSYyFEc3
+j2ML5eF+RyJLUV/j46VKvB7a4CKGUebDckD/EveqHq0/7yWaGmFoCWCSbZsZQhwR
+DHp0RoabBnjD+kpmCKeGuu7PDTxoAwlubT4yhXntvHZW4Ejuh5Rh0BRqQjwTCb8B
+q9aIPrvfcwNNc40KxZpa2+7Wp4ekhHnKoUL0T9EC2H9crkQOrZSgEs/hvaX7+f6U
+1Pp3qmq1AgMBAAECggEAAuZxcQyUC/cEF4eMZAU6j1UfmAwT80rsaColzGkl5fuo
+5xLrd/tMe6LLXxdX4YHFsSjb6K0BhnbrQI6lO/jDocCp1514qhCmdI+rHPTl+hC8
+uM4spvb4F3N3Ejmvm95t9/z/m249vkUcvR9bVT6RWFGHFy+5IACn0q/0agZGSRfX
+xFaiRQTbXb+kqMCGgP0MSIQHnffuUFYvHFihKEoPMGtYTce2RT5KkJFLOFjmsf7K
+Qx0z77a+LCWNLUzHVld/KlCrj0UERTPhaKZrbQU5qmoho4uO6Ubg9unDjYZc4Wl7
+RYb5w7CvqBpI4nMaGNd/Z+pfF9zCfcCLYg0EwmLFCQKBgQDvA+uBogGgzAbnYz/Q
+Vunqabn+BNvKWhWWM0wR2b0e97KBykwZC98HNGybsryOtArnZJPWwCrpioY8htt6
+3Zhpm3N1vbjbC89rzTmQG5EIkjt2Rjb/ll4K8E6y0AlIB/61Ng6fdLpO6DTrPiDZ
+x4bsDZs9FtM55tlDEGOBN7qC6QKBgQDK0HLDRxoKQ4i3iuV27LdgmNm2VdSQmUzt
+R1eVtAyxq3sOmUUaF0L9AIlr4Krz/nIbDJmRCkARiBKAPhTWc62uztH4yJJsQgpp
+g20XUg07A05dGUtbMH0tZ7Ae0EBqpMhqOptdABMoAAB7QbAnJu13LfkRzvhcAwK6
++6MxGMfR7QKBgFADHOyZgjgE9O6yz+L7pXS+je/WSomT3JQaegWjwWbDfrNqOE1O
+JwwvZYg9rleLN/c8OS1zySnDIKrUblbUJbh8vIsWxvI1IuuwmOt//u5Cnbs7SCAJ
+g1PgHEhJ0kGVw5OAFCcXGWNe4pA5jR+6ZpVQ/L3XjUBd4i9MJjNUp5A5AoGBALX0
+z5Fs/+rHbiglH/tTIq4yU9jnJj7YmpCimeyATYc07sFJNxrSVdJAogm71gPzexHT
+ew8KIDLaXqbZi75eqCsV+IF4CQ3BLjA9rijm/2G7dJnH8LiORy/uP69VbQWAcyID
+FJIaWBVh8wyiAVUO8qsi/rtAccezF8cDrgSFU/h9AoGAJyGWsK2b3KyrUa3O9wzY
+OV0EPcsmJRi3a4AF7OkASeH38kgZaDIOUDAUQi+thUSrYmRhjKMDOoheUtETyOLZ
+SgAPXXKhgQhNlyArnt/i4GZO8fLV06sC5Wsek83KhaFlfsOpcyIFP49K7e7ATkLx
+9yifYP2to0HWNTkbQIM60tA=
+-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.com/CA/CA.ocsp.signernocert.good.resp.pem

deleted file mode 100644 (file)

index 6b5d621..0000000
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.ocsp.signernocert.good.resp.pem
+++ /dev/null
@@ -1,31 +0,0 @@
-OCSP Response Information:
-       Response Status: Successful
-       Response Type: Basic OCSP Response
-       Version: 1
-       Responder ID: CN=clica CA rsa,O=example.com
-       Produced At: Thu Sep 26 12:14:05 UTC 2019
-       Responses:
-               Certificate ID:
-                       Hash Algorithm: SHA256
-                       Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109
-                       Issuer Key Hash: 208f9d28c7c0bc914144dfa8c0be3d5b3bfcebb622c8a8dc27e865fc06ca0e12
-                       Serial Number: 41
-               Certificate Status: good
-               This Update: Thu Sep 26 12:14:05 UTC 2019
-               Next Update: Tue Sep 25 12:14:05 UTC 2029
-       Extensions:
-       Signature Algorithm: RSA-SHA256
-
------BEGIN OCSP RESPONSE-----
-MIIB+goBAKCCAfMwggHvBgkrBgEFBQcwAQEEggHgMIIB3DCBxaEvMC0xFDASBgNV
-BAoTC2V4YW1wbGUuY29tMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkwOTI2
-MTIxNDA1WjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIL+nJ1pWbv1L4t+C29nRKQ1H
-AYb2/yrNjBZlnzQqtWEJBCAgj50ox8C8kUFE36jAvj1bO/zrtiLIqNwn6GX8BsoO
-EgIBQYAAGA8yMDE5MDkyNjEyMTQwNVqgERgPMjAyOTA5MjUxMjE0MDVaMA0GCSqG
-SIb3DQEBCwUAA4IBAQAIVtY+mV3cbK0Z/itrRAJKrQGjWz4nUKK2t84KN/K/NxJd
-oDvgN9sp4qp8P0RDE/fwqDLTNp35/7vHPaSB5Bi+L6U2aUwz46LJsX0/q6DuprE+
-e6Z8rOrfycACBY18h8X3foCJwP3/Igon1B7ERbJHYKut77eXJh8EEpxQDxYaDdoj
-d0aFylyMjNH5Cm1nSkksC0islm5sk+ggEZjOnvM6y6ZzlPHl1nyI6TOWrTSoqm69
-mK2Gf9V59oHJPSM3OaVWL5OoUIZ57RrtDdxs3H3HO8QNPCSJY80Dk2uwpZICzYP3
-ko2KEu5rKChZ74PB59D6wAuUTEYdzF08s9waWL1m
------END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.p12 b/test/aux-fixed/exim-ca/example.com/CA/CA.p12

new file mode 100644 (file)

index 0000000..9efc535

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/CA/CA.p12 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 4bcdc4411e1497791a1408cf1a44f7631db007d1..df1f69a4da6937c636e733d5c9e639f1b3ffd19a 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
@@ -1,18 +1,18 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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
+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
  -----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 907c70aff90f9cf766c6bacda119e407798c02c9..083c3876100fc25be91d60db7ed3a814c23c09b6 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
@@ -1,32 +1,32 @@
  Bag Attributes
      friendlyName: OCSP Signer rsa
-    localKeyID: 09 0B BA 2D BD 4C 9B 96 8E E2 10 9A D0 D5 02 3E 1D 9C 37 61 
+    localKeyID: 41 0F 0F 37 CD E7 AA 9A 1E B8 01 41 92 68 58 9A 1D D0 FE 51 
  Key Attributes: <No Attributes>
  -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0nIMLp5VJDUf3
-OgseYbk1BEvTzLzQR87+8UTgDThnkwSOhIwg3THdQSk10l9gqBrCWXVLJHtcTBsv
-4giVe7UgMxJMBTN41wV6Djb4cWVcIVDSSoahr0aVhWvKMOdBI3Gk8nDzoQHD/+n0
-scvMoipb4tuJFaknfNdv4uG6C4+aAxBoLXTbt6kGCR1ezrV9uA8VFcRnG5xVJBqD
-0vBCmw5inC8vMlzm+A6G/hqTMWUFJcE/EPgruNG/mbzDrUxN9sJLktGbsDtMrvAu
-8LU83NKeo/Camh6sI/Hk17xrJnHrmwn+bfReZvBqDR3SUf6I4IeZslwyEpkFY5J1
-r3QQe7K9AgMBAAECggEAObJmCqsWfafIfaoFM0d0qwMcViTpjH/kGH1qy0ht5GiK
-5Bxjx3viGhRe3dq+rVoGcl+xoLee0PVfGgTTSS2jxw2Jos9migvmq/8ugF95Sd06
-vHMiXzRnEAz3SjglKCHyhAcPHkUpEzwFuS2zNUP41DG8gCZzSzIOgKeyBIT88u3O
-RWIe6OBa/wdYukzyPGpwbTm5mb9wUcDhkjPzK5ZzLrMlu1+o5h5QgU/H1SsM8BH4
-Xx6222SuXhKHzqUjHtJbYBAoXsaYYZ6LvfcE8Iu/RUwUEOANvhqLiXdyI6L3kGms
-jyRHiYV3dAQ9CyXE2li7Jxzh5Sq3T9Be5tiEIjg94QKBgQDX4Q7swLhCPwszT/8J
-TTS4qcuLFpouOrnzqYaGvkQCkUyJfxeQHZt00QyoyO/m5G/p3VFHqY7xt7S5zIxD
-Or226F+1J1e9vSGEIHQa4TY+i6i1mRyczPIL9MbfBjScAaFbSakULjGBSZpFLp8p
-uJ9fwsk5whkjqx/E3KojZAsqWwKBgQDWLYJ0A+uxISev7nXqGBkkPZSuRFzqz8MI
-AEihFeEWg9tIYkUz0frLmr7CPKwXxJNOBska6ba3mMIEaxXctp3GMqMDnukt7lrh
-Y0O7n27SeMXmn2wcphA6NhHlktvJWfdfKrtnNaAlWdMwGYojKt3+qIrrb7jwYbQF
-RJuIfxgyxwKBgQC36FQFn1yZmwmYqiKzsuEiHAx5rkSk84SsrpQbQAXCRjP0wp+5
-N2/TAbCOLbgqdBtfGRsAONO82mqNClPHhkhOhQHb2utlibT+0YL3zzqd5+5O3mRA
-tFvTkbDGGIxDBySGF2eB+KRV5vUU0NXo/g5PzyoMGW2/NC45UF9lDPpyFwKBgBJd
-zLYOMAP8h966YDo23tEQxtM64YzxTBQ/kfreWXMI06EdbDnJY+xZ1MnrUganwMoM
-Iuq/5/9OhjTCyhknP9hjNz90PSLHMdvqG0DXpzU9Ths8yJScWP/k6xv4wAhAQspS
-a8ep/ZW2YjnZttLVNjxET8Voyz8x4bIh9AR8gaK5AoGAQM78ICTF1lRP0Ah/jG6c
-Uq4M6V3jf9XauuKeJXFgQt63jLWvZlN+VsGcbDiLQ4yz+FnzqfKQ6Snw7gnVDK1e
-hUeYpON/6CTfz7bXlvGhqGfcR3oi0m+GYbBz0qwIAIoJ5GgBCYlx9Xdus/EyVTi6
-eOP+T4tyVF6xSMrBEdw0zqA=
+MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQCYc73g+O7W5mvf
+yUZWHtHmHrRePwKVco27NhMxomWL6BMNKqTaX7WjLPEijFOiMkp+JSc/XX05bmGT
+xc70vwcq58VKIUBLW0XygI++aSqaKIXdh/iC5lqH9rqegs8qGdOavBPRqb/88qF0
+2Gq6rjEzhYXKzMPo2IuBWXoyj1UXfEVd5RaaSeYnzZoOxwa0/96F5FAs0nub33DD
+zpqPjIb+RqbDZRfSaQrDmPIni3G4+1Lb7h7xNrLDArjbFd4Qb2msWLcsZbbtVE7x
+zgYpe5juR9TM8oVIwyVVrZTga6CDp/yyTAMm4xkARytPv/yiM9i+DFU2/32GaKv2
+tmv4APa/AgMBAAECgf92NUiFqH+JIiGC5A4luMAILsasTS8zsh8zijpXwhP653fe
+PbKVoKC2ZaKTpzsyCMy6AxTrjRIL9gqzCi3umDB2lD/luuKfi6Yw4n6Spfjij4k8
+vLF0zihkRGtvfP4lJuFsmWjEqVq0R23pq+UV2vtLd7zGAv/lDAMfyMF3cqwICKFQ
+DYFAgXGXt26D6eVnaV8N/S49zU84DqHLUA3o9nDslMF4PVIq1zDTXVTAug4/45UW
+tHJWuJnlYYetQLst1+S1BAp57Bh9ws91WiANm+5B22kCeAoSGQsOfQs2p78yme7p
+Nf22OZ5zvUI9UvII1s4vjUYlO4g9g0m6/NhDU00CgYEAygMSq8+Yr61aqb85SE/1
+VAQ6pX01Yz4VJjBJyAdpH9OYF9FVBUpEw0EVj2fjAgzopHsxiPr3NOopV+ftsBi2
+m1o0uqkVbdla/AJpiNpBBSQT6HcV59a/0IG3D8/T4UCEjZyKUCm+iIksLhu6bhht
+g9GV9hy1ZgcTMKMapcR3ldsCgYEAwTH2Hk7evml6ACH4QYgcPdCDUWbFAmo20OTW
+6XVqhujhRLlSwrEz8D4W2eRWyfrQetHbfgv0xKDFe/VfHAACOUx0RWPDnk7WwjV4
+Xx/ahHxzi8gnWlTRiDc6GR3gqiwewFGKXp1tpilDV4HwrvZilqo6dCC6tYRvPRvM
+CjsOIe0CgYAzH/f3t4BC5bKORzDuFh5WdwOIolmCllGv6oShtQ5r2ZciX/4Oaq9g
+YvZb5sTS3gV6qxrsOeeaYrC36KCE8pw0UO4LV4Nu25VlNg8TbXkLHghTyt+mXvkI
+geucetJ6rWNem4F9rDLmRyEBQk86UcBVnhM/yCA4hA3dP0odLc2+BQKBgEMHZI7r
+aljCG7QEFTAXW0UPHSCW+W93DoG3g+EH/efE0LOZYN9vv8dwo1kB4iK9xKt4OCEp
+YMj/xsTVQyRh1GOw5P5WOL6qN9S13IeUc6pXy3cKAK1UlEYgcyXXueUQ3bJ4F/vv
+vuVRl626xZjOnzIK6bD00hK8WiPniwlZp/OZAoGBAJ7jRwLGJ5heCiOcaE8M0NO6
+mkiMojy2+Qm8KUdDTTnEC/P0Ch9Wa0rUd1jUHJsPDn5TJ21goP5VTLSrzwP6sbPQ
+w8j+ftsIO0vpC5MKFk/Y3q9nSTtecTRvy0RdNY9eE0EvNcRiIJuFp+5JES2flTR4
+DoWXoLPrDw2RfjFiKbnz
  -----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 e1bd3c153a0e18b6b0d9e2a7c7a9f0aff57ab18a..ca8cbb8aa25f31e6949f45646636574ca5e534ff 100644 (file)

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 cc150ff49dcefb748778e4611eafeb29bdfcf85b..057aac1497bbd67bc5519deb885c7e3d77a75650 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
@@ -1,19 +1,19 @@
  -----BEGIN CERTIFICATE-----
  MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt\r
  cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx\r
-MDExMjM5NDJaFw0zODAxMDExMjM5NDJaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t\r
+MDExMjM0MDdaFw0zODAxMDExMjM0MDdaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t\r
  MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB\r
-AQUAA4IBDwAwggEKAoIBAQC0nIMLp5VJDUf3OgseYbk1BEvTzLzQR87+8UTgDThn\r
-kwSOhIwg3THdQSk10l9gqBrCWXVLJHtcTBsv4giVe7UgMxJMBTN41wV6Djb4cWVc\r
-IVDSSoahr0aVhWvKMOdBI3Gk8nDzoQHD/+n0scvMoipb4tuJFaknfNdv4uG6C4+a\r
-AxBoLXTbt6kGCR1ezrV9uA8VFcRnG5xVJBqD0vBCmw5inC8vMlzm+A6G/hqTMWUF\r
-JcE/EPgruNG/mbzDrUxN9sJLktGbsDtMrvAu8LU83NKeo/Camh6sI/Hk17xrJnHr\r
-mwn+bfReZvBqDR3SUf6I4IeZslwyEpkFY5J1r3QQe7K9AgMBAAGjKjAoMA4GA1Ud\r
+AQUAA4IBDwAwggEKAoIBAQCYc73g+O7W5mvfyUZWHtHmHrRePwKVco27NhMxomWL\r
+6BMNKqTaX7WjLPEijFOiMkp+JSc/XX05bmGTxc70vwcq58VKIUBLW0XygI++aSqa\r
+KIXdh/iC5lqH9rqegs8qGdOavBPRqb/88qF02Gq6rjEzhYXKzMPo2IuBWXoyj1UX\r
+fEVd5RaaSeYnzZoOxwa0/96F5FAs0nub33DDzpqPjIb+RqbDZRfSaQrDmPIni3G4\r
++1Lb7h7xNrLDArjbFd4Qb2msWLcsZbbtVE7xzgYpe5juR9TM8oVIwyVVrZTga6CD\r
+p/yyTAMm4xkARytPv/yiM9i+DFU2/32GaKv2tmv4APa/AgMBAAGjKjAoMA4GA1Ud\r
  DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF\r
-AAOCAQEAp0aou8td2RIK8QWBXCFvKT5ygfieI8eIhxNPOK9imXl2g0r3sex+C7+C\r
-diQJDLpPXiq/5leIhSOYnZWB1RvOeUA3/LkgXPoMxC4pUaPW7NellErsyRhaYV69\r
-HU8GLwDwoGDEpe+zaaeAGo+0whAC8RsFrFt+0eiWRXNZ4yVPioEQKgMaf2i0iTKj\r
-E9xxaX9SkcKJqbkme1JYuMXk7W+SQhau1jlt4tzMPIQwanOkDabHKZnLeGqPCjZ5\r
-nGunctzpTz40dGeyce3oldhvsGN1U3njJGa1Op7psE9jyUudSLpjwj/ODHF1iu2J\r
-zu5NJRrFisf2SVRuoqMRsAdDlVpyOA==
+AAOCAQEAkXBmqmjnzBmGqWT2z2mzFhMYhUG5HJ2E+tg1YS4xG9LcFm5NzVGya5C+\r
+oDEolYuqhWXP5izOay+MellApXXtnnkfQtENOxkt1855oju2XKjKvYM3e+poxfxP\r
+FeQaa9V9dldsvsFe41HlmdJezZxSR0/+RjF2M/grBNjAhuuwm8agN7OlAnlyn4zL\r
+0xyt0bjerOZE3bdb7pvyC2R6RAJSn02nqfruJjNtIl7UW/zlKCxxq40PXOnJD9KW\r
+ZraIu9yuYXInEleC9bDjgdG48jIQijRT8kltCdcif3MlG8+bi5FXXlc5FodllUho\r
+RHB8jbLbfd3EVMI/KhY8TTtBDBmrqA==
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.key b/test/aux-fixed/exim-ca/example.com/CA/Signer.key

index 24f2fb932a2f6eaf9c33b9c242e262fec781f39e..0b0e58910327a4f50628b01d3441b64e57cfe6f3 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
@@ -1,32 +1,32 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-    localKeyID: 07 B7 38 F3 C4 3C 32 C2 2B 5E 4E 96 D3 88 97 FD 7A 36 21 B1 
+    localKeyID: E0 93 4C BA C9 FB CE 3E B0 3F 33 F6 7B DD 68 8E CF 8C D8 EC 
  Key Attributes: <No Attributes>
  -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDUBcwir+Go3sYN
-uf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYGouIlEOivWbzfXGBn+MqBaVGX
-N9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLNjeUk/jexvJdEEBndCQwtJ5Ft
-11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDwmu6Kctz8tMZlHgJtGRpi35nG
-JcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ4h/XzDCpk4iaBLC/UzT/rE+g
-Q6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLufT3Mbvtm5ANjFDV8I0vuYiA4
-bRPYPmX/AgMBAAECggEAUMaEpxJq3nNA8SnTg7erxRf0R+VaCgduxEE2rsiRe8QZ
-AENwne4yJoUXsxdmDqgZlN8Uu4fFXthJBVt5t5Z1EPnvFcOKRkFcvoW8cuKbOfvV
-4t4lNzf4zGcqzZUsksJOvteDgvpXcTyJ41cOc0kEyu01i42w28O52yQK6c5bP0P6
-lBp3dqnngHvLmLDTW/iW3tsQW8C5U4zdYmvcISeFDizvqEX87K+8Gr0yRA7FYWZ8
-2GSDwyUxQoHh2wDe3e3SiceqRAZlsGryGz6Gy+dPc7L3UDxGFPBOTna9bUaH6bDo
-gRpXFK0uIm5AXLRRcDptR0z9ZdJVZNqvyFIONZ1DgQKBgQDuxBU0rTBMNzcpYiCG
-tkSweQYFu4PTaEo6ebUrVOphxzNrXGR8TdqDlnus/IHaqd4mUhO20GbJAIV5cyGY
-R0GUXJA2hxhPc7eEfgnP/sYhq5/lrxsJRKvwXLWlS/C4oSY/DCxfS3RynWEbh1vK
-TU9UVw7LhvOhgetBbxuVNmfEJwKBgQDjU41Euw/fTSo6kkCo/TsmfzoJF3JyU4Ri
-LUHwroIgXd7JhJz61heT+6W2/YbVb8BPndGjxnikA/ZR8H21WefPFjl1wKF+Cxak
-2LmlYdJZZt+ypm9tV344Eg9QKWRnW7yY96ZsrXrWCsT+pAMNSliVw/rd1IsCMuHI
-htv3yVa+aQKBgEtsCT7Qjnck4fnik1+6Z8xPDoX1C9lWEkyScZY0hq1IXYfGcb+K
-YEI84OhuAx7tlc0JFE0lW7KWxZLtuWj+6UpSSwPOfPFsHkZuAe+ADVpJeoL1Y1b0
-KFQPFRoX+Px5ezljQQkBLtGdwTUO9wHalfqQXY4RHRihj4zl6hKiUvj1AoGAESuA
-Yg6W9lDHvcDKLXli/FdjtMgWltgECb5NWrZzkapFZ4cirDd7dGvvalDf3EMijWDo
-MqyM9CZwdmPpusbdoWCWWnSAPhrsTOspqnom/yWsA7xacjHHkMica3uU39Gn/w3F
-fjPkMUKC+pC8wkY5RqaUzih9j170esbk2mRUrvECgYALHelGwtZ1ZvyMUrz8YrIi
-+4TUCFliHJTY4RuDvdffuUzzCv8VyNZBX9OXqa6up2rM3uexa2zMm9FsbK4AulSV
-mQZCSgC2Xe4qvZuMkSwRmrLdncg275SyJ0qwaLbh+wWLJSgFvXAavfrTW3TXCApr
-JY0PeptsNBe83qir5JWk2Q==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC57Q8ofMidWz0d
+Ti9jEkJD7PinEs2neEViI6iGaEp1HQhaMa/DsvPP4EqfvvNevEQu2SQAOqfTwF2W
+cEdJeMrmEDM6aTNiqMJbn4EeYvjYeBo4ZvCB31uvqYbP8Fw0k6YWlvKtZ5jMmHY/
+o+hF3AqfidXgtp44H7Qy3URq+bMtbhFAvhJAS9Z/DqUbmbzQEG1Aklo7PV1jA4Vj
+3IJuBpYYk8mCtTTx9EGXu9uiCgy7JeCTW4Js0CpCfth+x+lEiuW1EfJ5cJQN3oLM
+0BsXrlgwQmQltjdA8eyv1LzC9bawgzg8Uv1o7al4dwr2kvLYuwiW1LfC+x4pLTq7
+xErLd6dJAgMBAAECggEADr1jGWD8KBJ0x8McKWDoETnDFD6+wFc9++vrBz3TIlH7
+CKh+AFgqcVldHSk+oszu5F5pVt3Pko9idAPieOoLPt47q3at4NVTdD9S1ZF/3Cx4
+Wq6ZhFhMbOKWGhvaeX4XmZydsF7hS54OKNkyF8C8NF3xb2tW44jq6KnnS8pQOMqJ
+lwr8rt59V9tUg9Wc9Vgzsh/9GFMmSuPgJ/PHv1gpwyFka6e7z87J8eURSGiBvull
+79jSTiKax7VLOpwWtDQqSdMlds5TzEzsY9udwGo5kUafjXm6uvZeAUH7thMNkjKh
+Htk2pe+UYQdOc2rCfVq2GNT1wI0Sl+hq2lOEp6UsQQKBgQDglsz3Iuum1TeMBi7F
+VNMgcpUDFSGFssrIF/pT2hDF7IHPl0v1n51HH/k4miO7ThlWn5e0tp5k1x3OMjSh
+CWJxVvKRbJMXS2DBwaCF/HI9OeGNx6/rlKXihyrsHXzJzn7OhPJSmbGaUxvvrqNX
+EubpKT/aMD8wt6l6wujQrxXkCQKBgQDT7fborez+6PSf4NHQcQBcUMFSeilJvtW7
+FNylv7/H6rpGfHxPqNUKjveHKZZtii+4dZJ2VfB9WX1WgNy0+pyYgmPgvdfCrtuP
+GtEyNAOCyP05OiWMdnTG8HArBWeZVeuWtYgr4Hy1EJdAICgg2fcCiK9AuH3M6ZJx
+3qnGSjz5QQKBgQDQFciIPhmadLjHir7w5FvNF3zK41ww1OwfImA0KroZt7y6SxL8
+28tMJ+qwL9hlZcICSVG1BPKSueEKt+edQOWt34JVjQRns9ZNDwqcub5azfMWeuqa
+2hosXVI+fD+vdxx0WidusqokM1aR5vu95Gx/oVFg5gzWJYTokghFucMNiQKBgARr
+p0XNMu9SPqADGX1GjiJe0Nl+kNPn9h9T3RJcAI0T+VS1Dga/V8pDlygrluasBjjL
+wwVS35RNxI6EW5Yu0AtiVOEANLrr2MqQXaK1cQlOVfHWo6fdZKwtoblUAIgzQZnA
+KZn4scE5Gl6NDSk6Qqu73CP2dTFMAfD8GwB21fTBAoGBANa36fKLHi08gyZ9BA7p
+ZTQwEh1zLbPmrEhrSsGmDttLObtbigrMsLOxYo1YUFBaHz7sA7vJmSjzjd5ilJED
+pvm96Y8T7PMmIEj2jjXqluwawCjOGjFgP0zdBcnh1IOEF4p2FRxjRH9ij4a+30c5
+K9/XH/4OkbhtznJhK/YCOP8t
  -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.req b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.req

new file mode 100644 (file)

index 0000000..ae5c18a

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp

new file mode 100644 (file)

index 0000000..ec73e86

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp.pem

deleted file mode 100644 (file)

index 5a44d61..0000000
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp.pem
+++ /dev/null
@@ -1,31 +0,0 @@
-OCSP Response Information:
-       Response Status: Successful
-       Response Type: Basic OCSP Response
-       Version: 1
-       Responder ID: CN=clica CA rsa,O=example.com
-       Produced At: Wed Sep 25 16:52:00 UTC 2019
-       Responses:
-               Certificate ID:
-                       Hash Algorithm: SHA256
-                       Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109
-                       Issuer Key Hash: 208f9d28c7c0bc914144dfa8c0be3d5b3bfcebb622c8a8dc27e865fc06ca0e12
-                       Serial Number: 42
-               Certificate Status: good
-               This Update: Wed Sep 25 16:52:00 UTC 2019
-               Next Update: Mon Sep 24 16:52:00 UTC 2029
-       Extensions:
-       Signature Algorithm: RSA-SHA256
-
------BEGIN OCSP RESPONSE-----
-MIIB+goBAKCCAfMwggHvBgkrBgEFBQcwAQEEggHgMIIB3DCBxaEvMC0xFDASBgNV
-BAoTC2V4YW1wbGUuY29tMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkwOTI1
-MTY1MjAwWjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIL+nJ1pWbv1L4t+C29nRKQ1H
-AYb2/yrNjBZlnzQqtWEJBCAgj50ox8C8kUFE36jAvj1bO/zrtiLIqNwn6GX8BsoO
-EgIBQoAAGA8yMDE5MDkyNTE2NTIwMFqgERgPMjAyOTA5MjQxNjUyMDBaMA0GCSqG
-SIb3DQEBCwUAA4IBAQAD/6WpB4+oK4S81aIp48J0CPqqPkd2tMBaAHZQ+0FG2A9c
-8VPPjWfVhTYikeILbVukABNpcP5G3bWOiTrYK0bp2f+Wf3NQyiP+VXj0pGmnX4lI
-Jwwg0ZvejHddoU192DTYu+fjj80YVOv09VHoehLsnsYPe16nW+2Ul2eDJ5IQv1qo
-5PUjRqc1X8W0ixAR34zXnkO+tDbpkGtUo/WcGt0zVxmoqXwvWsEG65PN/OYS2rEu
-q5TkTweFZllPdNfRJAXHBlZf1ndA9XpTzp4U/RGlWHP4Mp92BH9Ry50admEvObCe
-ayhmuSWTc/8mrunDn+qidRFYccHtDTeoAy2XRnGA
------END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp

new file mode 100644 (file)

index 0000000..f5b98be

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp.pem b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp.pem

index dfbed044e7ab791eb8f53a3181eade9eb9c155e2..c20a0ef7d90dfd10e05b0f6012a920175578228c 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp.pem
@@ -3,31 +3,31 @@ OCSP Response Information:
         Response Type: Basic OCSP Response
         Version: 1
         Responder ID: CN=clica CA rsa,O=example.com
-       Produced At: Thu Sep 26 07:51:09 UTC 2019
+       Produced At: Thu Nov 01 12:34:56 UTC 2012
         Responses:
                 Certificate ID:
                         Hash Algorithm: SHA256
                         Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109
-                       Issuer Key Hash: 208f9d28c7c0bc914144dfa8c0be3d5b3bfcebb622c8a8dc27e865fc06ca0e12
+                       Issuer Key Hash: 899186e0e346f52860fce4c9eb4479546af1688e44e6b7d6ccbffcc19a3e1380
                         Serial Number: 42
                 Certificate Status: revoked
                 Revocation time: Mon Feb 01 14:27:09 UTC 2010
-               This Update: Thu Sep 26 07:51:09 UTC 2019
-               Next Update: Tue Sep 25 07:51:09 UTC 2029
+               This Update: Thu Nov 01 12:34:56 UTC 2012
+               Next Update: Tue Nov 01 12:34:56 UTC 2022
         Extensions:
         Signature Algorithm: RSA-SHA256
  
  -----BEGIN OCSP RESPONSE-----
  MIICEQoBAKCCAgowggIGBgkrBgEFBQcwAQEEggH3MIIB8zCB3KEvMC0xFDASBgNV
-BAoTC2V4YW1wbGUuY29tMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkwOTI2
-MDc1MTA5WjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCC/pydaVm79S+LfgtvZ0SkN
-RwGG9v8qzYwWZZ80KrVhCQQgII+dKMfAvJFBRN+owL49Wzv867YiyKjcJ+hl/AbK
-DhICAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTkwOTI2MDc1MTA5WqAR
-GA8yMDI5MDkyNTA3NTEwOVowDQYJKoZIhvcNAQELBQADggEBABxA6J6zKoEXgmgG
-/I1hZc08x4T8WibqkGhS/1hcq66STgqYY1m3GmaOHQiwHhxsZzAUfOp1wChNgRCI
-x2pFp5rsQCZPvSL244SaTRqSK6eFONnic+s7nND3b/DZuelx3Zq1y/vrg+WaNxxt
-HWC1sRk2c/jAMqdHbH5obXzWB88qN8dh9Xwi8VXYCFlKjlURa6q6z5b5jhPI1BDW
-oLK66ZIzSxryPGu/70EWUAAMub5NAMhGi0Vf1eoIl87PMKQRaGTkwgKe3KgqU+o9
-Oa15HFRL0iFaVBxdYEQyy/MW6iSA+1KiyqSpWEZxCvisKjUTVopx/BiVb9sEpvwE
-yRNnGe8=
+BAoTC2V4YW1wbGUuY29tMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTIxMTAx
+MTIzNDU2WjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCC/pydaVm79S+LfgtvZ0SkN
+RwGG9v8qzYwWZZ80KrVhCQQgiZGG4ONG9Shg/OTJ60R5VGrxaI5E5rfWzL/8wZo+
+E4ACAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTIxMTAxMTIzNDU2WqAR
+GA8yMDIyMTEwMTEyMzQ1NlowDQYJKoZIhvcNAQELBQADggEBAKks8sNmlDX3FJVZ
+f47EBbPa0WJO1LH64ediLF1Hx5XZDf0hCt/K80NncXg2e2XjXiuCscDtFlFsLmOp
+sPbJAsRAjPwJPvDdSFSJOzp9se9dOHH62hLHU62DMtPMc3uHTCh+TCFGWu5sVp9Y
+U7Y0jv92tTl83/PS4amRpu7NJcfxrxDCc5Mw5jVsma/JJGKdPOH30JC/g5DPEVV5
+OzX0hl2mQkSlMYnn3RgWBHEcYsiF58i8zQsDMQWQq6q/PrarjGwUu+byf1+zNR67
+y6XK7igE0Ledrmi07teGFyC27AdvvxLDQrAFKTFY62biTICnKa0REWutottrZcSW
+1pdkUGc=
  -----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12

index 19833e51f1f30ba364f23185905cf459f6ac4da3..30eddc1dd6897c6a2c8e7794e07e1eb725fc6d95 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12 and b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12 differ
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 b05c00a39df3184b44a93ef09f0b9c0b2a5511c4..c12d6959cebcb761cdde6f4ae573e4daf7ce6f98 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
@@ -1,19 +1,19 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 f2f3dc5c50b318ef40e746d6f662440ba95dc7f5..973016b1c8dd6bfbe23a8f25b240bf671f52e9ba 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
@@ -1,18 +1,18 @@
  ; Config::Simple 4.59
-; Thu Nov  1 12:39:33 2012
+; Thu Nov  1 12:34:03 2012
  
  [CA]
-subject=clica CA
  name=Certificate Authority rsa
-bits=2048
  org=example.com
+bits=2048
+subject=clica CA
  
  [CLICA]
-crl_url=http://crl.example.com/latest.crl
-signer=Signing Cert rsa
-ocsp_signer=OCSP Signer rsa
  sighash=SHA256
-ocsp_url=http://oscp.example.com/
+ocsp_signer=OCSP Signer rsa
  level=1
+crl_url=http://crl.example.com/latest.crl
+ocsp_url=http://oscp.example.com/
+signer=Signing Cert rsa
  
  
diff --git a/test/aux-fixed/exim-ca/example.com/CA/cert9.db b/test/aux-fixed/exim-ca/example.com/CA/cert9.db

new file mode 100644 (file)

index 0000000..046baf8

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/CA/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer

index 6df5b85b81787776cc59f9e7ca7cffb3b2fde401..514c91d36ba0e37f2576319a5014cbed1831ab9f 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer and b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt

index ab7d7b073f1311e92c7d7af5aaabf263cdfb9437..7baa9aea2a813fdfec9f680e0168dbbe3040a496 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt
@@ -1 +1 @@
-update=20181127215819Z 
+update=20210604172341Z 
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem

index 45f0b174c4e3e07baa5d48061cd41b1c0867f63d..444ad0ad10930469234ba775b58f60f41d3494f4 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem
@@ -1,10 +1,10 @@
  -----BEGIN X509 CRL-----
  MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUuY29t
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTgxMTI3MjE1ODE5WjANBgkqhkiG
-9w0BAQsFAAOCAQEAK1oXdm1jYcygKcMU617940ScEHk/MefQs7CBcuoVa052Alcg
-Fn3mTzwm6pE/j1rHOskBJ/5Vi5YCNg9u7Eme3E8NYtD43mLFeQko5Re2J4oshqo6
-HMVRhWppXXnf31ayZOTzQYx/cZNWwDkXsUyX1R3SYOi+zsTuC+PcKPDx25g/akG0
-+14+6/WfXtj3828Ih0SBLjiSvCenstTW2SfLInTZliZCwAYvfg390XfJloNgvHT6
-46jr8KZtmgw342s6+iMx+B6FORlzuEzJCGt3O+fBtLiMDw7nhrNS/t5EiIrih0ky
-QWEvF7oZn7hYfgG+NmNiCQzvi1Ll4bB1RIJaoA==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjEwNjA0MTcyMzQxWjANBgkqhkiG
+9w0BAQsFAAOCAQEARA4DztoJeTbIvVuoKdqp0ggjP6AJwf6DS9eXR9ty2KUbyoLW
+cNKnnM+Sa1BPxWzkob6s7dHogYIFTUcBxVl1Mb7ZloSSyiBs/NE39yr/3duMVPrK
+TjuhTw8GcnQm2md5o9U3VgTBnxmZ9BqY9Tl1hR9AN2sxXvTfcCJ+W4JNnsS7ogwt
+4d7A5hLNM/DOgHhlU9OHC+CI206a6W/Ix0iuJFpnBGs9kWUvrDFX/svT9RzwBt7u
+6Kc2ZtPi2P8jSJrGIWZHweUJzJwJYjUX78dslB5WbOE+oROIet57faPXSAX3oEOi
+B3MgjUYmIXwt7KnjW+KMSo/3SRIeIdw+h+JBiQ==
  -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem

index 68c7a5c0f4b5acde9adfcc90f6a5ba268b865a63..3dc53e2eff13948cc6160765b9f0544459064dd3 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem
@@ -1,21 +1,21 @@
  -----BEGIN X509 CRL-----
  MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUuY29t
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTgxMTI3MjE1ODE5WjANBgkqhkiG
-9w0BAQsFAAOCAQEAK1oXdm1jYcygKcMU617940ScEHk/MefQs7CBcuoVa052Alcg
-Fn3mTzwm6pE/j1rHOskBJ/5Vi5YCNg9u7Eme3E8NYtD43mLFeQko5Re2J4oshqo6
-HMVRhWppXXnf31ayZOTzQYx/cZNWwDkXsUyX1R3SYOi+zsTuC+PcKPDx25g/akG0
-+14+6/WfXtj3828Ih0SBLjiSvCenstTW2SfLInTZliZCwAYvfg390XfJloNgvHT6
-46jr8KZtmgw342s6+iMx+B6FORlzuEzJCGt3O+fBtLiMDw7nhrNS/t5EiIrih0ky
-QWEvF7oZn7hYfgG+NmNiCQzvi1Ll4bB1RIJaoA==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjEwNjA0MTcyMzQxWjANBgkqhkiG
+9w0BAQsFAAOCAQEARA4DztoJeTbIvVuoKdqp0ggjP6AJwf6DS9eXR9ty2KUbyoLW
+cNKnnM+Sa1BPxWzkob6s7dHogYIFTUcBxVl1Mb7ZloSSyiBs/NE39yr/3duMVPrK
+TjuhTw8GcnQm2md5o9U3VgTBnxmZ9BqY9Tl1hR9AN2sxXvTfcCJ+W4JNnsS7ogwt
+4d7A5hLNM/DOgHhlU9OHC+CI206a6W/Ix0iuJFpnBGs9kWUvrDFX/svT9RzwBt7u
+6Kc2ZtPi2P8jSJrGIWZHweUJzJwJYjUX78dslB5WbOE+oROIet57faPXSAX3oEOi
+B3MgjUYmIXwt7KnjW+KMSo/3SRIeIdw+h+JBiQ==
  -----END X509 CRL-----
  -----BEGIN X509 CRL-----
  MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
-bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxODExMjcyMTU4
-MTlaMC0wFAIBZhgPMjAxODExMjcyMTU4MTlaMBUCAgDKGA8yMDE4MTEyNzIxNTgx
-OVowDQYJKoZIhvcNAQELBQADggEBAI9CHrhtdgLf6nx74935GhYVqJNGaEV3WeB4
-9PtBGrIKSM09GDp70tTOnhVjeYS3ZqYzO6mBfvop4OqfaBZhtlr1bXljH3/lcsG+
-EaYVz6aXKYq6aDTC8SJBlInAw/0H88iv4qUfyzEh07ExvXfG2ai7nhj0zul4lKmO
-Qf9BstZw8E6ul5UiGOT6MDbE4nLkZcti5d/RU6gy+BI0pnhnJ77ClYkSuGIypXQN
-PaqsuX2IXkdSnVKOUhNfk8qxDl14h+l33rbjuunY7PXF+xMwRz2Lv55h5cbZAKdi
-K35gQrr6vF4dxesWMcyOpmQXvJK+myum1NgqO7baRBeR23yr3b8=
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMTA2MDQxNzIz
+NDFaMC0wFAIBZhgPMjAyMTA2MDQxNzIzNDFaMBUCAgDKGA8yMDIxMDYwNDE3MjM0
+MVowDQYJKoZIhvcNAQELBQADggEBAEsPWY7+mRn7tzK//Tuz8aXGaK6I9zrizECI
+yH5XhmsMizOE0n+p0d0NJ/Ft7ixi7/pCrBKIO8lpQULu54osYBPWOGC5iG+9823Z
+9f+v/swAY7CWMXAkRVW7UsAlsq/ubuRThvMfRfjkqJjdKF1TJg36aUI2npU164Jp
+X+0K+iNzxeRc5XLceQ0/W5nUEG2tvy2N2eZBYcYiKBjlcqxe2r3OdD4vMfOTQv/F
+oaHusQXTZMUJZBb7/R5FIWJtWqV5X8x4hjjlRYYmzECnb75c+DLVQJqidaWX7PGb
+7whnELf0vw02/dShkwPTARvrN9yQImQht/QRFjldbZCTin52nm0=
  -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty b/test/aux-fixed/exim-ca/example.com/CA/crl.empty

deleted file mode 100644 (file)

index bdadfda..0000000

Binary files a/test/aux-fixed/exim-ca/example.com/CA/crl.empty and /dev/null 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

deleted file mode 100644 (file)

index ebd4a95..0000000
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
+++ /dev/null
@@ -1 +0,0 @@
-update=20181127215817Z 
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

deleted file mode 100644 (file)

index e40964b..0000000
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN X509 CRL-----
-MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUuY29t
-MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE4MTEyNzIxNTgx
-N1owDQYJKoZIhvcNAQELBQADggEBACl2t544o+zEeRdORRiobbl64ZqQKYSq6Q9o
-nqIqs/xT0MmljhUot2wEHQcAR9v1LFDkoFFGuQGINxvRvQTPPvLi1SRqHF/yVgJ5
-zROZR6N2kI6q8HgKQ/+tvJv14M6G10aqBksb3A7KhhlUXGFVSsd2pQl9FRHWVv1r
-r5h7ZZu0gmfPW1SJBFYuEk4vnhZiHlrGxg/dyS1jzYy/YvTGXCdMwQy1APR7guvf
-LlEdt7GVn/pZOytf8j/+OmtRlkR3k5K3IBXWpFehGH073hXFAJWW6juqDBfJ0Rwh
-QPqGP67GSL3S1+aA4msLZ0uVAOzFUdyw3X9haGVXhX9UNA6o2Wg=
------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 6f7decb7f4895a96f261ef218cfea13368542916..731d9cc2fe9ba399a610227a7fed4891d7071318 100644 (file)

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 e47bb50ebd280b4c19877e838b01e842647686bf..16a6076481bd307895a66e2352674cfc666fd0ba 100644 (file)
--- 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=20181127215819Z 
-addcert 102 20181127215819Z
-addcert 202 20181127215819Z
+update=20210604172341Z 
+addcert 102 20210604172341Z
+addcert 202 20210604172341Z
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 c774dd7d5e191a92e541facb42597600a537b76f..43daec0f9fd4c08d510c44e48db80145c0ecd4f5 100644 (file)
--- 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,11 +1,11 @@
  -----BEGIN X509 CRL-----
  MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
-bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxODExMjcyMTU4
-MTlaMC0wFAIBZhgPMjAxODExMjcyMTU4MTlaMBUCAgDKGA8yMDE4MTEyNzIxNTgx
-OVowDQYJKoZIhvcNAQELBQADggEBAI9CHrhtdgLf6nx74935GhYVqJNGaEV3WeB4
-9PtBGrIKSM09GDp70tTOnhVjeYS3ZqYzO6mBfvop4OqfaBZhtlr1bXljH3/lcsG+
-EaYVz6aXKYq6aDTC8SJBlInAw/0H88iv4qUfyzEh07ExvXfG2ai7nhj0zul4lKmO
-Qf9BstZw8E6ul5UiGOT6MDbE4nLkZcti5d/RU6gy+BI0pnhnJ77ClYkSuGIypXQN
-PaqsuX2IXkdSnVKOUhNfk8qxDl14h+l33rbjuunY7PXF+xMwRz2Lv55h5cbZAKdi
-K35gQrr6vF4dxesWMcyOpmQXvJK+myum1NgqO7baRBeR23yr3b8=
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMTA2MDQxNzIz
+NDFaMC0wFAIBZhgPMjAyMTA2MDQxNzIzNDFaMBUCAgDKGA8yMDIxMDYwNDE3MjM0
+MVowDQYJKoZIhvcNAQELBQADggEBAEsPWY7+mRn7tzK//Tuz8aXGaK6I9zrizECI
+yH5XhmsMizOE0n+p0d0NJ/Ft7ixi7/pCrBKIO8lpQULu54osYBPWOGC5iG+9823Z
+9f+v/swAY7CWMXAkRVW7UsAlsq/ubuRThvMfRfjkqJjdKF1TJg36aUI2npU164Jp
+X+0K+iNzxeRc5XLceQ0/W5nUEG2tvy2N2eZBYcYiKBjlcqxe2r3OdD4vMfOTQv/F
+oaHusQXTZMUJZBb7/R5FIWJtWqV5X8x4hjjlRYYmzECnb75c+DLVQJqidaWX7PGb
+7whnELf0vw02/dShkwPTARvrN9yQImQht/QRFjldbZCTin52nm0=
  -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/key4.db b/test/aux-fixed/exim-ca/example.com/CA/key4.db

new file mode 100644 (file)

index 0000000..6e5c031

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/CA/key4.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 a5c8243cf8a5cdeeee87056e08d98aab4f22ed7c..df71aac43e446480d5dd2f43f99e5d9577a651f5 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.com/CA/noise.file
@@ -4,11 +4,11 @@ cpu family    : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 3164.675
+microcode      : 0xe2
+cpu MHz                : 3336.606
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 0
  cpu cores      : 4
  apicid         : 0
@@ -17,9 +17,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -31,11 +32,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 3247.036
+microcode      : 0xe2
+cpu MHz                : 3350.869
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 1
  cpu cores      : 4
  apicid         : 2
@@ -44,9 +45,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -58,11 +60,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 3201.327
+microcode      : 0xe2
+cpu MHz                : 2700.000
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 2
  cpu cores      : 4
  apicid         : 4
@@ -71,9 +73,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -85,11 +88,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 3216.241
+microcode      : 0xe2
+cpu MHz                : 2700.000
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 3
  cpu cores      : 4
  apicid         : 6
@@ -98,201 +101,94 @@ fpu               : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
  power management:
  
-processor      : 4
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 3153.150
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 0
-cpu cores      : 4
-apicid         : 1
-initial apicid : 1
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 5
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 3215.404
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 1
-cpu cores      : 4
-apicid         : 3
-initial apicid : 3
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 6
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 3107.617
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 2
-cpu cores      : 4
-apicid         : 5
-initial apicid : 5
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 7
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 3152.578
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 3
-cpu cores      : 4
-apicid         : 7
-initial apicid : 7
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-            CPU0       CPU1       CPU2       CPU3       CPU4       CPU5       CPU6       CPU7       
-   0:         23          0          0          0          0          0          0          0  IR-IO-APIC    2-edge      timer
-   1:          0          0          0          0          0      20896          0          0  IR-IO-APIC    1-edge      i8042
-   8:          0          0          0          0          0          0          1          0  IR-IO-APIC    8-edge      rtc0
-   9:          0      17259          0          0          0          0          0          0  IR-IO-APIC    9-fasteoi   acpi
-  12:          0          0          0          0     975537          0          0          0  IR-IO-APIC   12-edge      i8042
-  16:          0          0          0          0          0          1          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
- 120:          0          0          0          0          0          0          0          0  DMAR-MSI    0-edge      dmar0
- 121:          0          0          0          0          0          0          0          0  DMAR-MSI    1-edge      dmar1
- 122:          0          0      30204     286555          0          0          0          0  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
- 123:          0          0          0         54          0          0          0          0  IR-PCI-MSI 327680-edge      xhci_hcd
- 124:          0          0          0          0          0          0          0        459  IR-PCI-MSI 2097152-edge      rtsx_pci
- 125:          0        168          0          0          0          0          0      60676  IR-PCI-MSI 520192-edge      enp0s31f6
- 126:          0          0       3771          0          0          0     457557          0  IR-PCI-MSI 32768-edge      i915
- 127:          0          0          0         18          0          0          0          0  IR-PCI-MSI 1048576-edge      nvkm
- 128:          0          0          0          0         52          0          0          0  IR-PCI-MSI 360448-edge      mei_me
- 129:          0          0          0          0          0          0         45          0  IR-PCI-MSI 1572864-edge      iwlwifi
- 130:          0          0          0          0          0          0          0        636  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
- NMI:         16         14         15         17         17         14         15         14   Non-maskable interrupts
- LOC:     912103     935689     937695     989339    1036579     900977     963828     944405   Local timer interrupts
- SPU:          0          0          0          0          0          0          0          0   Spurious interrupts
- PMI:         16         14         15         17         17         14         15         14   Performance monitoring interrupts
- IWI:          0          0          0          0          3          0          1          0   IRQ work interrupts
- RTR:          4          0          0          0          0          0          0          0   APIC ICR read retries
- RES:     243892      93357      40221      24354      17705      13147      11663      11184   Rescheduling interrupts
- CAL:      33867      31854      33696      32831      33585      33534      32145      32434   Function call interrupts
- TLB:      16415      15608      17440      17663      21127      17152      16593      16540   TLB shootdowns
- TRM:          0          0          0          0          0          0          0          0   Thermal event interrupts
- THR:          0          0          0          0          0          0          0          0   Threshold APIC interrupts
- DFR:          0          0          0          0          0          0          0          0   Deferred Error APIC interrupts
- MCE:          0          0          0          0          0          0          0          0   Machine check exceptions
- MCP:         29         30         30         30         30         30         30         30   Machine check polls
- HYP:          0          0          0          0          0          0          0          0   Hypervisor callback interrupts
- HRE:          0          0          0          0          0          0          0          0   Hyper-V reenlightenment interrupts
- HVS:          0          0          0          0          0          0          0          0   Hyper-V stimer0 interrupts
+            CPU0       CPU1       CPU2       CPU3       
+   0:         16          0          0          0  IR-IO-APIC    2-edge      timer
+   1:       6495          0          0        413  IR-IO-APIC    1-edge      i8042
+   8:          1          0          0          0  IR-IO-APIC    8-edge      rtc0
+   9:      10208       6724          0          0  IR-IO-APIC    9-fasteoi   acpi
+  12:    1604003          0     508743          0  IR-IO-APIC   12-edge      i8042
+  16:          1          3          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
+ 120:          0          0          0          0  DMAR-MSI    0-edge      dmar0
+ 121:          0          0          0          0  DMAR-MSI    1-edge      dmar1
+ 126:        930          0          0     332424  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
+ 127:          0          7          0         16  IR-PCI-MSI 327680-edge      xhci_hcd
+ 128:         38        174          0          0  IR-PCI-MSI 2097152-edge      rtsx_pci
+ 129:          0         39          0          0  IR-PCI-MSI 360448-edge      mei_me
+ 130:         28          0          0          5  IR-PCI-MSI 1048576-edge      nvkm
+ 131:    1352449          0     395394          0  IR-PCI-MSI 32768-edge      i915
+ 132:          0        104          0          0  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
+ 133:          0       2702          7          0  IR-PCI-MSI 520192-edge      enp0s31f6
+ 134:        995      71213          0     120277  IR-PCI-MSI 1572864-edge      iwlwifi
+ NMI:         98        111         98         88   Non-maskable interrupts
+ LOC:    4606375    3980864    3688639    3532825   Local timer interrupts
+ SPU:          0          0          0          0   Spurious interrupts
+ PMI:         98        111         98         88   Performance monitoring interrupts
+ IWI:     628191      44368     237642      44906   IRQ work interrupts
+ RTR:          0          0          0          0   APIC ICR read retries
+ RES:     197392     198643     185327     177754   Rescheduling interrupts
+ CAL:     484341     477418     459299     488518   Function call interrupts
+ TLB:     782251     815197     819102     831529   TLB shootdowns
+ TRM:          0          0          0          0   Thermal event interrupts
+ THR:          0          0          0          0   Threshold APIC interrupts
+ DFR:          0          0          0          0   Deferred Error APIC interrupts
+ MCE:          0          0          0          0   Machine check exceptions
+ MCP:         29         30         30         30   Machine check polls
   ERR:          0
   MIS:          0
- PIN:          0          0          0          0          0          0          0          0   Posted-interrupt notification event
- NPI:          0          0          0          0          0          0          0          0   Nested posted-interrupt event
- PIW:          0          0          0          0          0          0          0          0   Posted-interrupt wakeup event
-MemTotal:       16284452 kB
-MemFree:        10017268 kB
-MemAvailable:   13198904 kB
-Buffers:          264676 kB
-Cached:          3332548 kB
+ PIN:          0          0          0          0   Posted-interrupt notification event
+ NPI:          0          0          0          0   Nested posted-interrupt event
+ PIW:          0          0          0          0   Posted-interrupt wakeup event
+MemTotal:       16247944 kB
+MemFree:         5600716 kB
+MemAvailable:   12597152 kB
+Buffers:          537944 kB
+Cached:          6974676 kB
  SwapCached:            0 kB
-Active:          3262260 kB
-Inactive:        2461476 kB
-Active(anon):    2128188 kB
-Inactive(anon):   249756 kB
-Active(file):    1134072 kB
-Inactive(file):  2211720 kB
-Unevictable:          80 kB
-Mlocked:              80 kB
-SwapTotal:       8212476 kB
-SwapFree:        8212476 kB
-Dirty:               836 kB
-Writeback:             0 kB
-AnonPages:       2126728 kB
-Mapped:           482028 kB
-Shmem:            251440 kB
-Slab:             324616 kB
-SReclaimable:     173204 kB
-SUnreclaim:       151412 kB
-KernelStack:       10096 kB
-PageTables:        39776 kB
+Active:          3773728 kB
+Inactive:        5981624 kB
+Active(anon):       3092 kB
+Inactive(anon):  2760640 kB
+Active(file):    3770636 kB
+Inactive(file):  3220984 kB
+Unevictable:      286976 kB
+Mlocked:              48 kB
+SwapTotal:      12406776 kB
+SwapFree:       12406776 kB
+Dirty:               772 kB
+Writeback:            48 kB
+AnonPages:       2529724 kB
+Mapped:           842524 kB
+Shmem:            520996 kB
+KReclaimable:     342932 kB
+Slab:             449876 kB
+SReclaimable:     342932 kB
+SUnreclaim:       106944 kB
+KernelStack:       11632 kB
+PageTables:        30048 kB
  NFS_Unstable:          0 kB
  Bounce:                0 kB
  WritebackTmp:          0 kB
-CommitLimit:    16354700 kB
-Committed_AS:    6618696 kB
+CommitLimit:    20530748 kB
+Committed_AS:    6314716 kB
  VmallocTotal:   34359738367 kB
-VmallocUsed:           0 kB
+VmallocUsed:       56260 kB
  VmallocChunk:          0 kB
-Percpu:             4256 kB
+Percpu:             8800 kB
  HardwareCorrupted:     0 kB
-AnonHugePages:    806912 kB
+AnonHugePages:         0 kB
  ShmemHugePages:        0 kB
  ShmemPmdMapped:        0 kB
+FileHugePages:         0 kB
+FilePmdMapped:         0 kB
  CmaTotal:              0 kB
  CmaFree:               0 kB
  HugePages_Total:       0
@@ -301,14 +197,16 @@ HugePages_Rsvd:        0
  HugePages_Surp:        0
  Hugepagesize:       2048 kB
  Hugetlb:               0 kB
-DirectMap4k:      282088 kB
-DirectMap2M:     7968768 kB
-DirectMap1G:     9437184 kB
+DirectMap4k:      325096 kB
+DirectMap2M:     8974336 kB
+DirectMap1G:     8388608 kB
  Inter-|   Receive                                                |  Transmit
   face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed
- vnet0: 1155867    4102    0    0    0     0          0         0   960100   10308    0    0    0     0       0          0
-wlp3s0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-virbr0: 1098439    4102    0    0    0     0          0         0   735824    6022    0    0    0     0       0          0
-    lo: 7424702   45950    0    0    0     0          0         0  7424702   45950    0    0    0     0       0          0
+    lo:  757127    7251    0    0    0     0          0         0   757127    7251    0    0    0     0       0          0
+enp0s31f6:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+wlp3s0: 128940701  122404    0    0    0     0          0         0 19223478  102392    0    0    0     0       0          0
+virbr2:  442398    6834    0    0    0     0          0        16 17312033   12683    0    0    0     0       0          0
+virbr2-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+virbr0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
  virbr0-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-enp0s31f6: 39251323   34779    0    0    0     0          0         0  5044761   25668    0    0    0     0       0          0
+tun_wiz: 76309369   78385    0    0    0     0          0         0  7300826   68100    0    0    0     0       0          0
diff --git a/test/aux-fixed/exim-ca/example.com/CA/pkcs11.txt b/test/aux-fixed/exim-ca/example.com/CA/pkcs11.txt

new file mode 100644 (file)

index 0000000..4a30b48
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='CA' 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})
+
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 e9e7eaac610489020b5c25bd9574915fdf07b6f8..71a967ed7b5ca819bdae48dc8b2a9ecad955b4fd 100644 (file)
--- 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
@@ -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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
+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
-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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/expired1.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.db

new file mode 100644 (file)

index 0000000..e08f4dd

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.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 092306e6185fcb01e44e29b10a6e36e774e24ede..8ba4824ebf806129c3d8f07748c68bc2f126ea3e 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: expired1.example.com
-    localKeyID: BF 95 EA EA F3 AE 8F 76 AA D2 83 FC D8 6E 7B F9 FD 43 40 32 
-subject=/CN=expired1.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: E6 15 77 8E 5C B6 5D 8A AE 4B 2A 8E 04 16 A3 9A 1F 0E D5 D8 
+subject=CN = expired1.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM5NTdaFw0xMjEyMDExMjM5NTdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz4oXX+vU
-z0sSPxY+Bi71XGyaJSgkgAvXkyFGxXRMCPX9zpTtaXhtCbp87UQXu5ieshq6vG47
-1rTYSrJqSK1GCeDtpJX9K3yiBS+fvganEX9U744+V5PopV15gLjGW7v5tZQjV40M
-73ZBmyCO6vHNoS5ikFo6FceFSaFXIKvjMsgtamqHcj5aQaDkouejsEMhL6v8VcbS
-MO1XsafHblcgVK6Ju3DdX8ExexJe1IFn8iu7fi8ZDFzcYh+fYAJraHE2Pi4MM8Ci
-uebVtHXRLr1HV4tR7Lbeto4b85cZ2VqjUtg4UUb6f4x3iKIE0udS4Z4j/m4sULsB
-fz0v1BHFWIlu7QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM0MjNaFw0xMjEyMDExMjM0MjNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5448KkdS
+08CTyf+yEOiExETcGRIguMvVPvxE39maoPTxtzKFHa3m9JmsFG1kCxZC5ggCb6tP
+4B5XWbmWZJK2O6PGEWFCx7fxktxPCp8qs3O/U9RHfFv4Lo5qg7N5wuXEUdEaAkWD
+7B9CJPELux9K3JiwSg513vFji7q+JaTTyskid0P7e0tnC5+kCwTaaFexx2c50LMr
+9ci2sTToeAgk0T3YrooAUw6+LzbZUF8jmsUMZrfV5PEg0ZGel+36x8TozWkCIvfu
+h0t8/8AMZkrEtv/bBZPxPa46gnb2JKCHUHn7ChpcuXopyRtDaPc2qcRHniTl/OBv
+77J2jQ2u0Pm+mQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA/beB81LUEur6i
-vL9i8IILNs2WXuHUgU29kViIIAtt3+G5z7a9S/0YBrIk9vWCZgiTT9Vy/UIhfiY0
-gdHTX8kb5E9moWvCBxyJW8hXKpU+oGk/WzZqsKF3+5tEwcN2goCjxlAZkfLS1nv9
-iYZ+AqK7qsdAIOHSNA2rDG/RxrTkFZ4O+ofje/epjy941fURCetIdsjK0EG4Q8iB
-Efi/M7n8xkmfU03m+FSfTh80uqB8J0JBB/yVbYedpQYeJNJUUNwWkXISzkg0uZUX
-0i22/znBqa0Ah6B1G7PKlruc+0DzjWBfaxRKxuBVn8Gco6na7ai4e93/VCIc/7as
-5BQ0wtL0
+cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCDYvjtW6rTfJ0k
+niEpJMHTxul1a/n8OaeyhYvC9pLiYGkoJa//zkuEZxkDjJzyhy0zS8lfRsmGuRQC
+xl98xeWwy/vjAt3aA2eboznsysuJR4UCRXS+iT/MavXOp3COzUlakcvkmnYEdte4
+SNFxyqccYZrpoUk2DmjBYCq6zdd06RdF/iUCZVoKnYYchFsMIUgFEJF6jp4/Kd8Y
+/lNEp3DYRB7ZYlolXV/Sdfmv6fQcb6TbV/O1w2SHYw+uQoa5C6MasEu40hSjHbsX
+1MWQ7pxv4naQ/9UWEEy5T8GI4MVeXMEDBc7cCPM2sE3wbn2lJfeInRNKCHPglmz/
+nox2uZuM
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX\r
-DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT\r
+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\r
-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\r
+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\r
-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
+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
  -----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 8a0c2d4ca7a905d8a5f8851b84132db810fc6a2b..7348cd653766b22d59a5db3d777e721fe91bf395 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: expired1.example.com
-    localKeyID: BF 95 EA EA F3 AE 8F 76 AA D2 83 FC D8 6E 7B F9 FD 43 40 32 
+    localKeyID: E6 15 77 8E 5C B6 5D 8A AE 4B 2A 8E 04 16 A3 9A 1F 0E D5 D8 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI3BRcdwf9iWsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCzNOzasgHX4BIIEyFKL7OakBUwg
-iWWmb/kNNnb2tbZHmrWYbbKA+TIl3nopjmZFP1SGW4MuYvLRoNSWb5lggBEs+m3h
-FTdIHDsH8uvh0LpqTEjdj0b4AcqPO9CuRrU5mRkWkvxDTRNslSJm6YaLyFuyzFMu
-CNi3RTv2dLy5MHDi/poNT96a1At1kRIlCjGu9gL2425PWso6M4tScxkWT97AwRYv
-+OuPljA+kuLi7O6HKUTHe/DwrZZIC/lL30nXP1D2lRxyJeYyM6jyViZqDZQ34ZJb
-fNohOK0cqZXObuww2dwl3R9z9zubBcFTvXbh0SsC3xy/4TQHlv1VXTWmsr7wOvk7
-C7C0uMys/tuPS+qpmFvr1HoWTJRd+RLY8C9Nr2z/UMJaIvgaQmIla0o0g1lXhWqb
-ffmxpuNF1suLuWNTs4BDbWIJgPWhJd65CT1luoD5LnZAphngoZGK9JSG2Ww0UOSO
-tjLVODCIwppTYybmRZk249u8ExCGuLrHLwNpjeITj1nlq0SKKS6S9diEUGhGvgAG
-Gbam0FlWE3qMs5reqzA8hJYjV959jMp3KB8aAOvnr7412Pg4itoL6UrTSD5QIwEA
-YXM9MrqfH4FkMu5Qsnkxhypbbf0W4obUbcT9fheoNQKcrRML99hPcLsen8Xzc1ir
-19UIVU+WaiavZCZP6o8GrQ8rSfuo79/TLL/YJn+JK8ToCVNRDmGFpz8z6eW6KJiG
-xwz72qOKvUe7OXTwYjz5tos7SCsqAlpgPbXQkjcEGJ8zDbKH03J43VFoxcf3Ktyi
-uvCHUoZ6w2cPSuEngfBJs+JKnOvxof8ezdd0+ilmTOG5dgtbkY4UHzC7o3xwOwRn
-tefuFqWlzxnoT8SuRz9oudS3dYo+B0SgfVSX6A2rgudSM1dYA61z8LsbfYjhrRPu
-l8/CF94/n/juLxyXmzwADywqpCCof52Pi9P8v84ypvGKC0NsMmZ7fVNHIKQEh7+V
-Ow36KfdMQPoRiSljQ2z45qfBTyuR2i2hzZ25sZ/C2rgz67oSvTC+OdrAHZLMj43Y
-XRjJWnoIVQrkwUULIc7qa2KhdSmgnqvA0hnZwiVsNVqbSjSoaqmnU+K9HpWDgVJ8
-nri+uesYVfg+AJhgArvevXNB5DJtPSFzcbqSUaIABdYNwEv+CkTdZyqWzaOHwmIT
-+yW+VMYnYMuUex1rN3DY6aDEqRtXbZaam7gDbwzAgxt8sWmSc7rFNrXBbS8nbz9z
-Im7mKNCSWh7qshZJwgSbTG5LRqJSJx7LKbuS69KTVHFU0j3uiY9hzaGIfmCP+5zc
-Yu/5WhNPToCLAWu+KWxkVPE4f78BmytnKDma5d2ZWvrGoiImN+e5B++zWfchxic9
-AcA+qskQIMTrnvuRMAWRhkbcyi0oyy0EdR7dwtAmLAKfjPFILhx9XI2UrAb9Wdla
-SmbM3eD6FSMSzXuu7BH7XZt2psMe946n2U7S3ZlhMp+os18fyedeVXJ/m75oR/b+
-Q1ZCHT+GxXzqmaKw7qh7PMFM81ThQPeqS94iJFCxiCNCv6f4Bp5in/oRAG6LTfdO
-TqT07U3Hh1QA3ej1Sdp4Otv67H2GELOtiocH7Bf51tC5LDOqWVea0wvTrjech1Ku
-hAZuBJxCfikelMqmcLco9Q==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIAeL3uXWEDRcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKp2mNNQncRiBIIEyMF/GgZ3j/bm
+yc4RgIKMRJLk6B7t0DnZUtxjyQJy+Uy0S1ZdOOTjw/goDdn3Gg5zsdzCResGEP2f
+utjRnbMuRw0I4QyIN4vy5BeWC7DPutQiWdg3oTZwySUP928bbKIB6k1Q2PU0J9eM
+KQcOclbQrJwS07bSwzNoynZSipEp0t1MX4hxuB2jqpH7zztOab6QW04cnWRL/Uri
+9rRXSoi5LqfQBrlUzaEuPP4956RrSrqqto04xdciDE9xLbqbpzRtHkVahzKJI68Z
+NclsHiYko97ItQsz6p3kGhOOLGBoyd1vT69hORj6cS3sPJmWx18VH+jNn4VmreQ5
+SYi3POCVSYIeAH5GoiEKIaQg5um1RN53/LyFgNYhdqv7UYVuePeOyxkTuQSuEc3Y
+fzjpy+bZjAj5JieIwN4M+8ZXEKdJ83pu7wEDZkzsJ17tEwM9S4ud5MWWr/IjpJRt
+dFAwiG9HQ/MnDJhTdQrrhOetY6uq96ToQ8/IgGl4dxg7eDUNEoO2DpZQJJ1niw8l
+zpEvH3JTbECTd9WsSDRRfk95A8zGaDlooT4zRPV+lA0hul+vFUJw8YAB0mG/HjVn
+CP2uUH8FATqj76OEdb2/QHl0kUnZ5aqno+vdtfMJZ6Z6EoxUG57fvMoOFcQDX/FM
+zPApF/qh5CwAg4lgy1/6WziTRpLimGFz10+XUlqShit4OSe0OcT5Pe1mAAOxpSwS
+eJINwYQgIszK2rN3z8ZFKMWXHh02mGkBpoH2DNB9md73Mq+4Z39TAWMYGQRwQSHn
+2K9KeYaWOZkOJ92RwNETvRH3yRiTFGN6jqeKOoN2pN5j0PzD6/lR43Jm7tHGbwgX
+J6Y4mb3Cf+w3EiS/baMPmEtCFfrDN4oaj5cTQCzvKiFCNeGRvb8xMDspLXK9Wp+C
+GCpyo9xo14tuuKqzrY5wvq2ylHkRSqarQJuuWajK+U6BpZmSAgvUs3wcIsMH3MIz
+YQTfvpYIABicokiy9lzF1x/UnJU1qlCgk4MYYarqSoxgakOFNminoa4BOwmNcu99
+/5mk4CrvYn82RPyTi9LIQBlHLl+C75IXsVCYld6/ngaC67RksWPwEvcagGuDAEkX
+FvWdg9RmMjmYQ0GcDNiNm3iW9ZdfybHc/UxLsfUItMTF27ougO1E0NBd6mXfIOCB
+w0V+IGTCoZj9pHx776ae3r2pMYuo0iocPXL91Fk7QJbO8RycrwdbGijU8olrNwlh
+iAyd1LBSgJGDobf+cW5TTdWxB6gSI4lrjWehHtTBFk9BqeyqphlczQd2K7xSgE53
+Do+RK55OoTAFPms0RZhtXcciTUGgBxcvMzH216Y7ouD4q/JjIqiXlEi1EzVs4aM6
+rzak1wiHd65+Fe2FMIBczZqv9vJP4s2RNzGim7ubYSvOdssWf9bUiXbZSqQ9t4T2
+ucQzFdQOFT3IcvyMy/Ob4NlYV2kZW7z0D2HwNs3Dn83yIhFy0lfVlFjw7p8Fjs91
+hHGv4wLIHC8eN1MGs/jDWro72nfkv0ZTq/EWktyKm5xLOLpnRHAUm7/G2GCEYAA5
+AkIHkV1aRry6xtHJDubRNzjT7Zio9yjfUNrujP5TLjD5ynt2vMF0PZjiBil94Yzc
+qaA9YP0j5OWedzjKe8EE+Q==
  -----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 89d8fe30ff908347a7f64aa8f91e6c8474dcbf97..51e0e38fb3eacb7ec41d5225b4656b099932224f 100644 (file)

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 defc20b78a928fae6cff67e57abec52324cfe99b..2255216da11a2c97b391b20d15af4633d9387f95 100644 (file)

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 8a24ce409e53487b2d8811b2ca9e1f9b0ff04cf2..41df6ecec1b505129fd87f5098c940dc229a8e0c 100644 (file)

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 b89b74489545446810a7082c79678fe22c08390a..e60e68a188d61c8641eea0c0c6be3fd7fc2bedde 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp

index 8fb952cc7c999613468b78ca3a5d218ac5a798e1..54c014122a0ed4074179fb2b3146cac912953002 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp

index 094516657d8ef94f12cdef88993fce6d3cbbacf1..e3c150267a873f0103d6c12daaa4b4939c11cf07 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp

index a4bb39384fa4b1a1dd5d477de470b2ac5845b422..738c7e7eef98fb8a1bbcd2d0c1c6b69fbefc4c8d 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp

index 58ed9a7c2c17e18c73036aef9d29bb1e68dc3501..7c0f79f683108ee937bc880324e28319b72a9334 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp

index e27e96100dedea447ba6635d249674146a387d7d..550f8733f10247aab4896f408384732dd6507b2b 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp

index f1f6223a09bc9962f4384ff92c2faa620e41ded3..2cd39d35a7eb3013bf6bfb7e87e513cd04c29cca 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.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 8b6972b22c1f154fde01cd579b83291bc0438e51..e7437dc4eef5be94b377c08db33478023e84be01 100644 (file)

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 f9cbb5ade7bd806cbbae1b626c8f062fa89576a2..b54f0ad430136569987b1151d76bbd03d095027e 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: expired1.example.com
-    localKeyID: BF 95 EA EA F3 AE 8F 76 AA D2 83 FC D8 6E 7B F9 FD 43 40 32 
-subject=/CN=expired1.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: E6 15 77 8E 5C B6 5D 8A AE 4B 2A 8E 04 16 A3 9A 1F 0E D5 D8 
+subject=CN = expired1.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM5NTdaFw0xMjEyMDExMjM5NTdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz4oXX+vU
-z0sSPxY+Bi71XGyaJSgkgAvXkyFGxXRMCPX9zpTtaXhtCbp87UQXu5ieshq6vG47
-1rTYSrJqSK1GCeDtpJX9K3yiBS+fvganEX9U744+V5PopV15gLjGW7v5tZQjV40M
-73ZBmyCO6vHNoS5ikFo6FceFSaFXIKvjMsgtamqHcj5aQaDkouejsEMhL6v8VcbS
-MO1XsafHblcgVK6Ju3DdX8ExexJe1IFn8iu7fi8ZDFzcYh+fYAJraHE2Pi4MM8Ci
-uebVtHXRLr1HV4tR7Lbeto4b85cZ2VqjUtg4UUb6f4x3iKIE0udS4Z4j/m4sULsB
-fz0v1BHFWIlu7QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM0MjNaFw0xMjEyMDExMjM0MjNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5448KkdS
+08CTyf+yEOiExETcGRIguMvVPvxE39maoPTxtzKFHa3m9JmsFG1kCxZC5ggCb6tP
+4B5XWbmWZJK2O6PGEWFCx7fxktxPCp8qs3O/U9RHfFv4Lo5qg7N5wuXEUdEaAkWD
+7B9CJPELux9K3JiwSg513vFji7q+JaTTyskid0P7e0tnC5+kCwTaaFexx2c50LMr
+9ci2sTToeAgk0T3YrooAUw6+LzbZUF8jmsUMZrfV5PEg0ZGel+36x8TozWkCIvfu
+h0t8/8AMZkrEtv/bBZPxPa46gnb2JKCHUHn7ChpcuXopyRtDaPc2qcRHniTl/OBv
+77J2jQ2u0Pm+mQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA/beB81LUEur6i
-vL9i8IILNs2WXuHUgU29kViIIAtt3+G5z7a9S/0YBrIk9vWCZgiTT9Vy/UIhfiY0
-gdHTX8kb5E9moWvCBxyJW8hXKpU+oGk/WzZqsKF3+5tEwcN2goCjxlAZkfLS1nv9
-iYZ+AqK7qsdAIOHSNA2rDG/RxrTkFZ4O+ofje/epjy941fURCetIdsjK0EG4Q8iB
-Efi/M7n8xkmfU03m+FSfTh80uqB8J0JBB/yVbYedpQYeJNJUUNwWkXISzkg0uZUX
-0i22/znBqa0Ah6B1G7PKlruc+0DzjWBfaxRKxuBVn8Gco6na7ai4e93/VCIc/7as
-5BQ0wtL0
+cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCDYvjtW6rTfJ0k
+niEpJMHTxul1a/n8OaeyhYvC9pLiYGkoJa//zkuEZxkDjJzyhy0zS8lfRsmGuRQC
+xl98xeWwy/vjAt3aA2eboznsysuJR4UCRXS+iT/MavXOp3COzUlakcvkmnYEdte4
+SNFxyqccYZrpoUk2DmjBYCq6zdd06RdF/iUCZVoKnYYchFsMIUgFEJF6jp4/Kd8Y
+/lNEp3DYRB7ZYlolXV/Sdfmv6fQcb6TbV/O1w2SHYw+uQoa5C6MasEu40hSjHbsX
+1MWQ7pxv4naQ/9UWEEy5T8GI4MVeXMEDBc7cCPM2sE3wbn2lJfeInRNKCHPglmz/
+nox2uZuM
  -----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 2b3aef98b2ad7b1ea3f045e41c97aaa484655331..5a39273dbd9cec2aa1f053063cdb64e14695da4c 100644 (file)
--- 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,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/expired1.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db

new file mode 100644 (file)

index 0000000..559c1c9

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/pkcs11.txt b/test/aux-fixed/exim-ca/example.com/expired1.example.com/pkcs11.txt

new file mode 100644 (file)

index 0000000..e954fb6
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='expired1.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})
+
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 e9e7eaac610489020b5c25bd9574915fdf07b6f8..71a967ed7b5ca819bdae48dc8b2a9ecad955b4fd 100644 (file)
--- 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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
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
-DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+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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 (file)

index 0000000..a167591

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert9.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 f451fa86a82ab2e771497275ee341b23448087fe..76aee5c9bd5b28ca3920a39b6a5cf17672eceefe 100644 (file)
--- 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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\r
-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\r
+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\r
-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\r
+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\r
-CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9\r
-It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB\r
-HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO\r
-a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas\r
-k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn\r
-ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
+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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 27ca5e94ca42b9a6d58017fcb33bf6dd72f06234..fdf69ca9fbbe4c5c507d3316d47f2fd28e3213db 100644 (file)
--- 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 81fb0a46ac34d611dbb1de2704a0be63731a8e3b..3a76074dc6b5bf196848c89f328ce4ec407c8771 100644 (file)

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 39a847706cc8b7b66767f336c1e49541453abbcf..b1c6ae3dee728661f0b16ffa803c118a64a7d866 100644 (file)

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 546281fffff89c83f7be0bf954f02868a5a2b924..353e96a47ab98a043bc9018264cccc99294315eb 100644 (file)

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 39a847706cc8b7b66767f336c1e49541453abbcf..b1c6ae3dee728661f0b16ffa803c118a64a7d866 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp

index 840a75279783cdc6520a9ab3e591e5cf69d1bec6..377a976fb1ca5919438be208cebbc8a6d028ac15 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp differ
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 8242340728ab2fa852f6bd564256c83636034c7e..0d1b61e9390890afe6594eabe80c601fc56fcf68 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp differ
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 8242340728ab2fa852f6bd564256c83636034c7e..0d1b61e9390890afe6594eabe80c601fc56fcf68 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp differ
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 07780be1ee2bebed637bc77fe539df11a38c121e..9e057c1b83aeef75e8cc51c0e3b72bad7858588b 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp differ
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 9a95ac59c0a2ae93ddc31de106ef4e401a19f2fe..edf7400db0dd7dac040c47c2a370419954963f48 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp differ
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 9a95ac59c0a2ae93ddc31de106ef4e401a19f2fe..edf7400db0dd7dac040c47c2a370419954963f48 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.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 663a89a501f625e80a02f69547dd2b89e70b26c5..8e0aa6dde7e516a28317bfdbaa733c19298e45af 100644 (file)

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 c05c66b7e81d89c09c6915071f26409d75ec6cb1..97ca6df9229b42641d935993bdc42d483f91ed00 100644 (file)
--- 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 fa920e65ec5038f1c23c88718d93a49b55330eb2..98b8e9d168a119ef89bf584fe0d25c171384c95c 100644 (file)
--- 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 (file)

index 0000000..7a673e2

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key4.db differ
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 (file)

index 0000000..dd47e83
--- /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})
+
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 e9e7eaac610489020b5c25bd9574915fdf07b6f8..71a967ed7b5ca819bdae48dc8b2a9ecad955b4fd 100644 (file)
--- 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
@@ -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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
+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
-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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/revoked1.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert9.db

new file mode 100644 (file)

index 0000000..8c56cfe

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key4.db

new file mode 100644 (file)

index 0000000..cc055f1

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/pkcs11.txt b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/pkcs11.txt

new file mode 100644 (file)

index 0000000..35bf1a3
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='revoked1.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})
+
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 93eb9be5dacfed8668583d5295cad6f036a2773f..275e93efde7165ddc4dae8efe899eaddee078981 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: revoked1.example.com
-    localKeyID: 73 E7 B0 12 1E 6A 40 57 BE 62 22 93 08 FB 10 76 2C F8 31 93 
-subject=/CN=revoked1.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: 4B F5 A1 98 2E E8 FF 67 1C 7A E2 6B C4 9E 31 EE F4 E8 64 0D 
+subject=CN = revoked1.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM5NTFaFw0zNzEyMDExMjM5NTFaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo+KD6Ydn
-cYyU3feyDDMajOtu89d4Xix2z2OcgWVM6alC8mC7rQn23jeHgQWOIGw2nscZBTRJ
-y9sliv+MKUnNLoOYYmXObuJyTP/cYPAMDFkrVYQpOF0oGNLC1kvzs2Myfuc74+s/
-oGjW0u6aFFdbtBYqRuAzjggtvVuAmKO0iNPSqRoAKnU3VGI+nGVOdJGeo5OTmxoe
-xJOe6A2Z/wGMJKBlAdyVBsqVF1aXtyexsiid+byjKcFkbf+g/F5Qm5vj0NURYCq0
-awGhglWEBSZP0+6GHC0PNxoLEFecYtb7e5E51cqnJTMj+acG8XZAZyeV8eVeW9iB
-bwhkjruH+MDqDwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM0MTZaFw0zNzEyMDExMjM0MTZaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmJbiEUkk
+6jz1+8gojmj9paZ7H/PmZwZIPlrAfu7YjHQGIu5rULho8JZy35+92tQrdLJHxgZG
+aAPJzyGKDvAVS3ZVtHGSZaPPFXVWfwEcDGwqJnSL1LyXxnavBXkMg7TAgsSER6xJ
+XeDKXvcBDPJ3L7KabMIoCxGBssALByZSZQ683UTnGndUjQvUShgZxJso3N1RNoPr
+fSJbADekzGhIOZmPewV6f9wjPk1EDEjgb191zhOvWfjOdgc9lQB3AtfhtHw+sNbq
+4OymcV1Oc6Edvdnl1EpAf3iJy/80yf3Z+wtIPAt4YLH13UQYHoUMpLPyO8lwxGjS
+QObe+9lnRQcqjwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBRh7Fln25unfd5
-7J+79mYhwo1Tx+i1mWgJcARWE9xvDZKE2u9RmzmBjGI4gr5YOUKmpOSk1jNzzYae
-Vsn+wxdvjuULF/OV53+7iOaynJRqGjpM+S57Uv7rp8saqJhHFqUoz4Sk3uNXXngW
-PZa66qKO+xiYOXTSdcO7DnjZUntVB2X8BB7I9otmFYSVoUT4GQfpJRa+f9/S8+ix
-793LmT0bEOAtKPgsed5+7jJlUTQoMemYzBAJMWcZvrS0dEl8lnO1HEYBBAQSMxY6
-WJ5SnUE3cesI8QjbI+/qPyFl9UAAOm57wgWRfYAVOz4RLVH7z8J6EjuLg0CJgnwq
-/E7AcSzb
+dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA2LR2cWSAfywEo
+l6y7satH3uaVSRO6zRt2PyxdDcnJUqkpvoxqFy+wCi1LBLCXXkHrb1btcr9i95ey
+cvST3kS+0gBjyFdA+YluYVrLb2Y0P3Lzk7TYjrZagGMmOsYO7FoheLGaU9OoUrYv
+0KTqL84u1x3L5IUeAxbtBmaHWv+MgD62uqFZIDV/Mv8yAkfbaaMl1uEPPw/S6V6Z
+gQxQL5BmJXDc8Z4CQ9jNoVRMQ0X7f4gx/nsYd/n+hwSglR7lJybHcXxSuIoJExY3
+adPDCNqV+Qb3iQb3q9hLUnkPQEwSxTHG36vm7eYil2CRd1LdMgSYjsA661h4ufDI
+AO2QQMCT
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 2ca905aa193af35fd4a4a04862ca4e128f159ebe..883bd36db88efb1d648a3c11a3a35826a829c49e 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: revoked1.example.com
-    localKeyID: 73 E7 B0 12 1E 6A 40 57 BE 62 22 93 08 FB 10 76 2C F8 31 93 
+    localKeyID: 4B F5 A1 98 2E E8 FF 67 1C 7A E2 6B C4 9E 31 EE F4 E8 64 0D 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIBvO1WOkKKvcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFeGCUO9R0xXBIIEyJgWYmvjwhwE
-XxAZZ/O4T1hU8FzwCOvgmqSkNs7GnT2Q/NSQhUsvUxA8/nyU7wW1Vx62mjJXdJBs
-VdseKBsDLr7xn1hQrGwfQB+39uBUMyJ+b7NZZT/zbBjIXck2++iAAf9uB6/OjhQY
-+BAanYgaizQJyanbEzK+xc3dn6ihayKtTYCpzpFW/kLentOL2gib/3U5N9Jd1ND2
-BP+D/POLpfeD2LfLXZLB0lCvXx5UpNOja5V58wHHWsvtm+CaVs/cnaXDhTbzGtNq
-EKIyTxkHbpO/k8kwfN+pcN3CUUUNy+9wIv6LhNujeEYehosJjSbRoOjsFiByAaX7
-Q5nF8sM+mZJDVcRQPkBVJSFPLo4o4bnMcAVF1hXZgxNAgPElhe84YGv0NpVxBGcQ
-6aS1BG6i/OMeSC9osPc16tP5IiiMAaHf3xQawlR4RdHcxczcfc03DE5BzM2XcIVS
-3t1l9aOjQItdr6pYtIClKDTrHm9aHPb639EpShCsoV1bEdSS2QhDbtAyLLAQczh5
-Vj4a6jlkMzITZHdMdpcHtPvoXAJumBj8cSqK7DVUYl1fu+28fDfaOnVPLVFkhlLi
-Tk5AOgP0Bi+VrgB8dXD/0mqYEnJ+YLVEBMBMjzc0DX0+Sqv8j9IGjxKNMl2ynGex
-pIZuwddNLOZOAlaYNBFtgwpOnc2ca/zdtETkwAs5jXlBnV4ICGkm7JxhfOmKvMy5
-eOT6fqVOHORO9JFSNivueIv7wQMMRcb7RcAKbECt0NDHtGdSw79jLh/pp7cy0S8X
-8gofDtUIK8BkjFSutG/2S8Qv5FUhsiQLFgJO2+4Nyt4XiRVbxb6tlM+tFzqcVY+U
-boWnk+AV0WiQRxRgpVnJ2gMsQEh+cAkecoARyeB7L6s06LrPca2DLY0PeM38jSEU
-YIBjES9/TYu5uCYL9skCf7U6n37UlLHmK2YXwrY5RKG6y28yizWI0Fw8Dw7MrCSH
-UZmGELhgMRLMbp+59x2QOvWWAe8rcdpN0BcqAWZ8MgGxX1Uyh3wV93U6Oo3Uyzg8
-IoMJUlnq6A2VJZ2gGHhWtIfO3FEQUKZBbcrNZnCMYc+72PxlHuC6hsUD6U+DE8ex
-T5rjbgwB9bfQfKxuUamLY/I76+C1Q8RRuq3HdVpmvs7Lfr0ItIaTpFpkCrSuXoUQ
-PN+Wmi+2xwNGGE1TwL3aLmOTIstfL02IizHOlM7ih2JH/YhZKcc4jNP10k2s9WTs
-HWbGT05IdroCdj7ysVJx8gbEJSN+5AO+E0wqTssS+KUi2MYTADzCZcJ9Y1AAT0oz
-gPSV3YVrudS+1lgsS6Y9PqtM0dggHtBYfgWnp5hXlUB+oO1DNwmBLtp+lCRdYK8J
-5G8OoBLKY5TlsbpTyzIOFlrWe+HVDgDTdycu9AO8dK9RaUOCU94mExyhwO+rJA8F
-XsQw7nBuR4oYDdxONxeqcNcaYTKfC/ew3WIvEGMdqW70jDuhNLuIKGgvQvGyQGnj
-VE0HFPyyqjrqvqVUnq0+ieIYosAqRQ5CPrgOqz+7Q5tCPBqavSSPycPZ0ZIK5PGr
-YjZDj/SNvm3kLmETJfzz0wYmrGQleRjUuz0oFUNy09hydjQ4ODS4I84hX1wi4XSd
-Gy0S58Dur+BRsgTjbhUszw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIOwYDJfsGCsQCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIHMY+ahBn5wBIIEyGFoEEbCAjE9
+mQrDPQLXeJ7ub/2KFZ/EgWNg5AaqXpOhX83cJI/x7ZoTrzQOcRIRgHaSPYDX9EQ2
+7e8NIUBijAAJzjejgqgTuHhuUaAia64eklLa6Sq1XflQfjkey7AfZViTbv5G1EzP
+SdVTMF/CLW6l4gWHntmYpcvEgwGajx6fENap9vJZAAAnvx2/3SmomkDCSZvQ+tlr
++EpU34HYtOynPZyXwd4Olzg8yL4KW1D5hwvefmDfBjyDArNFTTh4w+0o/JxhxBN9
+IMqVnxyQmIasekUCdy0jCnMnt/g/l6rZv0FcMIkwfwxX5pShHoNgRfgiL5U/CI3s
+bemyZmna7w7vWOEGS1qeLgGzp8VcGHOsT96gS6AX/iqGaQfRBzAMxh/Qan2Rrd/i
+53Itxt6gWwx+CkEr6p3xHiQf9649v/G4qVKjkUiJs9Ktkt18/mai+NmNvlbUD+TY
+CiqnN4ZnZIkfZprcb1NyD1cogpE5lXBe307CB+tngqxcxWIAycq/5mlfAHhC2b2M
+Z9GmN4cIsv3mIcCUzSL0yn4+vOnydYgexL1jNHtBO5Rb97wWbeaNrURQ9Nn+dcJT
+ZXMD2k9imKB+uD3xaHtntojO7PPEm1P57sIVTg8eOBIDuxU/2R6T7Rpuz5BCnW4S
+FiS7CzmFuQkT/53juPdRw/1VbSkTUgKjZaPZUeyJuYv9Z98NAzJ29nvEZCWT2M9x
+bcViVxzpeDIFH9iZySDqOYh9r59lTUmIHQor2BJ5aKuqAtRgUFg9RO7bi0pqDHmh
+Bxn/5L1eiRi9FIQcQZeX16jceWes+g/4zX8QdhOq1sKodzzdEcrchXLCHgG8Fm5o
+wnskPzbg7jJA0U+6UlWOgAf9zjEdcaPoOXGRF9Rph6YuBXli8xo/WPADvvjOoLkw
+aiV/I1/kiOo6ste2GyO/g/Gf1nljtdaYU7yhbPgdPToo7zrQqpFm55Ge6S1XrSKT
+OmQ6cUui4mgcaAgr1lousld/Ba76nHJB2Sy1G4r2J8SQh9cSMx1KCf7VDrKGOsYK
+R8FSJx+T9ft2zpESQzv5y3LhBAtrBxNvuzxmZ2I2+fE82JSvPgC2p88Jugd8SVrW
+aKrAab7xgK7ekpiR26BxiFsEBHWTaiU8idu6Fcxi1BTFJbv/HMebWOFpCgRGrfJf
+lkucClFhmnApxH35Y2auxYTL7kSQrUh0dTZ5oacHHFLcc7TZ5ehvceGFNx6+EGWw
+bVFkwtzAIy0m3Q+sE73cPjphjOLRQjONdhOHB9DxGAH2ZGnoZIWLdmrVE7FXNZUm
+4sikAGISi+NeGymi04u02yiYFpWA/72ExxhppWGXKD7qrpwmMhmwTkr9VgyaTpCl
+QDYBQX6Hk6Sy7J5XIA5CnxtkszmN5y8e2oMl7QTwMvE/b2x+mHCFi7YgkoCLoN3D
+TWCQf4xRtwp2V3wTTtWf1qv68LaMqL8oFb0LZh8yAHoBZOnJBv0T8JGmBw5RJPXF
+6WbfS0nd68hae7qKGYvmmrVZZOinurBqmthUgDwDBytA0L15Ykbve48C7n2m7/Uk
+dMxhDL7wFv1UwD8dHwNvkf17LSYh/r1NXQs8CGWJ/SadEXf4KSHNL19omhCmg8/7
+PWrwExwrajsluwvlvwv/5A==
  -----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 40fee1a493d3fd978b64b77188ba4d3136f9e807..e53b5a831e00389711fa001ab58fd09879aacaff 100644 (file)

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 9597bcb661f9d99cf0f4de5865ad8a1d301786a8..a81c6c0d0d8ddd8fcf7866cd60836cef7a181645 100644 (file)

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 da380885770d48a07d6aefbf684caa25365059d3..351aade534b9b1a44f5373363bb552aa02525616 100644 (file)

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 56f31287e722e2b6fb3324643aff8ffec9628075..c33d8b279eec5508857354d33f99b263cac099f6 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp

index 78cced8b3a9f893f846b19fa002b815681d33b50..554c2313019ae32725fc6c07ca11723cf21cff48 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp

index d6721505e60ce7dd3af535f37504dd181dd5446a..0820337811a97fea9fb46d476cfbaa7c56f97348 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp

index cc6d38c501207effb26824558555ef3742df7411..c43280827e772da69e9f305bf1891b3142e027e6 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp

index 0147f59ebe0ed122114381ce4fb91fc4fff0c4cb..26b2995eaacad9cb82d5394ab85070262b7bb89a 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp

index 917e817292d74eb828d547a2eae43ffe9379844a..c3057c102209b028b111b1a4e45030ff9bbddc34 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp

index 32be35b500e95c83a5ce7c4751083b576207ce89..515a656dda34e12c18c0c4d3a3cbe214bb1d98e7 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.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 e5587cbb54db5bc744112e72aa6ccaed462e2942..145bae927f99b16eb79674b9f6ac939dbe3164e2 100644 (file)

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 620ee905309747043c8360d5d213148017b8596b..0c2ee04919b02a4d87c409ad748c62a6b2b99b01 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: revoked1.example.com
-    localKeyID: 73 E7 B0 12 1E 6A 40 57 BE 62 22 93 08 FB 10 76 2C F8 31 93 
-subject=/CN=revoked1.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: 4B F5 A1 98 2E E8 FF 67 1C 7A E2 6B C4 9E 31 EE F4 E8 64 0D 
+subject=CN = revoked1.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM5NTFaFw0zNzEyMDExMjM5NTFaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo+KD6Ydn
-cYyU3feyDDMajOtu89d4Xix2z2OcgWVM6alC8mC7rQn23jeHgQWOIGw2nscZBTRJ
-y9sliv+MKUnNLoOYYmXObuJyTP/cYPAMDFkrVYQpOF0oGNLC1kvzs2Myfuc74+s/
-oGjW0u6aFFdbtBYqRuAzjggtvVuAmKO0iNPSqRoAKnU3VGI+nGVOdJGeo5OTmxoe
-xJOe6A2Z/wGMJKBlAdyVBsqVF1aXtyexsiid+byjKcFkbf+g/F5Qm5vj0NURYCq0
-awGhglWEBSZP0+6GHC0PNxoLEFecYtb7e5E51cqnJTMj+acG8XZAZyeV8eVeW9iB
-bwhkjruH+MDqDwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM0MTZaFw0zNzEyMDExMjM0MTZaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmJbiEUkk
+6jz1+8gojmj9paZ7H/PmZwZIPlrAfu7YjHQGIu5rULho8JZy35+92tQrdLJHxgZG
+aAPJzyGKDvAVS3ZVtHGSZaPPFXVWfwEcDGwqJnSL1LyXxnavBXkMg7TAgsSER6xJ
+XeDKXvcBDPJ3L7KabMIoCxGBssALByZSZQ683UTnGndUjQvUShgZxJso3N1RNoPr
+fSJbADekzGhIOZmPewV6f9wjPk1EDEjgb191zhOvWfjOdgc9lQB3AtfhtHw+sNbq
+4OymcV1Oc6Edvdnl1EpAf3iJy/80yf3Z+wtIPAt4YLH13UQYHoUMpLPyO8lwxGjS
+QObe+9lnRQcqjwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBRh7Fln25unfd5
-7J+79mYhwo1Tx+i1mWgJcARWE9xvDZKE2u9RmzmBjGI4gr5YOUKmpOSk1jNzzYae
-Vsn+wxdvjuULF/OV53+7iOaynJRqGjpM+S57Uv7rp8saqJhHFqUoz4Sk3uNXXngW
-PZa66qKO+xiYOXTSdcO7DnjZUntVB2X8BB7I9otmFYSVoUT4GQfpJRa+f9/S8+ix
-793LmT0bEOAtKPgsed5+7jJlUTQoMemYzBAJMWcZvrS0dEl8lnO1HEYBBAQSMxY6
-WJ5SnUE3cesI8QjbI+/qPyFl9UAAOm57wgWRfYAVOz4RLVH7z8J6EjuLg0CJgnwq
-/E7AcSzb
+dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA2LR2cWSAfywEo
+l6y7satH3uaVSRO6zRt2PyxdDcnJUqkpvoxqFy+wCi1LBLCXXkHrb1btcr9i95ey
+cvST3kS+0gBjyFdA+YluYVrLb2Y0P3Lzk7TYjrZagGMmOsYO7FoheLGaU9OoUrYv
+0KTqL84u1x3L5IUeAxbtBmaHWv+MgD62uqFZIDV/Mv8yAkfbaaMl1uEPPw/S6V6Z
+gQxQL5BmJXDc8Z4CQ9jNoVRMQ0X7f4gx/nsYd/n+hwSglR7lJybHcXxSuIoJExY3
+adPDCNqV+Qb3iQb3q9hLUnkPQEwSxTHG36vm7eYil2CRd1LdMgSYjsA661h4ufDI
+AO2QQMCT
  -----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 61dfea521d95cae056d243e1fe37a50617a08370..9bbbbf6664f85ef882c7e14a721b67a293b8d8e9 100644 (file)
--- 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,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/revoked2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem

index e9e7eaac610489020b5c25bd9574915fdf07b6f8..71a967ed7b5ca819bdae48dc8b2a9ecad955b4fd 100644 (file)
--- 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
@@ -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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
+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
-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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-----
  MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert9.db

new file mode 100644 (file)

index 0000000..f20d06e

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key4.db

new file mode 100644 (file)

index 0000000..9a1c242

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/pkcs11.txt b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/pkcs11.txt

new file mode 100644 (file)

index 0000000..5a89ffd
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='revoked2.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})
+
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 477d71b5f61c1f28c672f8d7630f14e2e80aa8f3..e20cf3029527b6c785385379c735ceff856bf00f 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: revoked2.example.com
-    localKeyID: 17 70 E9 C3 AD B1 45 7E 44 8C 33 32 BA 18 40 C2 98 CD 86 18 
-subject=/CN=revoked2.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: 24 4D 08 5A A5 DE 4E CB C6 2F F7 DC 39 38 4C 47 2E FA 0B 2D 
+subject=CN = revoked2.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDA5WhcNMzcxMjAxMTI0MDA5WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANpsJV/G
-TKhcrSF1c3SIuSEFBsLM8Yr6RP+Ezrxafhfg3qm/DdVGwNbhoBjF+qobE28bYH5s
-hMSNGNWbbGCgzSLPXRNsAFbBkShPDr2IV+5q/9R9v6R3ejSoLEJtr0NLqGY+gDmJ
-lCGK0jRZmfUGBLjcMj1ZFCtSI4DCglgyTuGR73Ccd4Rf8dPqVYVZYcVnsKDgwlaD
-bglxa7Gz1n8rad8v4ZW5lnTi6iTm8uyRao+JgChxDdEHhv/4oiE/iYdTWOLnZ+L2
-W1cFaJ41fL6ayAinAcbADpI8TAsNGGeSqPhNCe3Ym3KtwfoXFqeVYZltlEvPuJVO
-N0y/oP0UrUclZe8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNDM3WhcNMzcxMjAxMTIzNDM3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG+euSn
+X99Xp+qy017RaJVEdVHxYhDrBGc2ds9FMy9sxO+RyhYAhQBC7NCqOFrSx6JHCIuQ
+cwl8FtfMRBdI73HMMml6/YrdKpsudEs6UcEvgsubqTeWyoBf077di/Q8bJ2rhJVi
+8K9UoviKzM2zEBHhaoS8MznmSbC1CVtH89zpf7YqdnvCbmGhr7ois6E0yPkL4OqC
+iZ0aiqBvOK5vShfZ/hqKArNGTqCAhUv2sPu5QziKnUFrhLG0ubDzEsqr+oz0Fkwg
+2dwl6HDfABdqxUWhoyaNRdN0TA4HWc9ASilqO7jE2C0YeQUUDHPxCpj2gIon4UbO
+sKpf5cWtg+FyQ/0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAKOYKTZN1lODE
-EnV7hacCK6RxFBwWXAot3lFesZ9afi8CdgIQe6nBjEFnjrzx7/sY43XiR7N27SZj
-4DXp+La2ZWluePljcsm0ybGBHfFNEKBwIRS0Xfjfp+OKxNsiRwmeYZzEoKqVLREh
-e+FaHFUKaoK/XR7RLeorra+ygodWNrcgaRSIaHDfY/VeHeejCnAnvBH7rf0Z3SNy
-Fx1KbQd+byXsaiTN8rHxag36PN4SKuhgeAkZ0fJrzLt70VNfcqvoFbZO4yyq9X62
-otq8k5MVgtLaFTOuQfI3NDdkudOfTvyfkR9tHQLwNxIlMZ42ikGn0hqJkVw0m5NK
-TPC7zpPj7A==
+ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAtiBqyoXE+5bI
+WodE/E5XQOI5Clvo54vh/G1gDLTe36NkGuRe+hhPmWeGDYavJDihNhdokB2GnQCy
+ZYqA/GHMOqrglXTAJY4q71/6XGXRIcvksQ9tCsXzltid1mQQxPYF0xeSwPmLSVCn
+FCItjOOhrG69ITlVd3mRRIG4mSKq47bxVtD12fsg/nbBHswGzSqEiMSuRHSxIFnA
+VK8vqa1kr/h65qPQw05ZYjzbbB8BY4EnIa/Q2KzLR7QGQvGifrN0G4OvfsJGvux4
+v8/Yl7+wX0VYIDAMw75NBLUV3LGSGdx65nWHcZKY/czbFLTB/vw1fvc2E+lhyn+P
+8m1vEIZAGQ==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 d7ce09eb532ed717d2556a92c782c23a9b02c28d..65a851ae70fd030cc589084d7f974245bff0cc48 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: revoked2.example.com
-    localKeyID: 17 70 E9 C3 AD B1 45 7E 44 8C 33 32 BA 18 40 C2 98 CD 86 18 
+    localKeyID: 24 4D 08 5A A5 DE 4E CB C6 2F F7 DC 39 38 4C 47 2E FA 0B 2D 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIAFdTJ8R3MIwCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPMj42ItFVHDBIIEyDzVt+Z9YJFT
-j9/EgqK97zAD2KTdOE32KcV7G0DIqWQ5EVG4r4P/ovTW+SZa1Hjx/vC8JGDOqZvI
-InNHMQvxoBGXYx76wMB+qE0/tVXOCUZ1+0ahJ2cKPrImMV/GxeTJpZ9BQum6FeLT
-yEek1emVy5MNQbpmQ2leGgfzVBVo8lMj3bE8EJJculAK15NBJ78pLubj5lWIlH46
-8k6amNbe7YPxQ3WFlkqxpa212pIPFURzOymdoFkrLCaRaZF8/cXE0iC5jLZbmt1v
-NjjKKcLUQGn8V5219C6GIc460o2c90xtLbszsTn7nQrr3mB+1tmdE8hafrvIvVWr
-ZWwh81zdbOdemsOC+bEcVBpALzYXGAQ61lZzqwA/JHWq5TL3EXvRu4K5rDukDmZc
-uSSfDJKsA8b7QDqlACj7YoEErPjHk3eW0qqiJ9KyCTBPmuqbVXeEz4w7iXWXLR2o
-StrAvZz2DzeX83acBKQ/LPpRhjcSytKklUfrmegA+c6efDArGCbxulIBL8WmKOY6
-xqPxMxHQgsWgDBg5u+tTWnSpd6AvW6MInDcBty/nVQ+Cx3kv2fdBoM6pbokfxZYe
-scaLdioMUYOyrsG+LDlPgfkqMNqchve3o1J8nLXR0h4/nehxyEiUZBrUhzQ8NZhS
-xpaEq3Xf4bWp1RIs1c8VClNEK9AKqemAojD94wNf47hURZ6/QEXUeoaCCgYm09KO
-rwYgvMzXrbU5I2d9+OjLqOjJBX3gQgfYdCRtpeEhm9a3KvGmSxD0+NxousRFMePp
-C4QQhJvKJjfVoBwqMDIBuIw66FH+X50wTPqXaYlym4LxdhXvFpEKZ+9DINtFGP3E
-wHHsSLmS/1i5ga79WGXogvoDBtjxVKLCCdEj18BTjErVWH/lOV1PXesVGZjDpHPc
-PzYQvq5lY9bnlfLFtpq/ZwvGFtixig/JcQLqDcjmmBo4xDbWIgYIhltHG+joIav1
-MYKq+GItHAj9tWpGMVSRqEtrQPe2THDlqxBzGvzNu7UeS2Mn+Kd/+ynhhddOyC/n
-iyGvjGZnbwC44sgx+K53RQlJLfrmwf6EBlb0vvQBsbCpAEyCuxNWY+5DqGnKJxis
-XULa0TgrK7ASwrTvjScRdjjwEWr9JfZIKUed0Uz03hNm8CHPLeaXkTQitl2/UJby
-3ndz5rXA+WSJNF6beqNIlH+Q2S0Cm2X9yvW0/fR33MBaK+/IMyvOi3SXXH3g5MH4
-3tA8Ct+yTzrsD3HhTRky8X1EjWxSnsixCxAjbZ2c0F0PyKrQmLX2nxoliN4aPxAg
-aQTSSJbVqUfpnmhjgHos5XZuph4uOqqrHGZaqq7uAwpLmwRMq0Bt91DIebFWV/x2
-h31qbp206zyz7D3wE1aA8oEHoNFiG2YINtPIgYZ0JXUVVY8L+UyulY00M+awOT4y
-X+sM0amQyy3ZJJJbKepDu/WbAHxTlDYpb8lqGH2/0kHfDuVF6rgDoqPt6cEZHeR0
-jlazD8bNsFsEC9qFFxZ4i3zrYYmT3bJBVzoH3eEK24IF8MVBFaRvlQLCjTbBmHwa
-cqElfTe9Il/4Gn8TeEnSHhMYYpmygaZzWp3+slBss4ajAAnvocq/X/yzwzHwrWkz
-TuOLrfjmbk5Oa/hIeiU3Tw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIMjFLm6KfUlwCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMYg3Juh9PlxBIIEyJ4mO7hlTqKh
+k7NAj6HLB6+haacdMnS8RPFW4lVUaKVfMrn0MZvIR+MI3gRmLsoT4c1si9MGZpn1
+Wiioj2RYpgC202/uP9A2J3ayVr7qwwgKxdedjJGZu3WaANt/tLt5zJo+wVG8xhLf
+1hjWa02UT/GmjduKI7hH1L4FwNAvTOXBeTKxtN3NsSCvmmpveCPhupLTly22Uh3S
+AJh7lCjE52lsB+ccwo0/VoEDFxU77/St+zzLW87ey81D9uHNP+FV4BDvF6slboMq
+Nawv1BtH/hr1MK3IBHuCUaMOTpgRycEHxwj+G85Qm6HcDa5jvWtyp30/xY32Gy9x
+fQZU1h5XpdScTRyGPjBUbHRo3+Zx0+zD6KOUB4KogH6yG8MWN7z6qnwk3xmtp4iE
+afm0LP/uwzTzKRXAHIWULvOtHSh/gFvWaFddkx490Qs+tXORrKoSAj/F90c9+uBT
+wVbbyd4rbz4FHmYUA1DBDi97MqniDjdGSi74e1zi1GalT5T/MoWr3Se7vudjt4XJ
+/hk6+q5LI/8zaU0S3l9jpuFntQEr96oSN7L4N7WOBGz+/uziw8RAU3eLcSzw05d6
+HawQryQhY4b01j6/G8hprXvXShZWzfnoJKi8Dm+WQSCxm/hzz0rDizV3NwCU7ouq
+Kt9EVplh2VJ5fMAwLOxgOu22+2HVuDgD1yKVZkLn1Zomjp+2dVCNGauzhdzbX46g
+9OBb2GL4kkRD2p89Q6S1hj7R8sPoBvPv+7NXH7WHcBd1M8BmBb7iSuyPf1BuUSG1
+jZP7L6kKFEt343H5O/us+/6kme4pBFpKwr5SRckjOHe3kF/HAuyk2Dj7jf/qrqWn
+K3855A9IobKPzBxoBMqbaTLNjeeGYXvkzO1ExrmyRwwwh+C/9oMfhgkAlIMbwnk9
+vEdDesek46XJQReEpmHUXN2pmGdRh1n7hU5cu3NHAMrzXo8vykmNki/uPu8iQeVE
+ggL+BptR1YUnzthVDqBEL1WQzIiDV5ADTOCsuMN8gH7PByu2skkOTrsyilO9lgW/
+4kfQmUDZZj/xp8x1pswW2cnXjQN85UO4HxhJBfCErl9aodHtGDYUXVjq8AcBWeds
+jpWgTMCmkOw0yQDmIAOhvo+DnSG61VDF/0z8rGjPdC3AYjVdcVHjYcD1gP6TBm52
+2Ryrv6F3hKgVj+nU/isH4/P+hwsEzW/TQHUlVaTabYSb41Cy6gIwRQ435o35w8oO
+ACsjdXDJHGzht3LODnuIUaBoxxIsRdsSfQ+gUF4e9uMyMv4ldavHJT1npCpZyBto
+inAXvhTIRkK49u/21ivYatTb+AvtwZOU/q29WRpWdjC+aD9rdmcBW+IRYSpUyEON
+wsYir1UH2hO5Y96CtjDouULLLlmcu6kN27kB7L2ZPkbA93Pr9gP3gzceEKbN4yul
+4kwex8Jtp+0BYaqRQSehC5xf8RbzSCPZlDxCZQwlAJo5sya/3D1gUGSPg60aFe/P
+A9LbO4kMUQT2Tz+lq3CC2EoD3cu3IHdQ2m6HmPgM8GgoOtwVr+cVoyg12piV8qsw
+Ev7XUpuSpcPUBXHaH9cjkCIIUSLLEI/MOfCTOLNr7Mnf2sM72qlQ8fDiP/TN1UcB
+MBHoLF9ZD3vFsJPkqJbL3Q==
  -----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 c36ab1223727055558869b006a45b1aee94101be..6548077eac1563b4fb7bddb6a47d398be2ee483c 100644 (file)

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 89f08308beb6aabef5f6530d0a683d44f15f44dc..0252089edecf342d87552d196bc6736d12f155f6 100644 (file)

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 89176e5b1355c85ea5022cc6e1cef3c0a7dc64bc..dc290b6a5e40a7309081c7dd33514bbf83dd3fe5 100644 (file)

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 89f08308beb6aabef5f6530d0a683d44f15f44dc..0252089edecf342d87552d196bc6736d12f155f6 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp

index 66863a501f7bc62204a845afbc529847df3e389f..d188555ec0b003cd9f3c8783e01da010f29e630b 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp

index 195d3fd84bf066fcac9f16a1e976f6b78c164dc1..96c2f3c3641479b211a9b1288f785d1b0b04d5fc 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp

index 195d3fd84bf066fcac9f16a1e976f6b78c164dc1..96c2f3c3641479b211a9b1288f785d1b0b04d5fc 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp

index 7e7e7f392d0da4ffcff750f76aa591d405fd19dd..0874c9e40ac266fa7d102d93f3971958622b1e0b 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp

index be3ae887920d588e2ee0f05755704dd8a7f47c82..de106be274037fc692bc7c8f5346f44a63d72a6c 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp

index be3ae887920d588e2ee0f05755704dd8a7f47c82..de106be274037fc692bc7c8f5346f44a63d72a6c 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.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 27d21ecae5d6a69a1fafed9740089b0fc8e4400c..cdd342f6b7e4c44613ece92e0d01293140e51b29 100644 (file)

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 ac858ed0e9e793e925eaf598de40915fb1e1c09d..6d7b61f217675182694c305fe29e0c0d3a9d41dc 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: revoked2.example.com
-    localKeyID: 17 70 E9 C3 AD B1 45 7E 44 8C 33 32 BA 18 40 C2 98 CD 86 18 
-subject=/CN=revoked2.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: 24 4D 08 5A A5 DE 4E CB C6 2F F7 DC 39 38 4C 47 2E FA 0B 2D 
+subject=CN = revoked2.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDA5WhcNMzcxMjAxMTI0MDA5WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANpsJV/G
-TKhcrSF1c3SIuSEFBsLM8Yr6RP+Ezrxafhfg3qm/DdVGwNbhoBjF+qobE28bYH5s
-hMSNGNWbbGCgzSLPXRNsAFbBkShPDr2IV+5q/9R9v6R3ejSoLEJtr0NLqGY+gDmJ
-lCGK0jRZmfUGBLjcMj1ZFCtSI4DCglgyTuGR73Ccd4Rf8dPqVYVZYcVnsKDgwlaD
-bglxa7Gz1n8rad8v4ZW5lnTi6iTm8uyRao+JgChxDdEHhv/4oiE/iYdTWOLnZ+L2
-W1cFaJ41fL6ayAinAcbADpI8TAsNGGeSqPhNCe3Ym3KtwfoXFqeVYZltlEvPuJVO
-N0y/oP0UrUclZe8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNDM3WhcNMzcxMjAxMTIzNDM3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG+euSn
+X99Xp+qy017RaJVEdVHxYhDrBGc2ds9FMy9sxO+RyhYAhQBC7NCqOFrSx6JHCIuQ
+cwl8FtfMRBdI73HMMml6/YrdKpsudEs6UcEvgsubqTeWyoBf077di/Q8bJ2rhJVi
+8K9UoviKzM2zEBHhaoS8MznmSbC1CVtH89zpf7YqdnvCbmGhr7ois6E0yPkL4OqC
+iZ0aiqBvOK5vShfZ/hqKArNGTqCAhUv2sPu5QziKnUFrhLG0ubDzEsqr+oz0Fkwg
+2dwl6HDfABdqxUWhoyaNRdN0TA4HWc9ASilqO7jE2C0YeQUUDHPxCpj2gIon4UbO
+sKpf5cWtg+FyQ/0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAKOYKTZN1lODE
-EnV7hacCK6RxFBwWXAot3lFesZ9afi8CdgIQe6nBjEFnjrzx7/sY43XiR7N27SZj
-4DXp+La2ZWluePljcsm0ybGBHfFNEKBwIRS0Xfjfp+OKxNsiRwmeYZzEoKqVLREh
-e+FaHFUKaoK/XR7RLeorra+ygodWNrcgaRSIaHDfY/VeHeejCnAnvBH7rf0Z3SNy
-Fx1KbQd+byXsaiTN8rHxag36PN4SKuhgeAkZ0fJrzLt70VNfcqvoFbZO4yyq9X62
-otq8k5MVgtLaFTOuQfI3NDdkudOfTvyfkR9tHQLwNxIlMZ42ikGn0hqJkVw0m5NK
-TPC7zpPj7A==
+ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAtiBqyoXE+5bI
+WodE/E5XQOI5Clvo54vh/G1gDLTe36NkGuRe+hhPmWeGDYavJDihNhdokB2GnQCy
+ZYqA/GHMOqrglXTAJY4q71/6XGXRIcvksQ9tCsXzltid1mQQxPYF0xeSwPmLSVCn
+FCItjOOhrG69ITlVd3mRRIG4mSKq47bxVtD12fsg/nbBHswGzSqEiMSuRHSxIFnA
+VK8vqa1kr/h65qPQw05ZYjzbbB8BY4EnIa/Q2KzLR7QGQvGifrN0G4OvfsJGvux4
+v8/Yl7+wX0VYIDAMw75NBLUV3LGSGdx65nWHcZKY/czbFLTB/vw1fvc2E+lhyn+P
+8m1vEIZAGQ==
  -----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 983e3dd4577eeb43fd438564f1a289f723895d04..0289a88174ec379b22c0c731bf8261597f15129e 100644 (file)
--- 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,27 +1,27 @@
  -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpAIBAAKCAQEAwb565Kdf31en6rLTXtFolUR1UfFiEOsEZzZ2z0UzL2zE75HK
+FgCFAELs0Ko4WtLHokcIi5BzCXwW18xEF0jvccwyaXr9it0qmy50SzpRwS+Cy5up
+N5bKgF/Tvt2L9DxsnauElWLwr1Si+IrMzbMQEeFqhLwzOeZJsLUJW0fz3Ol/tip2
+e8JuYaGvuiKzoTTI+Qvg6oKJnRqKoG84rm9KF9n+GooCs0ZOoICFS/aw+7lDOIqd
+QWuEsbS5sPMSyqv6jPQWTCDZ3CXocN8AF2rFRaGjJo1F03RMDgdZz0BKKWo7uMTY
+LRh5BRQMc/EKmPaAiifhRs6wql/lxa2D4XJD/QIDAQABAoIBAAHi9x24jC7yaBCu
+1W8UGUbG0rZNuZeSP586VmArUNXH4zJgAuNBoF9Bx5OP7MTkTjcEJmRRhO/qikBn
+XUxgFJt7kmFuO1TPADC1pu0/7/bdHb1vfRos+ON/dgzi6boi8n3QjesfJQUtYk7g
+RHabpUQ/ToMPYBeoEz9KFqwRtcwIt6+HgUuQ9LJYVne0URy2QyIZkGIhYY3CCriv
+P0UUg3EyOs4IfP1f563gzydbu0Qs7hVlbgV0IAmNmBoPqDh3zfiJV23lbgjvgxw5
+L0DwgbWkMIDk0xv8dyShjQgVOSkoCG18y3J+YuceHsyiXBeYz9LaD/nANUPDK9Iv
+y09QcQMCgYEA8+9DPIKFSm+yTmdG0NTgWqwBGzlaQQMjx9RWf9QlEA7A6tkaNvp5
++62oyc7U6xWtEGJycxz79Y9F1j3na8k4jntmFOZbL4uNo7wyHxq3dWUPRChv1cfk
+zKJ2xE7WuYl6ixzHWCfSTEn5JE0DQ09pbCIelJZxyb9/Fqv/S6chgOsCgYEAy1Oy
+aXstY9/em2gSlSoMa3s6lSRQl5Jv+6tqX8zN/sgtMvmDcWJ1p3o8NRp+yiXipH+B
+96TyAMntUnBEb4exKCM2s9BEUoRkGcFTswF6BYnUkcV8+gyqynaV3g5RIXzkSk7h
+YQQ0TFprPKAlUEwQOHG1qZAhZFr1TQ0hwIIWVLcCgYEAqQBiZ+DRshGSymkZEgP6
+cDdtCMyCcDpZps/BIgz7pJVkKRFC7UY6DxlwsGig8UJyRcC/JGu3UJjzvIvk8rNV
+gLmTrvUtxdH8zqzLWOtsoWPj4MfXO5ijNvd0K2unrqHGCe1lWvkz5PD3MKQ+l3rE
+QkudPjrBGRKYXT/Kv0JKnwMCgYA9hNxlZ9yK7HBZCvscYLWTS5ylBXDQ+4CgX/P2
+emwVW5G5a58mjkjU3HodAyA7n4zcgqvbNu/15yLEH63FJQQoBceGTkxtvxreZA0k
+Cx1VUaecV2mB6pU+XvTnU+OeQ0B7bzRn+zKrq2vo0veXPPxnZ5g0bqR7zb2Mi52b
+toB1LwKBgQDZSbKGlnx6JjJfgtUU92vHrOraVK5T/iSeiabtdvTvlwXfuSXvcRIG
+tXhqi8CWawOL2PJMNOp7a4yjnpOdB5zxz1rfqC3ywrp/rYTQzXoV0DACWwCekM06
+Ume+qb38R7gWJLzxlHvjL5LovUhAOMYRu3OTWCHW+gakqxO7P1dhuA==
  -----END RSA PRIVATE KEY-----
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 e9e7eaac610489020b5c25bd9574915fdf07b6f8..71a967ed7b5ca819bdae48dc8b2a9ecad955b4fd 100644 (file)
--- 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
@@ -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/server1.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert9.db

new file mode 100644 (file)

index 0000000..834624b

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.req b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.req

new file mode 100644 (file)

index 0000000..f679866

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp

new file mode 100644 (file)

index 0000000..4b5b49a

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem

index 9667e069caac67caffbde716d5961e8fd69d2d24..3f96da3b98cdeeb87e92eb7a524cdb2ab4f960b7 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem
@@ -3,50 +3,50 @@ OCSP Response Information:
         Response Type: Basic OCSP Response
         Version: 1
         Responder ID: CN=clica CA rsa,O=example.com
-       Produced At: Thu Oct 10 20:08:22 UTC 2019
+       Produced At: Thu Nov 01 12:34:56 UTC 2012
         Responses:
                 Certificate ID:
                         Hash Algorithm: SHA256
                         Issuer Name Hash: 5af082e51d62fe01fd706baebeb878db64e68f76e74a36f36d914297ddee24b8
-                       Issuer Key Hash: 333db14364b98e78a33dd8a4fae8d8378ea9b0f5fbca97b25685aa0d32116091
+                       Issuer Key Hash: 1439f364d603ee3e70759e20cccab27880185ed3beddc1a04ab663ceacb88320
                         Serial Number: 65
                 Certificate Status: good
-               This Update: Thu Oct 10 20:08:22 UTC 2019
-               Next Update: Tue Oct 09 20:08:22 UTC 2029
+               This Update: Thu Nov 01 12:34:56 UTC 2012
+               Next Update: Tue Nov 01 12:34:56 UTC 2022
                 Certificate ID:
                         Hash Algorithm: SHA256
                         Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109
-                       Issuer Key Hash: 208f9d28c7c0bc914144dfa8c0be3d5b3bfcebb622c8a8dc27e865fc06ca0e12
+                       Issuer Key Hash: 899186e0e346f52860fce4c9eb4479546af1688e44e6b7d6ccbffcc19a3e1380
                         Serial Number: 42
                 Certificate Status: good
-               This Update: Thu Oct 10 20:08:22 UTC 2019
-               Next Update: Tue Oct 09 20:08:22 UTC 2029
+               This Update: Thu Nov 01 12:34:56 UTC 2012
+               Next Update: Tue Nov 01 12:34:56 UTC 2022
                 Certificate ID:
                         Hash Algorithm: SHA256
                         Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109
-                       Issuer Key Hash: 208f9d28c7c0bc914144dfa8c0be3d5b3bfcebb622c8a8dc27e865fc06ca0e12
+                       Issuer Key Hash: 899186e0e346f52860fce4c9eb4479546af1688e44e6b7d6ccbffcc19a3e1380
                         Serial Number: 41
                 Certificate Status: good
-               This Update: Thu Oct 10 20:08:22 UTC 2019
-               Next Update: Tue Oct 09 20:08:22 UTC 2029
+               This Update: Thu Nov 01 12:34:56 UTC 2012
+               Next Update: Tue Nov 01 12:34:56 UTC 2022
         Extensions:
         Signature Algorithm: RSA-SHA256
  
  -----BEGIN OCSP RESPONSE-----
  MIIC/AoBAKCCAvUwggLxBgkrBgEFBQcwAQEEggLiMIIC3jCCAcahLzAtMRQwEgYD
-VQQKEwtleGFtcGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhGA8yMDE5MTAx
-MDIwMDgyMlowggGAMH4wVjANBglghkgBZQMEAgEFAAQgWvCC5R1i/gH9cGuuvrh4
-22Tmj3bnSjbzbZFCl93uJLgEIDM9sUNkuY54oz3YpPro2DeOqbD1+8qXslaFqg0y
-EWCRAgFlgAAYDzIwMTkxMDEwMjAwODIyWqARGA8yMDI5MTAwOTIwMDgyMlowfjBW
+VQQKEwtleGFtcGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhGA8yMDEyMTEw
+MTEyMzQ1NlowggGAMH4wVjANBglghkgBZQMEAgEFAAQgWvCC5R1i/gH9cGuuvrh4
+22Tmj3bnSjbzbZFCl93uJLgEIBQ582TWA+4+cHWeIMzKsniAGF7Tvt3BoEq2Y86s
+uIMgAgFlgAAYDzIwMTIxMTAxMTIzNDU2WqARGA8yMDIyMTEwMTEyMzQ1NlowfjBW
  MA0GCWCGSAFlAwQCAQUABCC/pydaVm79S+LfgtvZ0SkNRwGG9v8qzYwWZZ80KrVh
-CQQgII+dKMfAvJFBRN+owL49Wzv867YiyKjcJ+hl/AbKDhICAUKAABgPMjAxOTEw
-MTAyMDA4MjJaoBEYDzIwMjkxMDA5MjAwODIyWjB+MFYwDQYJYIZIAWUDBAIBBQAE
-IL+nJ1pWbv1L4t+C29nRKQ1HAYb2/yrNjBZlnzQqtWEJBCAgj50ox8C8kUFE36jA
-vj1bO/zrtiLIqNwn6GX8BsoOEgIBQYAAGA8yMDE5MTAxMDIwMDgyMlqgERgPMjAy
-OTEwMDkyMDA4MjJaMA0GCSqGSIb3DQEBCwUAA4IBAQBm8uLIawRny88oLSzr7sxj
-IgGjhC+S2OXWjAlTxErHoEsJ0JPKkQAt/s5YLy4IKiPbCg6CIm9KotgE4vnpMFjg
-297pSrdYKdtb2iBPKq5afB2Iv6ET78L/j2HhBFyJaxlt6lhI0Ly6JE75IbUrdP24
-c5uIh+KpJaC60bTZehgcRnrw9fR7HJ5W9ln9mbOZDggNQeM9hmFLUmQYPQWxav2x
-IjCYAZOfIp8ficETnLhuDuILsohFRnQnFAaf1YTgvW2zoKLMeLUWzMm8a6IoBpXQ
-0ecpPJs2FFiaYL78EcRNN47YbClcfDQRAjTvlSZupk59YuxedlwiH6uc7Cwa3RnN
+CQQgiZGG4ONG9Shg/OTJ60R5VGrxaI5E5rfWzL/8wZo+E4ACAUKAABgPMjAxMjEx
+MDExMjM0NTZaoBEYDzIwMjIxMTAxMTIzNDU2WjB+MFYwDQYJYIZIAWUDBAIBBQAE
+IL+nJ1pWbv1L4t+C29nRKQ1HAYb2/yrNjBZlnzQqtWEJBCCJkYbg40b1KGD85Mnr
+RHlUavFojkTmt9bMv/zBmj4TgAIBQYAAGA8yMDEyMTEwMTEyMzQ1NlqgERgPMjAy
+MjExMDExMjM0NTZaMA0GCSqGSIb3DQEBCwUAA4IBAQCHQqz54hLWg/hfTKEXPMW2
+3AcjwZdCNvcm+NcRXeU2X5jz0igwBrWvPixYcyV+AWJKwP3QDDUB01nPYKngbs4/
+Vm3B8bWmsbg4JGM+0Kcuhgk/gAz06itwYHJQ3NnoDJE6MMgByLm4+jaQhz3NukJS
+AfnrIe6c9RiS8r1lZT/oGD/S2fv7uzryJnqHFNUUU/MpRS7KatwVzokcVgsy9OO4
++7s+zBv0BLivXa8T3slUmwNcilpp4KWZZoZYRZLQq0f0p7AbAjP8D5/zWTGNhc/j
+kXh+hhSJGkssDKIlceLJd0jvK6rMMbU10xatsYcIGCAsWnnUJ7yoqVTtizLSTNpD
  -----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem

index 7b18f41a65e7b5bb3befbc82355f0ea15e49cf33..24c79dda8c4e0c83e3510cf7ead87287ee84da11 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
@@ -1,73 +1,79 @@
  Bag Attributes
      friendlyName: server1.example.com
-    localKeyID: 96 02 3B 95 F1 C2 AD 4B 75 AC 42 71 F3 78 57 B0 C8 87 09 06 
-subject=/CN=server1.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: 89 31 B1 63 D9 40 FC 4E 53 5B 74 5C 9D 84 BF 89 44 BF 9C 1A 
+subject=CN = server1.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM5NDVaFw0zNzEyMDExMjM5NDVaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWyGbgjJa
-2oOoufxk4SOCu9CIRT6tVZF30x6QkZu9D9q6qvTwDBxMBzFJ2GuEzjIpich6oxMP
-VV692sY/UUEHQVcePA6MA1olx3INNFKOJrYJ3ZplnPgjAQiZF+JjQ6PJpiLSUrf4
-WLLTk8V5FZRB9r8LLmIEgsEznATf1SAwBLwilVm0JjJtgYTmH4F1CLMxRt0t5NaM
-PMs/jksKp7C0I9AkqyboE4ilXBBfeA4Awp0g3/fP0o34N9wncfXuWbzBXU6Jumgq
-AyPdhZHwW8yjsRD4DW6D19fNxoDKZcnmDzciHYROfoc5eXWTqrW9NOqcg8ZvzxxD
-vqQ8rbvK6OXVAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM0MTBaFw0zNzEyMDExMjM0MTBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtbZpISqfD
+NaEF48SJXr1KhE4jBHGRNlY6Nx6AFSf5O9TBi9x1Ygoi1rkrYDvtXPID8uVHquzW
+JbjBnCnexrT5kJ/+VmdcvOQQeXFsRx31KvUXYY8HVfu+vDbEl8Mmwbhvf/CQCEAR
+grSWm/qAaqhlkcvEjYovlO/IspAmL3l/Ht3aH4nxFmx93FEgFb64AucM1CF7KzLM
+6hDM79Dh7kZND/gjchV6RpWMAHEFN2JKuWR0BCzg5XFcREdCpg9HG9zABhVzFUWP
+Z/SdU182PxGm/Tne1xNvvLuBgoqE/H3+h3m6AkZHJmRFpNfpzmisQ4Okf6VwdshB
+ewTyViFXBMEVAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CImFsdGVybmF0ZW5hbWUy
-LnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
-LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAr+/hCRxMXYOY0Xa1aY1Szf9NsqqQ7bXh
-SYYtXkT+yq4M0NTzmmSWy7/F7OzahIWkULrkqmv7xC8LTeG58wYyGCk+6Lv/uKoe
-ocldM+dI1CConMs6IiTOuX9EjGGxHVdN7W1wKUt2ofMFbH608rlEN/g340ddPlKa
-4IpX18/ISWVwa0qLgtzQQpMAhIwHVSAszB0RaYyhOPi2gIaWpp+OjIM31rGTDRRM
-m8Huv4hAyx1+K1yqcF2X5rwYNaCuuITur5Xy4tH0dbzQsM2q4UiQBKNTuyNZkmbr
-98uHnwjZ3CK1Sh/b3lXAt0jIsao+SF+o/Z89vom5O2k1HCtjAkZdSg==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiJh
+bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tghNzZXJ2ZXIxLmV4YW1w
+bGUuY29tgiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVz
+dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAlim4IX4uQI9MwKPkCMzQBoDNAswGPkgJ
++FiDt471gsrax/mfAptoR9Fpcgjm0X4rHL4mZuEEBUfkXUi9KmVYgKNc8YUbP/4J
+fqriqKYjjml2QVaLYXBA/+rifx4HGBhDX/wxj62T9NavGTbc9emudoeQhQ2L9XZw
+shxIzkEi1DXpdGtlBgTHz4YWgW5UbzvT33xVNr0EXKMdQswjGvWyPTAiGQ6gEOWP
+66WgKZs03jyGXAl3JvE4RgZSeb9/NXAV0AYfWlQW0qPfOKFD2gOe+ZAQ3DUE6src
+lPBqYD7SxVOiCqZivZUhIvIkuWYQCHsWiHWMbOLtksHIuqxtdmH+ww==
  -----END CERTIFICATE-----
  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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
+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
-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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/server1.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/key4.db

new file mode 100644 (file)

index 0000000..ede6e0c

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/server1.example.com/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/pkcs11.txt b/test/aux-fixed/exim-ca/example.com/server1.example.com/pkcs11.txt

new file mode 100644 (file)

index 0000000..30e236e
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='server1.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})
+
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 8b51a3466f2af61747e237d813f0b18d4df81f36..587d3262a99b802959a25fac56e0421af5617024 100644 (file)
--- 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,47 +1,49 @@
  Bag Attributes
      friendlyName: server1.example.com
-    localKeyID: 96 02 3B 95 F1 C2 AD 4B 75 AC 42 71 F3 78 57 B0 C8 87 09 06 
-subject=/CN=server1.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: 89 31 B1 63 D9 40 FC 4E 53 5B 74 5C 9D 84 BF 89 44 BF 9C 1A 
+subject=CN = server1.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM5NDVaFw0zNzEyMDExMjM5NDVaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWyGbgjJa
-2oOoufxk4SOCu9CIRT6tVZF30x6QkZu9D9q6qvTwDBxMBzFJ2GuEzjIpich6oxMP
-VV692sY/UUEHQVcePA6MA1olx3INNFKOJrYJ3ZplnPgjAQiZF+JjQ6PJpiLSUrf4
-WLLTk8V5FZRB9r8LLmIEgsEznATf1SAwBLwilVm0JjJtgYTmH4F1CLMxRt0t5NaM
-PMs/jksKp7C0I9AkqyboE4ilXBBfeA4Awp0g3/fP0o34N9wncfXuWbzBXU6Jumgq
-AyPdhZHwW8yjsRD4DW6D19fNxoDKZcnmDzciHYROfoc5eXWTqrW9NOqcg8ZvzxxD
-vqQ8rbvK6OXVAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM0MTBaFw0zNzEyMDExMjM0MTBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtbZpISqfD
+NaEF48SJXr1KhE4jBHGRNlY6Nx6AFSf5O9TBi9x1Ygoi1rkrYDvtXPID8uVHquzW
+JbjBnCnexrT5kJ/+VmdcvOQQeXFsRx31KvUXYY8HVfu+vDbEl8Mmwbhvf/CQCEAR
+grSWm/qAaqhlkcvEjYovlO/IspAmL3l/Ht3aH4nxFmx93FEgFb64AucM1CF7KzLM
+6hDM79Dh7kZND/gjchV6RpWMAHEFN2JKuWR0BCzg5XFcREdCpg9HG9zABhVzFUWP
+Z/SdU182PxGm/Tne1xNvvLuBgoqE/H3+h3m6AkZHJmRFpNfpzmisQ4Okf6VwdshB
+ewTyViFXBMEVAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CImFsdGVybmF0ZW5hbWUy
-LnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
-LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAr+/hCRxMXYOY0Xa1aY1Szf9NsqqQ7bXh
-SYYtXkT+yq4M0NTzmmSWy7/F7OzahIWkULrkqmv7xC8LTeG58wYyGCk+6Lv/uKoe
-ocldM+dI1CConMs6IiTOuX9EjGGxHVdN7W1wKUt2ofMFbH608rlEN/g340ddPlKa
-4IpX18/ISWVwa0qLgtzQQpMAhIwHVSAszB0RaYyhOPi2gIaWpp+OjIM31rGTDRRM
-m8Huv4hAyx1+K1yqcF2X5rwYNaCuuITur5Xy4tH0dbzQsM2q4UiQBKNTuyNZkmbr
-98uHnwjZ3CK1Sh/b3lXAt0jIsao+SF+o/Z89vom5O2k1HCtjAkZdSg==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiJh
+bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tghNzZXJ2ZXIxLmV4YW1w
+bGUuY29tgiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVz
+dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAlim4IX4uQI9MwKPkCMzQBoDNAswGPkgJ
++FiDt471gsrax/mfAptoR9Fpcgjm0X4rHL4mZuEEBUfkXUi9KmVYgKNc8YUbP/4J
+fqriqKYjjml2QVaLYXBA/+rifx4HGBhDX/wxj62T9NavGTbc9emudoeQhQ2L9XZw
+shxIzkEi1DXpdGtlBgTHz4YWgW5UbzvT33xVNr0EXKMdQswjGvWyPTAiGQ6gEOWP
+66WgKZs03jyGXAl3JvE4RgZSeb9/NXAV0AYfWlQW0qPfOKFD2gOe+ZAQ3DUE6src
+lPBqYD7SxVOiCqZivZUhIvIkuWYQCHsWiHWMbOLtksHIuqxtdmH+ww==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX\r
-DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT\r
+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\r
-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\r
+ggEKAoIBAQC57Q8ofMidWz0dTi9jEkJD7PinEs2neEViI6iGaEp1HQhaMa/DsvPP\r
+4EqfvvNevEQu2SQAOqfTwF2WcEdJeMrmEDM6aTNiqMJbn4EeYvjYeBo4ZvCB31uv\r
+qYbP8Fw0k6YWlvKtZ5jMmHY/o+hF3AqfidXgtp44H7Qy3URq+bMtbhFAvhJAS9Z/\r
+DqUbmbzQEG1Aklo7PV1jA4Vj3IJuBpYYk8mCtTTx9EGXu9uiCgy7JeCTW4Js0CpC\r
+fth+x+lEiuW1EfJ5cJQN3oLM0BsXrlgwQmQltjdA8eyv1LzC9bawgzg8Uv1o7al4\r
+dwr2kvLYuwiW1LfC+x4pLTq7xErLd6dJAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB\r
  BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G\r
-CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9\r
-It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB\r
-HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO\r
-a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas\r
-k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn\r
-ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
+CSqGSIb3DQEBCwUAA4IBAQB9MAlMhTHa/4KO/ClowRVFKpq2HrAiArEMgfGBRXle\r
+O6eFnz1Tq3t3d4ibZHOoGistqemNmtC82nJp5up02Z/yPVoFm93iaURpnmPqSxRR\r
+DmSPi43XTaiv9GDRglfeNDHZKi/6vuhQ3fvIk3RkOJIvn8rLCLPs6SxHgUXmACxq\r
+mA/1ngZYy9a+iKsTEVlQMmu6dxe8DTRI5bWbzvJukHlJK2ACCSjbakTcSu6YaTVd\r
+2vZQJ6gwhlc492GZwf6UyQVVZBN1R9ybvye9R6tGQjsWfgOo12kUecOsAJBTjLh6\r
+eEBOBHKjSopkcLOESlLWcfcfJfOBt38vhQpaFTWGzuTL
  -----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 8558180d8ddff21fd927c0792049e2b7e57ef9b2..b277fbe88f8840908dc65364ac0dd49b5bbfa340 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: server1.example.com
-    localKeyID: 96 02 3B 95 F1 C2 AD 4B 75 AC 42 71 F3 78 57 B0 C8 87 09 06 
+    localKeyID: 89 31 B1 63 D9 40 FC 4E 53 5B 74 5C 9D 84 BF 89 44 BF 9C 1A 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIr4ul6lREJhkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBDC9ZRlNIyqBIIEwMi4zvB674a8
-o1uOYlT3gWq2mfAdxjNKe1ul2DdObkEDbdH9LoSJGrdjymuLxltSwdi7j2YDlLTV
-iwerzyYy9ADerbVXY/FXx80WAihQVN6sPfOmS88zLJG7xRwNj/bfG9VGB5tgtd6H
-CrKBGYIxJ+uPogfEtQWUfHvEGB5qPv8jYsUTkNxtGjph/N/4yE6ar7LWv5yil0e0
-iLfyhwXRgBBiqywawFiy2D7BVJIFpaUmWeRKU+6KeRtjFxp2713EdrQIYVmJVK8V
-mHZFpMyBbcfizi4QqgEpjR7wHPCY3yd1WULMQ2KDsUAIJyzcrNz2iwUfl5vof4z5
-T9Eh9NTkCcaaBc89XEpWr8PHxF7tdDA8S/R7TgfG/DvWr/cssVlpvypkHZJLMKSi
-usneSVK3H+rjLzqIsVrSMV97YPzpj/Jfu8TSJAhO8OSLkeKHgt9+YH7YI36EVECX
-Frb1GUMsAK9lQeHEmFiWfM+2wsH5W5REkLHYvxYK+Vhm6iMoyStJwLXHPZ+sLjJW
-DQf+ygG74ZGM2rMR+zuXZXBAW1m6vWKXiy3WXMEgZQDLi0uPkJS1L6lkygyNciZF
-FvTDMbppDXMD8NDkUctztFjZn+y8AYY1pG0nEsUZCGtOrKMqI5hUIQXaagWtOIEP
-4WgYzDhxcjQVHlg0pdo6BbYk1O7qFlmiWWykIWCMig1dsxI9npm5NSKtKjW+USoE
-0ubZDwRe+xeAT0TtkLJ96x52LsQetZhnHBl5Lyj5/TAmeThfTda6CX7PFFDhWlV9
-n/eAc5QXU5fkW+K3iHKrqRHXz3yP+89nEwiZ2Co8gAVUIWuFVxpZHZ6GZ/Nade0J
-FlRoeIO4/1naY+YYLvzRdz+Rp58Yjmzy3jpdmnp3OoHxxRUBBitMpyWWENY2HOeW
-OF/RLdFRqOFLO6u3Io7/SzsajCmg8wxX0lTKNfBIMK4CtdtT+g0hQcJmxxyi3Rr5
-ueEtkTaTlMKsYLLExAB9T854+ZU53veLJZ8aC26cccjfh9W9Q9WCC512jpZbtI6D
-gxfrYqBTMA2LtvokzlmuP7/kIvT6XdWubkPTzWSZE5ATDrL/QFMK8ZwfLqjYg6nY
-YvBtVAFwJMjuEn4/V6Pj+ZzztNaNAEyWDwqJ3phjQlapNDX982ywEBITyOj3bBC6
-dQEbEAD6cyq4Bye6Nf7g/Ro2Nd4g1kvnvpehWJpO0ib+mUq0qc6CMI1kxFe8y07I
-jp5M0yknD8k7F1Qxv73neR9QEVFngM/17pHHJvxaH+/f/rwGsLTTIFwPLzC8Kpuy
-vMw+NaMo0lHN1C3mUPkQmYot4hcoiTc5PF7Y+LwVf7eW77fpfmGJsWPyxcht01nd
-nr0O/XDpcW6l+Esd3E8f7HlPNF5vtyWUi82+hMg8f8nKdKp0Spl/J5Jc6L/I3u3O
-woKAOWsN7tBZzXNK5sxZ7Rwu7u9yC+sQsKnP5W/T1E0oloXgxIWCHlyHX6fCmBom
-ECneWWaYc/sMgA637l5ABWsUBdJnlhWpf34qKJUyqNnmFY5J3ZXxHSAfQDXPb3MM
-6fWQnSy2UREZkbptZcZIbC710WziNCDs2fkdLtuAEf8KpwHod5OXmXn1ajikW4Nt
-No9rlGf+Qyk=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIV0zPSXlWGNYCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNBKBo4Wfu/qBIIEyAhJzJPdD/hF
+DOgn3N+MlOygxIvouBo/TcTiTstJrzD7430fmAaI9zcubJ1Mdm0IWD+f3mUHQEoU
+cy7CRNYq7dHj0H2c/jaapJHWS4pN2IPlK5AVXKyvnrrhW1ZeBBc6VyACE8q5aHTq
+n50AsJnCjsqpk1idfciZ/qbmRdm3KejsMMN9KNy81G1u92OIuWEf9luo8PztGgmM
+7H9gTRHvgzoZfLvC+GUea5lppSd53jp3y3e7DCMux4F0l01HiJOIsI+1CwCLqxzm
+PmdIgqf3fdWDOmErSBoK+Vcy72RLC/ntdgrWDlbKJR7ibZHSpkP6B/chrRp4342W
+r7vFGcK7pA78WGBXUuY7SgFJ6ZAPlJ2cVXn1qWf/CuSZ2AsyCPTsjZbiY5DFuJKK
+J2vNVK7wwJlwWIWTDms7rrWJHDXf/q0S0/n6712rLAflyNHlWsMj2871qDNc2Bmq
+WX5YZNuK726nJDHy93vXt/Y+2GnkonUdMW/Np1iD4Pkz+gm+cVeZoz+f+HmSg+ON
+NGReblT4mFN42HReyHHcL9mJLXM8sEAZURE2jxH/X2qty7vL2iWGOP4xJkfLhcNR
+1BO5ee7TOLYxVplBWsTVtQXGyX2F0FsS1FpDASXHtyU7Q2DdOMHdOKYJnNr5aL5f
+Mr8d/JRZbNH6QyUaSPXAZKCezqPEs6/io7oAHw6Ky02WKy/0e2m84rBsvsbLDya+
+qgNgCA8fJuWfpYKNn4diSh3MdDrJNOKiBV0yJfIBXAEHRaorQS1gEdeFk5AW/SoD
+insAhPml6gcQayUMECU7lAx17B8Ririj3II/Ozwm2KFD16qSpXgUdfqVF+akwbsl
+1eaBnAYIgaoZCUVcAr1+H+B7OE6uKN+Px531f/s6nxCIDTJni9OHtq8JkmgXjWUJ
+uW41CPbaQwjQ+juEU+RAmhAtnRgJZN/xbE7JI0BFjiqrG3spAI9MCzmRJ1+L8Eed
+t3iFckTOcFJ5+Pu1C1+p6KivTrFrE8HXX2JBYj9U/2g3e3HDXw1hvhB+taK2Uq6M
+n4x3dxSfZil52aF+9nJ3HHmRT6YzzqXyqLyaVNppYLOO99VhObTYmpuYtfnRl0w6
+6VkSHPE0OsZJ34Vgm4OlfNMOZ+11mv55PVuTwFX1ZpFRgAk3hrBcXvp2jne5WpmI
+BYC8dLWooM8WNLQOzyz2NqypIdukHSXYhatkb5Xm8W4cZ56ZpbZG5fezmfUbTdsI
+6o2++N70cFTVE4JLKJrwZkiZnttJis7POD4kim/ddkurr07Oo+MGvsl12DFjM219
+2XBo0Ls9bi2Sl0dpQ4pFimjgAMnAlUeELCc48KBDrvPpc26Ca9fNr3/s4VZGqZRV
+LjL+8s0HuOtEHKCz63FXj7lflZxod8LetJdOgbslX38pmC5N0ocIzBX5HLVm6Uxr
+zK3ubBIHd4VQ0rOtY5fFHWDwacMWMMOfAKl2yYPUAHSpBr/7kSK9Pdcl3LP5mVVT
+1DVnLL+QxhyzSC2KOFzrvU0xo1ekoj1P1G4iIz9ZkBIKXUXi62GiYzPCcclXGkRj
+9JvgJrfvJNJkt9ouOOwpctnZaLYaJhw4yZeQ7bSJUWM8lTzT36MKOAQ+52NliVXZ
+QW1fn5jZnF1XbbK6XfRmNQ==
  -----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 ae8413cff0e449819b1a268c038d7611b1ebabc9..dc3e5da5260ccbfb64a92ec7a28598d35efca2b9 100644 (file)

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 9d6ca3706ea591a41bfddb47480c035ad65d8692..91758bec29cf1452a276ad2d7c15b06196dc5009 100644 (file)

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 7ae023e0c64b4d9c3a3eb3da427487b3988ee2ed..77503bae2c057ad96cd707528e0f2b5e1150c7a5 100644 (file)

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 9fc9aef44e322a9eb352d02916982927140a6780..c36937cc299fa3952168e444dbc2e9360ebee8b7 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp

index f782d58dba2a95ef7e87e7614ae0d01b7553b5ac..738fd2c20c3906d95886837a92b4b362e98aafca 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp

index b8a33f912d1f8795efd5519ea7b66a1716e13f6a..1af1fe8ae95d1ecde96da5ab8ee443c753c0cabb 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp

index 6770e841be52c88bbfe838e2b28bd1d991398f5d..afce70e57991bb9a52374378b3d283120149a1af 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp

index 9c5f958d471beea06706f273bfbbc0cd2790470d..8f14d13fb3f2e0cda815e47e57027005f6935a11 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp

index 1338bb966a5ef901658d0a602e272e28284287a6..b223f9d54ec212d8c4945b3da5b8e4b4fc1221ed 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp.pem

new file mode 100644 (file)

index 0000000..09031de
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp.pem
@@ -0,0 +1,31 @@
+OCSP Response Information:
+       Response Status: Successful
+       Response Type: Basic OCSP Response
+       Version: 1
+       Responder ID: CN=clica Signing Cert rsa,O=example.com
+       Produced At: Thu Nov 01 12:34:56 UTC 2012
+       Responses:
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 5af082e51d62fe01fd706baebeb878db64e68f76e74a36f36d914297ddee24b8
+                       Issuer Key Hash: 1439f364d603ee3e70759e20cccab27880185ed3beddc1a04ab663ceacb88320
+                       Serial Number: 65
+               Certificate Status: good
+               This Update: Thu Nov 01 12:34:56 UTC 2012
+               Next Update: Tue Nov 01 12:34:56 UTC 2022
+       Extensions:
+       Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIICBAoBAKCCAf0wggH5BgkrBgEFBQcwAQEEggHqMIIB5jCBz6E5MDcxFDASBgNV
+BAoTC2V4YW1wbGUuY29tMR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNh
+GA8yMDEyMTEwMTEyMzQ1NlowgYAwfjBWMA0GCWCGSAFlAwQCAQUABCBa8ILlHWL+
+Af1wa66+uHjbZOaPdudKNvNtkUKX3e4kuAQgFDnzZNYD7j5wdZ4gzMqyeIAYXtO+
+3cGgSrZjzqy4gyACAWWAABgPMjAxMjExMDExMjM0NTZaoBEYDzIwMjIxMTAxMTIz
+NDU2WjANBgkqhkiG9w0BAQsFAAOCAQEAbvb4TdSVSTW8dUSKr7NxKvq+EJ4qojCf
+MMxfzuX4bfsfcsC06o+TVJWlcoCcMxnRFe2KUYY2rNANbUM5d02F5flHw7jynEjM
+sn29RrW1l77z65lF2rmmEp5ciT5iv0m8cmEnMi+nTPisXBkxsa/OLk8xAmfn1nOY
+PVwDtAlRBpoISyU9T0Wev6rIS643aoA89Cqe/lgR9SyX5lIDdRGySzjdwAGuZY5h
+H97dPJ/ack+FJ4vS/EuO9mKWTDsH2dH2uZJ5QegN3xqCA0VW2CNb9wrhsr2hgOIc
+ovCXUTdIl1wUDX6xMoW9HW9pqLei9nPo3QwDCVqV/0lFaM+Gpho2tA==
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp

index d2dc8faa28081a96835644a579ec5e304857784b..cd4aa9cdfe7fd19e020aab214b8821749b297c93 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.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 cb8460238cc90b46994b886d391c1a6772340f8f..5c001dced6014d731a96106f64e814604f463d91 100644 (file)

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 c4fd61323800b60e8ebebf7613ab262672a5fdd3..4412220071d9d3f09bf4eba5a830f1986ba30e59 100644 (file)
--- 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,28 +1,30 @@
  Bag Attributes
      friendlyName: server1.example.com
-    localKeyID: 96 02 3B 95 F1 C2 AD 4B 75 AC 42 71 F3 78 57 B0 C8 87 09 06 
-subject=/CN=server1.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: 89 31 B1 63 D9 40 FC 4E 53 5B 74 5C 9D 84 BF 89 44 BF 9C 1A 
+subject=CN = server1.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM5NDVaFw0zNzEyMDExMjM5NDVaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWyGbgjJa
-2oOoufxk4SOCu9CIRT6tVZF30x6QkZu9D9q6qvTwDBxMBzFJ2GuEzjIpich6oxMP
-VV692sY/UUEHQVcePA6MA1olx3INNFKOJrYJ3ZplnPgjAQiZF+JjQ6PJpiLSUrf4
-WLLTk8V5FZRB9r8LLmIEgsEznATf1SAwBLwilVm0JjJtgYTmH4F1CLMxRt0t5NaM
-PMs/jksKp7C0I9AkqyboE4ilXBBfeA4Awp0g3/fP0o34N9wncfXuWbzBXU6Jumgq
-AyPdhZHwW8yjsRD4DW6D19fNxoDKZcnmDzciHYROfoc5eXWTqrW9NOqcg8ZvzxxD
-vqQ8rbvK6OXVAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM0MTBaFw0zNzEyMDExMjM0MTBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtbZpISqfD
+NaEF48SJXr1KhE4jBHGRNlY6Nx6AFSf5O9TBi9x1Ygoi1rkrYDvtXPID8uVHquzW
+JbjBnCnexrT5kJ/+VmdcvOQQeXFsRx31KvUXYY8HVfu+vDbEl8Mmwbhvf/CQCEAR
+grSWm/qAaqhlkcvEjYovlO/IspAmL3l/Ht3aH4nxFmx93FEgFb64AucM1CF7KzLM
+6hDM79Dh7kZND/gjchV6RpWMAHEFN2JKuWR0BCzg5XFcREdCpg9HG9zABhVzFUWP
+Z/SdU182PxGm/Tne1xNvvLuBgoqE/H3+h3m6AkZHJmRFpNfpzmisQ4Okf6VwdshB
+ewTyViFXBMEVAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CImFsdGVybmF0ZW5hbWUy
-LnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
-LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAr+/hCRxMXYOY0Xa1aY1Szf9NsqqQ7bXh
-SYYtXkT+yq4M0NTzmmSWy7/F7OzahIWkULrkqmv7xC8LTeG58wYyGCk+6Lv/uKoe
-ocldM+dI1CConMs6IiTOuX9EjGGxHVdN7W1wKUt2ofMFbH608rlEN/g340ddPlKa
-4IpX18/ISWVwa0qLgtzQQpMAhIwHVSAszB0RaYyhOPi2gIaWpp+OjIM31rGTDRRM
-m8Huv4hAyx1+K1yqcF2X5rwYNaCuuITur5Xy4tH0dbzQsM2q4UiQBKNTuyNZkmbr
-98uHnwjZ3CK1Sh/b3lXAt0jIsao+SF+o/Z89vom5O2k1HCtjAkZdSg==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiJh
+bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tghNzZXJ2ZXIxLmV4YW1w
+bGUuY29tgiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVz
+dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAlim4IX4uQI9MwKPkCMzQBoDNAswGPkgJ
++FiDt471gsrax/mfAptoR9Fpcgjm0X4rHL4mZuEEBUfkXUi9KmVYgKNc8YUbP/4J
+fqriqKYjjml2QVaLYXBA/+rifx4HGBhDX/wxj62T9NavGTbc9emudoeQhQ2L9XZw
+shxIzkEi1DXpdGtlBgTHz4YWgW5UbzvT33xVNr0EXKMdQswjGvWyPTAiGQ6gEOWP
+66WgKZs03jyGXAl3JvE4RgZSeb9/NXAV0AYfWlQW0qPfOKFD2gOe+ZAQ3DUE6src
+lPBqYD7SxVOiCqZivZUhIvIkuWYQCHsWiHWMbOLtksHIuqxtdmH+ww==
  -----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 5a8185ab18b86a117e581b5a2233563b3079438d..f20a52e46dded870b160c1912b987160c313cfcc 100644 (file)
--- 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,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/server1_ec.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem

deleted file mode 100644 (file)

index e9e7eaa..0000000
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
+++ /dev/null
@@ -1,45 +0,0 @@
-Bag Attributes
-    friendlyName: Signing Cert rsa
-subject=/O=example.com/CN=clica Signing Cert rsa
-issuer=/O=example.com/CN=clica CA rsa
------BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
-DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
-ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
-jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
-mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
-4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
-fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
-BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
-It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
-HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
-a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
-k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
-ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
------END CERTIFICATE-----
-Bag Attributes
-    friendlyName: Certificate Authority rsa
-subject=/O=example.com/CN=clica CA rsa
-issuer=/O=example.com/CN=clica CA rsa
------BEGIN CERTIFICATE-----
-MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
-DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
-ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
-YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
-/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
-ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
-Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
-OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
-sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
-NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
-Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
-PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
-BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
------END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert9.db

new file mode 100644 (file)

index 0000000..5156ec7

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key4.db

new file mode 100644 (file)

index 0000000..19c982a

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/pkcs11.txt b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/pkcs11.txt

new file mode 100644 (file)

index 0000000..d0a760e
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='server1_ec.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})
+
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/pwdfile b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/pwdfile

deleted file mode 100644 (file)

index f3097ab..0000000
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/pwdfile
+++ /dev/null
@@ -1 +0,0 @@
-password
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem

deleted file mode 100644 (file)

index 06f2c14..0000000
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
+++ /dev/null
@@ -1,44 +0,0 @@
-Bag Attributes
-    friendlyName: server1_ec.example.com
-    localKeyID: 21 98 F7 5F 05 37 D9 9D F9 1E CE 3F 4E B5 F5 54 D8 EA 40 33 
-subject=/CN=server1_ec.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
------BEGIN CERTIFICATE-----
-MIIDLzCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
-bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MTM5WhcNMzcxMjAxMTI0MTM5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAKq2F5c91EGNJ
-FjZUvOuymJPkyWGijmOAsiuidgqe0NFK4I9IguYJt6kGUYWgBfXZSgynuxupSsq7
-0UPmn7HZK2sA8UE0mS7ZOTB9kvUwAm/vlORcUf1ZgxZMR2PYj31y+fX7/WcR2wUV
-qociI+J6CP81IQfFWj+UjnJPfwtY3qwHvmKjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
-MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
-JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
-AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIITc2VydmVyMS5leGFtcGxlLmNvbYIWc2VydmVyMV9lYy5leGFtcGxl
-LmNvbYIJKi50ZXN0LmV4MA0GCSqGSIb3DQEBCwUAA4IBAQBaDGZd2+pIuZ+ZgEif
-ANNPihHmfwSoNSHlddVk97hAXvsYexhG/Guyyv4zBQ7Q9SmQ46T/StHwrbslG27u
-ceJCWETm4/GKcwxcODDZWTsl5mE1XudE0mRPTJVfntF2d1lb2Hi9N5+qYcwq3v0u
-hH0eqxihPfHhJr/hUDcA3ULOYqhK6ECj+QYSix9oko4hocs/bEhCpkA59xWtW0f5
-5n//9dEWlT6cNmY2pOxXHYDihZSHuCOe5PTM336K+e/Pgei0jBbmy/42wRmOYle5
-hGDmrKes7NeM+D66UgT8DG7O1DmFF1HyoFKyqKp7hkygjf7Z8XbYb1B+7CledfeP
-HtR5
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt\r
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX\r
-DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT\r
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw\r
-ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG\r
-ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN\r
-jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw\r
-mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ\r
-4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu\r
-fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB\r
-BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G\r
-CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9\r
-It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB\r
-HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO\r
-a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas\r
-k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn\r
-ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
------END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key

deleted file mode 100644 (file)

index f8702ca..0000000
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
+++ /dev/null
@@ -1,13 +0,0 @@
-Bag Attributes
-    friendlyName: server1_ec.example.com
-    localKeyID: 21 98 F7 5F 05 37 D9 9D F9 1E CE 3F 4E B5 F5 54 D8 EA 40 33 
-Key Attributes: <No Attributes>
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHgLwt5itRPcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBmpIMX84oyhBIH41rR0+rt1gLaH
-/eJcH1f5sjyeuRmgeIW5dc4MZm9dvKNfCqEoJSI7Lbhx5Q3C+eOGb1EBcgPb5RB4
-JPYzuJ/X62Ycx9AJE3F0hS/6qguX9PYcJgEUGvCs36oDU1EJ8+CvFCx2WM6DN5UN
-oWQ+guQ7vPqCUeJe84QWJqK1i6Dce+UyhgL7aTj7GUyYnssbApbkYV88W62Huwbc
-Tfca7ZatpkfcuWsdedYBT3w8T/FV34BB6lyqAhm5cwH+GJrgJe4krpmy8VWk6ZcV
-qM+JLwmS1aL0ZYSryEZt5YtgC+hmZQ6fwnkvkgPxd4yazIJRQGKJrPSGiD+QzEg=
------END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12

deleted file mode 100644 (file)

index 2e3bde6..0000000

Binary files a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12 and /dev/null differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem

deleted file mode 100644 (file)

index 941ba32..0000000
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
+++ /dev/null
@@ -1,25 +0,0 @@
-Bag Attributes
-    friendlyName: server1_ec.example.com
-    localKeyID: 21 98 F7 5F 05 37 D9 9D F9 1E CE 3F 4E B5 F5 54 D8 EA 40 33 
-subject=/CN=server1_ec.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
------BEGIN CERTIFICATE-----
-MIIDLzCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
-bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MTM5WhcNMzcxMjAxMTI0MTM5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAKq2F5c91EGNJ
-FjZUvOuymJPkyWGijmOAsiuidgqe0NFK4I9IguYJt6kGUYWgBfXZSgynuxupSsq7
-0UPmn7HZK2sA8UE0mS7ZOTB9kvUwAm/vlORcUf1ZgxZMR2PYj31y+fX7/WcR2wUV
-qociI+J6CP81IQfFWj+UjnJPfwtY3qwHvmKjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
-MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
-JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
-AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIITc2VydmVyMS5leGFtcGxlLmNvbYIWc2VydmVyMV9lYy5leGFtcGxl
-LmNvbYIJKi50ZXN0LmV4MA0GCSqGSIb3DQEBCwUAA4IBAQBaDGZd2+pIuZ+ZgEif
-ANNPihHmfwSoNSHlddVk97hAXvsYexhG/Guyyv4zBQ7Q9SmQ46T/StHwrbslG27u
-ceJCWETm4/GKcwxcODDZWTsl5mE1XudE0mRPTJVfntF2d1lb2Hi9N5+qYcwq3v0u
-hH0eqxihPfHhJr/hUDcA3ULOYqhK6ECj+QYSix9oko4hocs/bEhCpkA59xWtW0f5
-5n//9dEWlT6cNmY2pOxXHYDihZSHuCOe5PTM336K+e/Pgei0jBbmy/42wRmOYle5
-hGDmrKes7NeM+D66UgT8DG7O1DmFF1HyoFKyqKp7hkygjf7Z8XbYb1B+7CledfeP
-HtR5
------END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key

deleted file mode 100644 (file)

index 0233320..0000000
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIAXgREqrH/QSRC3hg0WBm5uicFgfLOV2J5OrPxubzy5npUqu5EnNV/
-jt8iMnFhX8RpBrawhVx0JBWYJm10jqjo3lKgBwYFK4EEACOhgYkDgYYABAAqrYXl
-z3UQY0kWNlS867KYk+TJYaKOY4CyK6J2Cp7Q0Urgj0iC5gm3qQZRhaAF9dlKDKe7
-G6lKyrvRQ+afsdkrawDxQTSZLtk5MH2S9TACb++U5FxR/VmDFkxHY9iPfXL59fv9
-ZxHbBRWqhyIj4noI/zUhB8VaP5SOck9/C1jerAe+Yg==
------END EC 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 e9e7eaac610489020b5c25bd9574915fdf07b6f8..71a967ed7b5ca819bdae48dc8b2a9ecad955b4fd 100644 (file)
--- 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
@@ -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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
+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
-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
+CSqGSIb3DQEBCwUAA4IBAQB9MAlMhTHa/4KO/ClowRVFKpq2HrAiArEMgfGBRXle
+O6eFnz1Tq3t3d4ibZHOoGistqemNmtC82nJp5up02Z/yPVoFm93iaURpnmPqSxRR
+DmSPi43XTaiv9GDRglfeNDHZKi/6vuhQ3fvIk3RkOJIvn8rLCLPs6SxHgUXmACxq
+mA/1ngZYy9a+iKsTEVlQMmu6dxe8DTRI5bWbzvJukHlJK2ACCSjbakTcSu6YaTVd
+2vZQJ6gwhlc492GZwf6UyQVVZBN1R9ybvye9R6tGQjsWfgOo12kUecOsAJBTjLh6
+eEBOBHKjSopkcLOESlLWcfcfJfOBt38vhQpaFTWGzuTL
  -----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/server2.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert9.db

new file mode 100644 (file)

index 0000000..118c0e8

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem

index bc98021b594584507875f2cc04a46d586abb5c90..3e5c5a2cb312a422ee8884a82cf395e792334ef0 100644 (file)
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
@@ -1,72 +1,78 @@
  Bag Attributes
      friendlyName: server2.example.com
-    localKeyID: E7 5D 53 7E 47 87 58 01 05 05 D4 F3 39 B0 0D FD 73 72 80 88 
-subject=/CN=server2.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: DE 73 72 22 04 24 60 A4 9F 3E 53 A3 FE 05 B9 31 3E 57 32 7B 
+subject=CN = server2.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2I
-gy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSod
-F3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xw
-PCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYG
-OhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNS
-gCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59Ytxx
-JC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNDMwWhcNMzcxMjAxMTIzNDMwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHHdAsbL
+WHT6remjd2Rw+Tb1EDjDgHkhc6X2d3KyEvcNkbp+RMhyC0grYbue0tOp8SU+3U+T
+jLAsc3xesuGJYmsC8ttWf3fNOCM7TmE80fSzbZ4j6B8z6jbGT+fblaunHTRJF5H+
+yRKrV+Nfi7Pqu0YO3dnlGuehg8jjDUq3QrPTSU67P7DyDQv68cgWmck4h9OOC/T8
+1hkNJk99ThWMkTkj8WsmdLVysK8suaniNuhDQvRmF/OZBUGb6hqEdRYDz3rIjrEN
+HCtOygPFtZhc/YNSYMokIcJw3mTPLwTE0GbCfLowhkjPYW6J7ZuOlTTQqF/9b3yI
+YTpmm8sGVacEEwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
  UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
  IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
-LmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6
-/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPD
-hmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJ
-hJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6
-XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovd
-VVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY=
+LmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
+bXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAF0sjdy/RXldYI5XCP4Q2p006+aw
+sFuIFnCXC6u0HKgEmUCEG+1FbPwwnPLyRCjzdiigFEmfoQCsK8+IaOq8IdJLKfpe
+ONh4Uq4O2O8ghPNDigXqF/c3iaibOrpBJtLkD6Uh9sHnFZCwxFsr0AUj54RFdySx
+NI8koJtpOVIK7LM4HnBHYCPq9z3HDCDe3dVvVnbbdCTEThPh7gq1wXKVOAgRvOT+
+1b5fgB1dyUi4QENaPir6u+ffKXnSwjot9EsC8cMFiISatK8DwFUrcrC69DtdCY9u
+BipSDaRKOAYsw0yDqZHZau2lof5nRJcs8flPNh+SVwx2etPgbwRyEduuS0I=
  -----END CERTIFICATE-----
  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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
+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
-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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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
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
-DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
-ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
-YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
-/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
-ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
-Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
-OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
-sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
-NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
-Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
-PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
-BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwNFoX
+DTM4MDEwMTEyMzQwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1b
+tim0Z25i2AiUaj5C14cHUFGHvw7znhXymc5hYMI7A3Bde/1j53/IqEyyA2emh8sX
+au+Xe8CbgRwXqnZ3pFDsk73Exgz1vVwqglvyNe62LKS7UZXuzIZLf6JWSjtOtAox
+gLcVJjIURzePYwvl4X5HIktRX+PjpUq8HtrgIoZR5sNyQP8S96oerT/vJZoaYWgJ
+YJJtmxlCHBEMenRGhpsGeMP6SmYIp4a67s8NPGgDCW5tPjKFee28dlbgSO6HlGHQ
+FGpCPBMJvwGr1og+u99zA01zjQrFmlrb7tanh6SEecqhQvRP0QLYf1yuRA6tlKAS
+z+G9pfv5/pTU+neqarUCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAC+e7chFlJGjl1tPpWCWx75A
+KAwZJajsKS4JHOaVAB2OlruAe9dhPjeL1R03Jvg+xQsH+3mcD+2VWJAaQkmXm8We
+8/I7/0GwdP+OJASVn4WTs3X0OIAcJX0u4eT0p7ptiWxsMMEZlkeinefHigtU6/Ed
+rwqEh37FdBmwzuP3749eKr2210m5rDEqMIrAW/iotJ3Kt+LnFAkVVJwKCRY4PDKX
+MlFm0sL7XNi4iygj1+VMeJFVCxUrEIcE9NBVP/7I9CfKTVt1ecXf77LpHL6vCxN7
+2n+idjR/0DRCvpRszvc2we7zT2GqulTXO2f3R1+izqr9jZIJRiHev38euEsAyKY=
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/key4.db

new file mode 100644 (file)

index 0000000..8c3f971

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.com/server2.example.com/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/pkcs11.txt b/test/aux-fixed/exim-ca/example.com/server2.example.com/pkcs11.txt

new file mode 100644 (file)

index 0000000..6f1fafe
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='server2.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})
+
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 3e0cec0c812d82dcd100c20830e39982d5f5998e..74240f2225ea4d1620b12d8a355b84534270aacc 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: server2.example.com
-    localKeyID: E7 5D 53 7E 47 87 58 01 05 05 D4 F3 39 B0 0D FD 73 72 80 88 
-subject=/CN=server2.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: DE 73 72 22 04 24 60 A4 9F 3E 53 A3 FE 05 B9 31 3E 57 32 7B 
+subject=CN = server2.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2I
-gy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSod
-F3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xw
-PCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYG
-OhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNS
-gCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59Ytxx
-JC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNDMwWhcNMzcxMjAxMTIzNDMwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHHdAsbL
+WHT6remjd2Rw+Tb1EDjDgHkhc6X2d3KyEvcNkbp+RMhyC0grYbue0tOp8SU+3U+T
+jLAsc3xesuGJYmsC8ttWf3fNOCM7TmE80fSzbZ4j6B8z6jbGT+fblaunHTRJF5H+
+yRKrV+Nfi7Pqu0YO3dnlGuehg8jjDUq3QrPTSU67P7DyDQv68cgWmck4h9OOC/T8
+1hkNJk99ThWMkTkj8WsmdLVysK8suaniNuhDQvRmF/OZBUGb6hqEdRYDz3rIjrEN
+HCtOygPFtZhc/YNSYMokIcJw3mTPLwTE0GbCfLowhkjPYW6J7ZuOlTTQqF/9b3yI
+YTpmm8sGVacEEwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
  UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
  IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
-LmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6
-/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPD
-hmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJ
-hJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6
-XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovd
-VVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY=
+LmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
+bXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAF0sjdy/RXldYI5XCP4Q2p006+aw
+sFuIFnCXC6u0HKgEmUCEG+1FbPwwnPLyRCjzdiigFEmfoQCsK8+IaOq8IdJLKfpe
+ONh4Uq4O2O8ghPNDigXqF/c3iaibOrpBJtLkD6Uh9sHnFZCwxFsr0AUj54RFdySx
+NI8koJtpOVIK7LM4HnBHYCPq9z3HDCDe3dVvVnbbdCTEThPh7gq1wXKVOAgRvOT+
+1b5fgB1dyUi4QENaPir6u+ffKXnSwjot9EsC8cMFiISatK8DwFUrcrC69DtdCY9u
+BipSDaRKOAYsw0yDqZHZau2lof5nRJcs8flPNh+SVwx2etPgbwRyEduuS0I=
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwNloX\r
+DTM4MDEwMTEyMzQwNlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT\r
  FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw\r
-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\r
+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\r
-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
+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
  -----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 e7abe7a6ddfa2fe657f8db740f74fea3a1cf68d1..8b0428937571383a6eb366b1cb3e27c43b1d5739 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: server2.example.com
-    localKeyID: E7 5D 53 7E 47 87 58 01 05 05 D4 F3 39 B0 0D FD 73 72 80 88 
+    localKeyID: DE 73 72 22 04 24 60 A4 9F 3E 53 A3 FE 05 B9 31 3E 57 32 7B 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIViD8TCcfKtwCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECD2BIv3q2AntBIIEyPXAhb7sVFtw
-6FSNVDiAly+eqpCjgibtAw5zYfRo+GAFkC6WL6k6oCwQdFjffvccrZ357rCNVe0I
-J7aA28/+P6zD6QV4tmcj94ZMgssCdra4ydgIxKw/sgWcCAnRWmejRYYwpnJt1utt
-sPnjMQjbbhmCKiTE0A9k1Xse403ANWxMPhqLyFxqIoulS3BcGRu7rPiNqnIgs4uU
-oU4OziZs63Gr50S5zMIYm9IZoK98XkQQDB4wIhLfmRuNVxJU64zcNIw3/cK8tzmT
-e5tQxtWAsVp1+aLfmAeDSDjZxnhK1zQfTVdz0Ab/5xWvCL6M4r+wo7B9ClWQYuMk
-VTGuMWlLZXM/ni3bwjp3+1NlNaeIYSG3tgkqd1ZPvsCjqP4y/a4xsdPmhot6Wjnu
-RAMd7GryO9UN/j/g/eg2FQXqWfcRB3X2FJo3HLgR85Fml5LTGqS2C05uftc5i/GG
-ZKxoQH5MQFgjsYyVTKWQxw4oLtiTpf8xm5Gu9yYRhl+LwpdFMteELr3TbeoASuCq
-mgjNxn4I7wi+8M+IF7Dlqsp3LdvINzEfCgbwF4a/tjGX/Bh86oJww7ixia0zTw7H
-JNfZhp0fxdFCUEXS9IbnbGPurgbh8pRxocemObTaSKt1HJXspIH5hmwajwXRm/O1
-kTq0IkYPsEG46APAfOk4komydnuRYUmZbZopwwenHI+O15GfF7SIDDQ2cYG7RivY
-ueV5NIlV3jdscZAYJx71Jl+sp/kjYcEiFliDoEoShGZh4/RZhkUc9un73iISbs15
-0a0bJ7+LvDuDhIFiZpKdY3MzIUmJgl6XNwMumo8MSI39+jzeYQ6HHLNc4BVkiTn8
-j+ErL9F9YZ9fIlMRzWkNvbnxSfaEMVhrYo25AJjhOekVftqRWI32HMGpv/ltQ71h
-08FGr7v7E3sUQXeAI96wApDYMwVb8g9z/O2Ias4npxOmzTHvNXcfhZFoS/v5RsxB
-i4w8VrWTBLG8meg3Jar7SvTBq0Bw+zPHSDKJ7C4jZIgn9e2p8HoynSXqDO6vGEgq
-51qBNqUjHaU6VsKD6RaEb84D+WnFNWH9ulhpMkptURD0M2vuY7vtzS9QHUmGX66H
-vhmxAB3AM4YA2ZEPfeLE1wkN5OiDpfmXHQzti9Ucnc3fhuHs3ooQ7YMgPzKMMsa/
-OY/SvJRwo6ErNkOctuZGCs0AWqoANBDXZikD6vWpOZy6euMwT4X6RlaxIuoJOKzs
-JsyiZjM6h0ilh/IYB5/+oiJQLB6bxfUGgFawsX9RacFRxvdHuijt1Wni5VWMCNsr
-UVnaf9AA1c3B8cITGG2G6w0BXcTDSacZgEb0GI73pRMvCTUEJ0s9Vnc9Y4Lr5Edd
-rC/NYupYlGcxA5ATqiapR5rEiCqjHT95HelJhVPyrqWHhT6qsIMPo/DYcVuH9w6N
-LohyXPMn0QJnq1bBYmETjnep6eHtFeE8dFtXXcKMBrI/uM1dqv6OUV7k3ZiSDYOg
-17TcczOle5r4g/GhqL3cPcOC6tAkVCSg5KY6PJkS3f60RvJCPR126U6sf2AHPOm0
-juuKFc+fU3cTddfeBBWwRgeLcRXvoMpnidfVwS7WuH9scqvvkWh7111LUZUmQVUw
-6n2lsTnPTJlTTOcEjWs9Rg==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIT4FvYOjOEAgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCL9Ir9dKEKQBIIEyL0jmovJAU2N
+4/OCNHMLO8aF+WGLEy9EtQcQ63W7zMJWXX8e2ETpdmg2BFgj4JShKnYbZUpik9+P
+fEy8ZYtfQwfqT2xtLwVkBI5m/aFDNJgmfWUYYOA8rhvEJ9tbkL59lqVehPvy5Ujg
+2IqnbNcWn9Pnoi/bC3GvsSd7v8wlt9Lkdc9qOI+DQGj9YuYFHCGI68UKVSEBvqZ0
+3QYap8I4haXxrQ2tX0nED2Om+dUw/DhywhnA8EIdSfx7JS47N1cMgyT2l733e9b/
+vbiXyOI2Za69o/wWUTInDaPs+xLQez64wc5PVrG4Te5h0Z8l1Kms1BU00oPY8xfH
+8J1rfxFPEOaISkflsFS65wO+CUHwpLz8C0b4+MB3tNlNT+NVeHzeOiXsw6U6LIg3
+WaMQdafC98tyIQYU4blevzQRBxWl09nwF+HJXi8U12xnxdj09Xsz7XBi/q2O1V46
+Clq5owDnnuZ8ceNBdxRbfWpb51gZOx0jTRAHSvJ7fAy1bD/JCcb4cm/qLQRj+5nS
+gc1MoY+fZcsLC36Q7G1RqdsJRdRRjfpgHJisxn8kBlb2Be56yTcgje8MGkGxPopW
+BgPNeUR84teS+K/oi6EjPmHwbBTC3cDhsS6wtzf5RVfQPxFacoh5hWFumD4eOrLl
+CTDTxKQ50IIlpAGkZrm2iKSdNjwz9sNDqbzxXkJ8eDvwO1BQJkMxjTZ1SXTP1JO5
+oZq9uAUSumOx1mEJYlbxD3EgipIrcwYjt13VkCimf9g8983W4i9ptbkDjoYb39Lb
+PFsnkzkk2kfjtIsTOmCi1q2vnvraGiF4o1k3MHglMgx9/XVPKcHGp1X4uTebX2LL
+0AgfS2TszWzXX/4NOG7jcNwcs7Jyu9qaI+T6nyh6B0nzIACNzd/HAt99zt+lIltS
+S8g/erIkmus6R1tUulB9blUuhHX9IuzbRG4sY7qWLHZ/PlTyzC0DaSfm2I48wL/e
+9tfvX10uA/EftBI8SA0UwQjhB9ROPPezLdQPhBvzi5RzIrT969v+IcjrJ1uJVJPy
+BoifiViDoVo/FvJ4PqxrfT3dYdMY0nGVMzz2GVp3BXj3KUV9CiUmQMJpVCIo9U+O
+zvMlrHhBd3s84ODWN5d1jfc2s4xy1WQnIPMQgqv/myHIjAzfwRZweZbh+yRgR8Ba
+tolhlJZE2cJo2DDY2q14uuHYozFs8fjoNomxIUt2GPZJWxljQWZANtY/bf0GDEYN
+EDlsj3K81bS239YMqV2QadiCZaMYi4pL6zuGSVBOgeC5zOWyar40aJs7eCDFfzXU
+zLAatUIKnIl20GofczQlrWjP6Hcg76jEAeclichy3mIadc795uAxJ3ksFF9NsVcH
+Q+aG6z1nA+OS5aQSE8mByAgHGfhBnD5A6REx+XUOMDWWhsJ6S4RHll+zu2nx3vzI
+BNs2UNgpOXCm5bAgh2uYNvca5ixNk/qhat15ovG58fQTqxLqQS3IacOEvMR0p2ds
+WlEYIDZ81Qe+C4ONpy8CfzD5A9/KTpN6uoPkS3f8hepIS7I+tzc7xBehbxOZr+Pw
+AEfC8VQNFB/ilNX1sKw6z1J2h32bgqBGshMeEgi2o1A0iEww6YWt9WpKeDNsCwoU
+kwYniWwnFgUHXNYoI2slvw==
  -----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 7c98897c70ad9c31b221912cef650732cea47ba8..981555549d845d6c81eaea345a3238aece221704 100644 (file)

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 5fd4d8fdd3b0830a38109fa4396c9576e8327324..c2aec3f9b9642610fcb62bfe5cf16a61c6982535 100644 (file)

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 ca5343313e2bd29bc0aea92e4bef7f52d0566202..65571dc57713ddee37c18497403a9db1fe8de433 100644 (file)

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 5fd4d8fdd3b0830a38109fa4396c9576e8327324..c2aec3f9b9642610fcb62bfe5cf16a61c6982535 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp

index 8f71d1e0343a32d7d22ef38d29b8d0f74d4bcb2d..7c380e45c88ec80762a87c7732c05fa21237bcef 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp

index 88b851c2153cda3ea797b2c4cb81a21c558a58c8..3959bc6d655bc79b368e5eb3e0ca9dc0f0e6a51a 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp

index 88b851c2153cda3ea797b2c4cb81a21c558a58c8..3959bc6d655bc79b368e5eb3e0ca9dc0f0e6a51a 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp

index 7da7b06068a258f82d9472d70a6e4acfe903a97f..165997100d702f3d9b01843ce9802bf70ebc26ac 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp

index f2187d10ed0642b1f3abd2e8e9ea82c7b8f30e42..70c5a5500c4c4cfdddb209d3e54553a4bc564feb 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp

index f2187d10ed0642b1f3abd2e8e9ea82c7b8f30e42..70c5a5500c4c4cfdddb209d3e54553a4bc564feb 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.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 8d04b517110fb561d26685564c2c0a8ee2548f0e..e4c16d7cb17e64a6d21bd0982d2ed7ef3043a1a9 100644 (file)

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 a77755b399f8f974ebd0f59bb045cf4e7d1e49df..d02a140d9657b041544ea779aaa65da20614bc95 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: server2.example.com
-    localKeyID: E7 5D 53 7E 47 87 58 01 05 05 D4 F3 39 B0 0D FD 73 72 80 88 
-subject=/CN=server2.example.com
-issuer=/O=example.com/CN=clica Signing Cert rsa
+    localKeyID: DE 73 72 22 04 24 60 A4 9F 3E 53 A3 FE 05 B9 31 3E 57 32 7B 
+subject=CN = server2.example.com
+
+issuer=O = example.com, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2I
-gy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSod
-F3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xw
-PCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYG
-OhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNS
-gCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59Ytxx
-JC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNDMwWhcNMzcxMjAxMTIzNDMwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHHdAsbL
+WHT6remjd2Rw+Tb1EDjDgHkhc6X2d3KyEvcNkbp+RMhyC0grYbue0tOp8SU+3U+T
+jLAsc3xesuGJYmsC8ttWf3fNOCM7TmE80fSzbZ4j6B8z6jbGT+fblaunHTRJF5H+
+yRKrV+Nfi7Pqu0YO3dnlGuehg8jjDUq3QrPTSU67P7DyDQv68cgWmck4h9OOC/T8
+1hkNJk99ThWMkTkj8WsmdLVysK8suaniNuhDQvRmF/OZBUGb6hqEdRYDz3rIjrEN
+HCtOygPFtZhc/YNSYMokIcJw3mTPLwTE0GbCfLowhkjPYW6J7ZuOlTTQqF/9b3yI
+YTpmm8sGVacEEwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
  UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
  IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
-LmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6
-/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPD
-hmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJ
-hJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6
-XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovd
-VVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY=
+LmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
+bXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAF0sjdy/RXldYI5XCP4Q2p006+aw
+sFuIFnCXC6u0HKgEmUCEG+1FbPwwnPLyRCjzdiigFEmfoQCsK8+IaOq8IdJLKfpe
+ONh4Uq4O2O8ghPNDigXqF/c3iaibOrpBJtLkD6Uh9sHnFZCwxFsr0AUj54RFdySx
+NI8koJtpOVIK7LM4HnBHYCPq9z3HDCDe3dVvVnbbdCTEThPh7gq1wXKVOAgRvOT+
+1b5fgB1dyUi4QENaPir6u+ffKXnSwjot9EsC8cMFiISatK8DwFUrcrC69DtdCY9u
+BipSDaRKOAYsw0yDqZHZau2lof5nRJcs8flPNh+SVwx2etPgbwRyEduuS0I=
  -----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 762edf6e73ba9847209a8b0e3428a8fdd4dfbee8..1a5934c01898faf652760bfd0c5ed033bd93e2c9 100644 (file)
--- 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,27 +1,27 @@
  -----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA52Rfiv2Igy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQ
-RbsCylT8djJ2pvHstFpnzSodF3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJe
-UjPGgYcvKdxybaZAOpi9l3xwPCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG7
-43ttPOv7eSMr0JxQl3zjQvYGOhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hnd
-x5YrmAu39N5qzwWujhDPkFNSgCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGW
-kqxose1bOjSSNzFPJt59YtxxJC3IWN3UtGODTwIDAQABAoIBAAQIZAEYVOYl+Ko6
-0td84Q5pKSStobflWPbxnaew6dPtLxYkQowkkgwUTRrpdQq8OEOwa6y2T8l8rwLb
-oQlxMKe92QTidoY8Vfj3KqoX3gd64NJKLXcOf4z6xF/c/4JZUNDbBqFHdVSAii4G
-kW7nZtVvuH2Zc0jypoPnArvwJtLsi1QAJ0fWK5ZQvmICEhgCIFp8l6P0Wec6jREo
-xaDwggPCEJJ8nlRj/OPnW7Sp4ZnnIaEFKw9hIF+b9USVjspepPFSlhGBA3mUDdrP
-vEez8E+GlOml5sTF56+cZIDT9S34aNanWlav19+HHaYB8k4k35JOzdu9Fmz0/qly
-0BYUc1kCgYEA+iN6Ce2wQnvLTv5Mzi6sFdCU2ExDZQEsnHLuPOTmYQ66My32JAC8
-SIlOIIe6AsTfOcfAG2gBYtmMGY67Y3ERcMx/i0sJVCmd1bzVVgcvj7kDwpW3gXpu
-EO9N46s/003BPldyC8r/YIRwd7FTy0OXq9/UllMc0wEcnHgfHVMrw2MCgYEA7NBw
-y9OreEimxTwGQv0FFQffAR0pAG/K8ypufj0NrdtD6ir5tldQhm82YESFqTaCutgd
-8ZYul4ozwZmiybP3iHz0g1IATf7DvKzmvi/HUoPs8FNgyw9cZUOOMGh8L4ACJomu
-0i20FBua1nZ0rUp6MGSsib9A5zzh1MWQVhZIgiUCgYEAmkEMfljszGMJIoKiHLgd
-eSpyz9xf50bNGwGpNzY1d/8cBnm+g79MXTMHUfpBVHnR6xDqwDvoNuxPgGdL2ewd
-REFoGh9A9nzfj7JuoSm3Q9tlnTa0vo0gmSLqFo9Bwe3+UJKeivU5fWzO6pEZSo05
-WE2lDLreWKUj3r4Y+f2TTF8CgYEAzeiPqyrpNTU2jNicOTL3cEnfxYAtXovV04lZ
-ebpsYnb8nmevqLRS+BFLHnl2HqOfGAdCQgVrjahFSFjmCqvI14yOroBmc2rJlwxf
-tY6lqUG8i1p0FxvMIuCSidTP5h1PwWKF94p1weYew8tLuEHB7MIco8kADhAJ7I+7
-6J6HfWECgYEAyn3nH3fD15ZdJ5fRjmwjeYmPjpvyPMZ/AJ0TOQuL+U98YU2aMsTE
-wtdAmDZ18KMsIm2VzLbThzWG7lySpVz7WVgDEsLftPdaVCOLgcderxuUuDvQeCEG
-ObyBA/4JLr1TUAFXfXtFSWGQ6cji2EiC8uQCsnlTVud7F8IEDcwceGc=
+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
  -----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 103f85dbd6c38d69339e2aeb790b4a1d5344115c..5181cc57e36b22cd10c833f39aa91e4428d19e6d 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
@@ -1,18 +1,18 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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
+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
  -----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 7054c3540f291e474495fcdbd3b1c1da1d71eb63..5bdc0adf9e546ff0b5a30fd02b8cb2e352bb3443 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
@@ -1,19 +1,19 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db b/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db

new file mode 100644 (file)

index 0000000..63f9a76

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/key4.db b/test/aux-fixed/exim-ca/example.net/BLANK/key4.db

new file mode 100644 (file)

index 0000000..d86341a

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/BLANK/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/pkcs11.txt b/test/aux-fixed/exim-ca/example.net/BLANK/pkcs11.txt

new file mode 100644 (file)

index 0000000..89eef7a
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='BLANK' 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})
+
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.key b/test/aux-fixed/exim-ca/example.net/CA/CA.key

new file mode 100644 (file)

index 0000000..571a6c7
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.key
@@ -0,0 +1,32 @@
+Bag Attributes
+    friendlyName: Certificate Authority rsa
+    localKeyID: 27 2C 72 97 B5 B4 19 7B 7D F3 AB A3 40 8B 31 89 9B 0F 29 55 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDYMS6HM08F1H2Q
+uXP4nMP+Ruil/eeYMT0WMHu2NWDRgcnhKzwIqdk0OySKdzEvEX1ApLLNbIpi86JM
+BqYqkh7WsRMInQ16g4DtHaTaAMO9vS5qg3NhVM4o6Q3YlNMbBbeCrLwefBGOTfCv
+F3PDewzOjNbxnFFad4BHbIG/UmkSLXmRJx4caMrPA1OIbtsUfC/iIsO4QROrMfLD
+kmvA4v9c/xEUYKzW8mhxXfUT3Rsv/qF/14Q89lLO07XsnI5pW7q738BOY7AUKxa0
+Nxm0jGoZlbv+JMTsdzqav4ZwyADVdm8HveGnKAxIf3LS2aqEK1W6fh7/9diJcoKl
+SYIgYES/AgMBAAECggEARMQwFpU9d49FeXlj6BqFRSZs7g+7UO+ojJxTXXvRFhMA
+kfzclazhB/of/2M2Y9BeVOeOcEUsJ5lzcFdVF4lvAb9FXKIIHYYixkl9nFJN8NZy
+IzM4yibdhKnM261LEPdajdg/5jp0ox0rh6YgDnffdPvbivK79di5Fv7urlqaTUtP
+6R0ePW5ysl3975MSkTTaUr1Sw4pzU2H1zt7YYSQs1HvJMjSpiw4Vu3kwlXYTFLzn
+HsUgiDwj8vQJ/h4JOcgVYidNOXrEcVxpCwY3lrH/JHH17htYpkNvFktkdHWV3kkh
+YcAkUo5pyqK9tXjSOaS3hTU+/POpfeOSpiCOvwjuAQKBgQD1jYXXXKZrP9K8jKh8
+4Jqkk6xm2Ox7PHfZevXPb/XHnmvDE4znjMnqhfD7Jkx3r6wJFxRPML/m4a7CPGoa
+DFFf0rEI2DKxOZCnznMSTNOjB587M58/d3q0c9QQWrCtLw8rxW/hNrtwzTzRtJ09
+RcHRZWHwlSpufPYcQaIA37h0PwKBgQDhY99GxFG1yIHCqIyyZQKiOhsGueJsyiCg
+aI7EcvYiPtNjcfUN0m1zHkF6WY1Kra/nktUlNrHpkTyqkWv1xycaERX3e5hM4gKd
+xFji0pFJEQQa9chRcQGqTyticHNm9ONmAIk3sWdfHz97N7+ccchIpmXWaZVGtf5L
+/WRLiuIPgQKBgQCmU76dKnzvmMO+Q+i87cbSQ9U7tSQ6NbNY9Rkb8dKh7IVCFjQT
+hCIhYajh9gdF6xC095UiLvtOAQDHQPT9v+o+5hBU1V1A/qUlhYockz2n6LnK+CSe
+cOgE45B5o3SZWo8ELzChdNlyhxLzWUxI/L9Ufz/gHqonPS3X5f0+akwfMQKBgQDJ
+sq5kjdrxanV01ZDTNEGfG5CD/GT8JgX8hpT8iERrcP2KyLgbnmwD0NeXvfwLEFOS
+UHwdyUx9UFOR8IFEeOwtD40w45Hve3IL7WH92aHaWTfrSHfzKcXrut2AQlGDmTLG
+XURuanuvTC9q/QCj587r9Ly9m87ScJsZNbFDSQ30AQKBgQCRfEfnqWSyLmq8UHMe
+hm6iCQZ/dS7P3ig8Sen44eufodKa8Z+AuQe+QbiWLszIOz8G3f0TeVlLHNZXNi5a
+tk5yTNWWTbX0j4ygdUROsTybBjHOgXT7EMFDe4U0hWVzWMrlHYD5doX+6k1eVwji
+rcHl6ECv6sHXPUbaQNI8uE6tRw==
+-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.p12 b/test/aux-fixed/exim-ca/example.net/CA/CA.p12

new file mode 100644 (file)

index 0000000..b6df3ef

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/CA/CA.p12 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 103f85dbd6c38d69339e2aeb790b4a1d5344115c..5181cc57e36b22cd10c833f39aa91e4428d19e6d 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
@@ -1,18 +1,18 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzU1MFoX\r
+DTM4MDEwMTEyMzU1MFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT\r
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgx\r
+LoczTwXUfZC5c/icw/5G6KX955gxPRYwe7Y1YNGByeErPAip2TQ7JIp3MS8RfUCk\r
+ss1simLzokwGpiqSHtaxEwidDXqDgO0dpNoAw729LmqDc2FUzijpDdiU0xsFt4Ks\r
+vB58EY5N8K8Xc8N7DM6M1vGcUVp3gEdsgb9SaRIteZEnHhxoys8DU4hu2xR8L+Ii\r
+w7hBE6sx8sOSa8Di/1z/ERRgrNbyaHFd9RPdGy/+oX/XhDz2Us7Tteycjmlburvf\r
+wE5jsBQrFrQ3GbSMahmVu/4kxOx3Opq/hnDIANV2bwe94acoDEh/ctLZqoQrVbp+\r
+Hv/12IlygqVJgiBgRL8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV\r
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAIJCLWjkzXSI6+/fvL5j/6+5\r
+6ttBjtZhRAQdhmqJ1eUOo6Tnl4WzYSsKxEhRBxNeIgis5IQzn9o6sCSSfHEewCwf\r
+bABbjwqu5czA02XRrC70Mb6f2D1tBsGA2jzY9j8GBCPWJPanTTzHiWMmuckx1tKI\r
+vaPAb+BJfXIKSsenFAPGW+nrGwMj3BrvCedoozKcbK8zK3QaMibEwD/BcDFI2tws\r
+opCmi3tTXaLZTRwYvWj9qykjIoEnzwk8ARYBNHOOuDCdsE3IfKPdo3+Le7yEseRl\r
+1hfeZsa3AGvAm6Dp7XRYmrPQsVp+ngnEzQtNhLH/jVjbqTdJ6vN88VkL/M11yF0=
  -----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 a9879cc324d5fd4bbdc8acbee23644d261ff7d77..872a94ffed72bd9c6bd3ad3fcd1dc83b7847304e 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
@@ -1,32 +1,32 @@
  Bag Attributes
      friendlyName: OCSP Signer rsa
-    localKeyID: 94 03 30 D7 FF B8 C4 4D 73 3E 6C AF 47 CC D3 DD DB 03 45 0B 
+    localKeyID: F9 E9 49 41 E9 76 77 9B 27 1C 31 42 3E A9 8E 73 2B 6F DB 20 
  Key Attributes: <No Attributes>
  -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC4piSKzExQJCgv
-hBKPPyaexasBPB6Vc1SFSSIGvvvH3dsuZ9tIl4tZOmkseut5T+gta6rEefE7F5JV
-LHWkx5G0dWuX/vn3Vbm3ghg+9MdTNDDp6WZHFjiVgOTs8zSo6lEUTCtWK95qd3vH
-9BcrETpDOSicYN9Rekzkx9SyWgWlgO7KZ2yxb5ciWpulAIBR9xyM2UNq237iaTzu
-b/a/7M8Z+k6pIS7KOQT9dvRgcC54yuWHWCU2H1VFea66rUDqJtj/J9l+9pDa+YFH
-DUUU0Cpk1sI4/DOmC+UzLINWShxGUYX+oZZK81l64X+pXZCn0Ur5Kcn0/jsg+qP4
-GoSf3pO5AgMBAAECggEADHqdAFzhgO6KoTh0rSXsUSFkhtU2b2z/jrD0Od69IyMv
-IY4fC6NDRYTdMAaAJL8V3sD2pefkWdUkXHmAW2Ip6pdfbcKrh8/NOPXTt+iA0pKV
-xi8yDHaX3SG8hveCTPKmB2BE8wJMuicIUGmCidR0mq+xmwzwdsAUU4deTG3pUQed
-w14MCpZBZpewXWdLvbjP/vD+SCcLERXqxNcN5b8mHaRBqyy9T9DFcYwgc/zqEmPW
-c02YtDXfS7voj/PSsBMZr+TCTcISTiongdy8qcKrkVLf3u4zDd62xMMZBHYtG9/m
-IiF8BejElXTkAS/eUPGRY6RACJxGxHEMFtYOKItesQKBgQDwJU5ZzXu+QSuXOUhQ
-dSZO9nE/lgGXk5agQEDdBaqxtuxZsO0iqakaf5t9lWxkDgJxdnTrXr4mTgEXM9Vo
-FTcoHyjBeVMybzLTyOs5nqyNAmC5LbQRSS7zTmajxelZrbqpc78MiTOCttesRuLe
-/6X4TfvtMc4GH7ro3CkdsFuFCQKBgQDE1uN0sYUeeLEiDU9CMOzD654Q5mzPLS86
-sEoX7PW/j97pfj65/6BSvjZwo1QvmyFMzg/Pdz2bkLbCb630xOjEzxB8up1gL0bu
-dUSzf5lTW82VKvsH7D1/apuInbYPfN3s2O+bNgvYZmtoUlMSig4ojpqUbXRCHNoA
-okgdnmV1MQKBgQCZO5TFJKLjAX6pHfoQrM/m7sXQhw05BQnF83nwDl+eylQB3y1R
-QuUObYJwHdpt9aqFb8qnLWsz0e5MOdzgbzkkts0wtxPpSJ8sGDZQK/l6eJvzTUBr
-D0GQKuS/d9ewS3SiD6NGgn2F2NnBqfG1zXa//DLWZUNLERAY6fKqaQ/c0QKBgDc6
-Y89WD5ehHXIEcfyMZaIC9fKf9F+cueepluBnp/v7jfvNZCQjyQPuQrAP44sH56v5
-FQ6M0khXri+XziMjLHwr7OBSK93U5f36ATCr2IU++Mulp5Ftg0PA0arfNTnbOxk9
-NN1DqMcq1XALySsmeRqACHckzr3OAoyy+7DzxFvBAoGADD8y+xZP5vxqY2tr5Vj2
-h8LTgpV1IbuD5SSOkY+XD0y/JsYbp2WDifRfYqXktL6AIr/i02ub4LKbTFTqYoL7
-dUjKr7APT9DrPqKZ1IBr+8Q3NWyz2eseanuVyV94ly7qF4Bh6UfiscaPlSK9XtWx
-p/Ua6aIvKcDRWWOd3njEiak=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvpqLut7BnosFZ
+Z+nbjR2HvVNKYwlF6bEDjbI6MO/fT5jT1HCZFszF7OEN7xwDOWderz8pxqpg/uDp
+x+A3b4XJhoiTnvHXlmPhAtvUV+8ZZKVxodQi7JwRkV07Dq2z4DXbnGlAQLDf5aB9
+9PfbQCT15aATbDuDxn3kYltUqE2FtzI2NCJePbzjvzNbM2jYyOM6Xydj7V3LnRR9
+tfsiaHLEKTsx7r4VTW3rg5qsZ34J5nnOoFzFVELLP8WX9Kuf3Azt3rgDiBUNiCm/
+qkJXcM5p0CqWeeFudwye4z9PbjC9djHLIVAgPK2aF1fhuzDsI5+Nw9ysaROA9dZG
+ArDKKNDjAgMBAAECggEAFq1PybwDVU3o4m8M/SBZ2KVztF3W26TRCqFniiW5Qj5X
+f7mkk88ivsbXQ2JEXpIxq0K6x9zzMDSXuvboFqAaSKtKxKw3ktrCqFEjKmXz43Zf
++ayn455ig84dmDtL57YhnemymO4BJ9bQgpJ20WKVov1zTi6h/GBK7opYOjTEVWfb
+nZkaZUJQKAxd9AbzrWdMGxfOdtTzfj3C66AAjH7s6YLlQfkYfKkw2UkrxMYr20kK
+vrYGTvVsTwQ7S6IUjFwuJu5iims0K4MaHV1ABnJC60IBRdiLGWsY2EuYpmW+punZ
+2d20ME1XfE1G6rgbcLWEmqkKvFEo/+hZWJpn8ouX+QKBgQDUbELEslfzGNoE6Jvw
+s/eWgoSmue50oqiH90Xxx3wpEpvBRlyMnqJaB0k5h3hFNKXzLQYJE1AmDYo4+pIi
+IqjrIyMhLE3wnRgwL2YBY3Biy1o+eXNQumaELkGq9LCifK2p5qI5wn5ITqUQ/8pc
+4w5G5Yne4VbOhzm5jw5rDXFo5QKBgQDTrzwhPQQ2tHWYdFG08tWr5Kp/vK6CbvYG
+z2NqEe4XRefregnAvDzWhFg9r3NNe/+f9qFoBzn18F9W0qe6ZoP99wMSLAsyXaPQ
+w4KR/TigOCKzcpD1wtqjYvje/1Ler2LBU/HJufMMYbjrS94veeF6LQhrV1Ax4bNc
+QTQYzsseJwKBgQCEllZOg6rVt2tNqQq8gPhG34yArIkkD+r1gugLc6IR2OWTC6H0
+u4dGfkm8OMxfFe+HC1E7FOzv83+U9QGFgPDCY5onuImlZ8iTOuKGd1TMtXTMje3m
+M5KNannehQBDS2LyK1yShM1hwITTSXU76RUeN2OI1Enkew8SvTIYq7lf6QKBgA8I
+TK7XlGsGGau/5uWAsSfJz0nO7l2Y36PQKnEn4M6KSlPwkKy9MVzSfSm0Qe3otlh3
+vTKUAMu0TDDwOLUF/q2UUwWBVzI2cCGtIKKZZuIJ2nz/z8eEFN6xcpbzbsEdl1e/
+TFZU/CuO7QDYnGimsRpqBEULKEjCjGgqwTZZyRbVAoGAHC6FKDPdD+HkpucBprTe
+/axnCu5PX/ggbTOI9L6q70Nn/FXpcvJ1kEI0cV8XFtymD92lWlVsmEbGTsnfeKbP
+eILOrw6rh09OZFnvRbwAhj4ZsukuVkDDUsC7mkxqwFnUId8lXBKbhi09g+w+hKAv
+5B1aLYBxzezUiBRlY/ChTUo=
  -----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 4c26942be388b0bb49d3c8cc2e3c80df1493c6b8..d8e90985283d37f41915280d49b03887e12779fc 100644 (file)

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 33b40f2740f6b8ebf3bc4afa9b0d0ce928a7b337..00c50ee958f8d0faa6ea4ee551502a7e916a604e 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
@@ -1,19 +1,19 @@
  -----BEGIN CERTIFICATE-----
  MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt\r
  cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx\r
-MDExMjQxMDZaFw0zODAxMDExMjQxMDZaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0\r
+MDExMjM1NTNaFw0zODAxMDExMjM1NTNaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0\r
  MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB\r
-AQUAA4IBDwAwggEKAoIBAQC4piSKzExQJCgvhBKPPyaexasBPB6Vc1SFSSIGvvvH\r
-3dsuZ9tIl4tZOmkseut5T+gta6rEefE7F5JVLHWkx5G0dWuX/vn3Vbm3ghg+9MdT\r
-NDDp6WZHFjiVgOTs8zSo6lEUTCtWK95qd3vH9BcrETpDOSicYN9Rekzkx9SyWgWl\r
-gO7KZ2yxb5ciWpulAIBR9xyM2UNq237iaTzub/a/7M8Z+k6pIS7KOQT9dvRgcC54\r
-yuWHWCU2H1VFea66rUDqJtj/J9l+9pDa+YFHDUUU0Cpk1sI4/DOmC+UzLINWShxG\r
-UYX+oZZK81l64X+pXZCn0Ur5Kcn0/jsg+qP4GoSf3pO5AgMBAAGjKjAoMA4GA1Ud\r
+AQUAA4IBDwAwggEKAoIBAQCvpqLut7BnosFZZ+nbjR2HvVNKYwlF6bEDjbI6MO/f\r
+T5jT1HCZFszF7OEN7xwDOWderz8pxqpg/uDpx+A3b4XJhoiTnvHXlmPhAtvUV+8Z\r
+ZKVxodQi7JwRkV07Dq2z4DXbnGlAQLDf5aB99PfbQCT15aATbDuDxn3kYltUqE2F\r
+tzI2NCJePbzjvzNbM2jYyOM6Xydj7V3LnRR9tfsiaHLEKTsx7r4VTW3rg5qsZ34J\r
+5nnOoFzFVELLP8WX9Kuf3Azt3rgDiBUNiCm/qkJXcM5p0CqWeeFudwye4z9PbjC9\r
+djHLIVAgPK2aF1fhuzDsI5+Nw9ysaROA9dZGArDKKNDjAgMBAAGjKjAoMA4GA1Ud\r
  DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF\r
-AAOCAQEAXmrD8/s49rInxdaW+Hw7ShvrMqbJ4YYbTGbReMYn/vA6bKr/dFk+MMRW\r
-EClz6+sCrZ8L7QWv3HEd9j/C43JDPIWjJ3fKBCY2VI+gWTKeeJLWOIE2rP50/09D\r
-witc7z/EAKzbrb22I42FPt7CFW0BENfLfh9YiuTWkIaGKDjd2QvtuaOXRCIXJLhq\r
-EaUG+rQVVyj7U2M6Yva8q4ur8j+xV64DHobFupyWk0NmNy4ESFDFwHdtRRrv8T/z\r
-HxsT1cLHCzfMy8IpjuOLQRneO3TDaPdk8PcbIWXwRvrWoGfiDoYTAFTY/CBjpwUS\r
-uH6K6/R0j2E2FWlBeWoCv+RIWj5+vw==
+AAOCAQEAVsNIvmPsuW1kuJ5yhDTrJ8FPwjGaUuKRgbZRD30SCOvIzHL9kpIog/kR\r
+/leFFY6//lxEHho/OmjA21IMcfEsNBkT6pGXawWkGefrba5kAe4pg63X+EMx+OU7\r
+JD3yN/tVsUzSuloOhIWzeafGE75w3Yka/BsBUOOvUM6bIqDwFVXi5beBCMNsntbc\r
+g5HBZKvsUU9Uo4ax/vOGa6/AHP/y1wp+wykEmY5uKj/0jijbXZr/57N7DF9Stt4k\r
+khx0VcPYfO8PNg8uLHAxHc1nYYH5xCR6EiLpAdJIjS7pNQWa/CgDoconwFKwe+bn\r
+h+/JEzIO3HklW42viCZcfJqI1xUipQ==
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.key b/test/aux-fixed/exim-ca/example.net/CA/Signer.key

index 94fb861ed8b0eed7a8b2dbde3b502af7565a08a8..83ab23d933b496b0207230261059e1f05861e214 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
@@ -1,32 +1,32 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-    localKeyID: D8 7B F7 64 E4 37 67 20 4A BA 13 3D 49 BB 50 40 A6 0A E7 E5 
+    localKeyID: 01 DF 79 A6 1D 2E 9C D6 55 ED 65 55 D5 CD 5E 7E F2 8B 93 FE 
  Key Attributes: <No Attributes>
  -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD7f9mHP5wzfhDH
-hjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/Gn4c8lnbq+QpiLSVuXgE0+K3
-Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQhdd0cDsxGBzpolD48DwXkrBN0
-wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61fstY/RTZU6CDi2uqYLGsWWVU
-SuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKrffdU6ey8U7W7ksb6Ky6Plz0D
-07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1spYsi2fUg8yd1NfVyVpF9ye63
-etyldj+bAgMBAAECggEAdx7SKFY/pMAEMIzoC2g1s2ZTPjzWGVC0zs0fZw3B9zQO
-0iC/he7u8HEa5JkBaKOc2PNQHU6QgzDcxEpHGX3ZRN+VADftcWJui4o8ndKrXvqE
-uVMPsInnrGWICd8Ub+LCjoAQjh/LecjrGjWbjz31wOX7N8/jFg2+3hgNG/h4mNtq
-KVDhlcX3ORkKxeJCAsjxbikeKPr5L1FcBP7dYI4hdKNY7dmOM1keitYjhcHLkCEp
-vhtnyKeFba2cqFsCqE5Q2OqtM69gds+izLlBBNAAzNQZYK672SgxxuIy8ro27dbi
-B1G+Jc33yr6eKJzY5MLOgVaEQUaQRuF7tASCqWcAqQKBgQD/wTa4idPV9r7MjHtR
-eS8jQiw09eCur3wdu/kFe4JE5IAdps2EblZrJKM3QC9vGqkOjf7/fWpV8EObn9L9
-8lMgfehglP5YTP4gvE7Y/oOi3k7mMd5jwQ4b/U9E/osIeQi6is88ZWcAPE0U4pMN
-pwp+S/cV5QWzEPheNNjNLB8mtwKBgQD7vZdgCoL0y5STOTqZbh8xXTnvE+TQuAus
-5nAUVFZtpAlafehQGpJI/02PipvtcH+EGIm6eeF8jQTQno2G2xUVijx0xnhniELQ
-v7qp+8Z9+mk/QKsCmfa1t0XC6gaPnyKYEdyUHOj8AXUDrf9BySqejdggEjygMlTt
-u2V+99AqPQKBgQCOTIKVypoCwncGeGNkwXhotbjC/ss0Zo84PA4h7sZcboaZ+OUA
-eiO7GXd2lk/OEZdeccMfhDhV+IilXheXE+0MdwGEO2II303GCQAV3AaB6A8eJUEH
-X7Lp/9bLHJVe8XjZ0cHcaM8WYnbA2A/Z2McN3lZr6DFzoE2QnPbDsXjjoQKBgGDE
-eDPK1pwSxYHyNbxUwFjRZTupggNZO+OykNK/uJlcvNu0GmDwVdsJiF7tARM8c0fr
-xsWPpEWkT32B9RUpkek9wg+BWzcxAb4MdUxyI9K5N0vBJ/tQA63GTWKnYu5CVaHu
-+8NTeZulU72eXMiE84UPMUzitbs+nbbkmhc8WyBhAoGAFhx0yPYUjT8fKB1Zq4Fn
-xeBILVSBsTn9pUkPzFS5G1BIyGdF7YBRRC7DMTDPxQMXF6rJ2+ACzJJzXpqsoxYI
-bYdhwGK4afTGtqnpoivcJDsf6nBiFIEMd5V+t09Rg/b3YwgMRZ8ucIBILIYsor+i
-LI7Go+X00RTw4LJ8zccRh+E=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDAjSbScAYCPW0c
+NADb6GPOz+pNf8BOliBkZCzVijCXUOj7Zes/B+jVqU27Yn27+BQ12DDftGA0b7K5
+hrhQCk0m2VIlK2207xfDF/0Xt3gpqLNrJ518g6p8XmvRQYoUIFzG4R2RhdDJ1doC
+XDKNaOviqye2yVELkhA0RCmysILUf8xxgnyFy4VgoJi0Ibrbt8e10pP+MqtvX5j7
+Q6rxAnhA2HOZsAANbAd68meudwJK0oRbCIovayxtpf1WUGn8b0ijysTEPffX67dZ
+YnOD8pSZx+AXr3NQkxIXCh8V01OxFFz/pJTWPpZQcbL5sA5uFh4pLhJ3aIvlngFQ
+NBMwdeaNAgMBAAECggEAQ9z7w8tLstpnbDs/2kGre6Z309yksI3k2L0duB0+RvZz
+RreDE/H7s+I5zUNHQUqMBPYvM4jlJ1X+zbiXmU4oJvsNIqCNx+lEnLQFtagqJ7SX
+l7qcnNfi7HZy1Yud2L4XNNj+jN122swOTCqmfoRuLrNYCeomMEfIgkNL1vizA6Vy
+ri8r4VvUtX22YBrdTuaXlWBP0ioCphBVNmFQx5pytJ3A1PMjQ+i0a/hTe+vZa5yN
+0DefyfrV4X3Gslx4EYZX4Dgrq/KZ9sQ/ogPyat5RSTt0BS881+msuXiCcFcGh2Ky
+n9QzCudufiY/EGwWOOHX1uTIc2AA+A/k9QtxRszRmQKBgQDe2gyx+Xum9EYHzJj8
+qYJWeTBOA1oNt61sJ6x9XIDxcSXcV7vJVZFZWOnzqvhZERzQTlq4dTcEDumb8ojW
+zKXWcUmnS7KV/v7jg5Civfbb24AWAP+f3YnpmhVGyXcQsREj7CJD+JpNOz32qgWC
+YP8tPv0xJDgLZtmV7C833RUOJwKBgQDdMUv2YyyfnHNCyr+W1MdFFOmuKCJPeCJN
+BsRXIcf303ulew4UXuxBJ8QNvCutYGP1vgQ+/XMiUKROPIg38yKPzi2565AgdqMH
+8hBz+ccvfmkofQPnJH6RDnzK5n1NXo+aUIB9E1iBUtxi7cQ7Fq/b9ZmI/XHYQFZJ
+ERFa5AkKKwKBgAjdZaniwb93ch23TtKmL5AfDAPecEOhbd2iimMGPf7cwGPOfaLZ
+q4mBVvUhdPWeD6Zdp5A04XZg3XwdnsHkrCgmo4ZrJXSAC0WjoypGIj7GsYaujXyf
+hG/teDEzrG/Wi1cBeq93gTPXSnS4eLWiBCSZn9rHlQ8nDTrAhXRUcBT7AoGAAvCP
+yOOCiVCD+6RELZYAW/uuK2FfK102X32yiFHrnXCTGRzsj/q++xKzOVeB4RkB2xc+
+aTPnHtKhjGSjjtLNZ8nes7TcwoGxIv7llxT/v7LXZPFcZusGP5lIsU2k5q1WDT/6
+pS7nozhds3bjf8GKbsrx0m9D3xLj0q7GY0XalOcCgYBM0yXPSEXPNP0K3XtmpaO3
+wK8Bjg/svyoewZTC8ZJKxoqWTkw+9GvKKmu+AeRhwbFSGzodv9pKAlJqMeqVe9yw
+OCy1NufAN0w1qv5atDHZKpGFxpBsKyxuWVt5CBKyCrbU3xCpJhZAd4GkWlrxQhMw
+gPuItOzdTmw+jgeOOlgyRw==
  -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req

new file mode 100644 (file)

index 0000000..75eeb1e

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp

new file mode 100644 (file)

index 0000000..47de98f

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem

new file mode 100644 (file)

index 0000000..9afc92e
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem
@@ -0,0 +1,31 @@
+OCSP Response Information:
+       Response Status: Successful
+       Response Type: Basic OCSP Response
+       Version: 1
+       Responder ID: CN=clica CA rsa,O=example.net
+       Produced At: Thu Nov 01 12:36:43 UTC 2012
+       Responses:
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
+                       Issuer Key Hash: 6377155acaa7b527c57f1e474b2a74d85a099e0cd9d4baf101d0a96d2c39939a
+                       Serial Number: 42
+               Certificate Status: good
+               This Update: Thu Nov 01 12:36:43 UTC 2012
+               Next Update: Tue Nov 01 12:36:43 UTC 2022
+       Extensions:
+       Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIIB+goBAKCCAfMwggHvBgkrBgEFBQcwAQEEggHgMIIB3DCBxaEvMC0xFDASBgNV
+BAoTC2V4YW1wbGUubmV0MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTIxMTAx
+MTIzNjQzWjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIElG2m+vxvyC/H27ycn9keIR
+r2aAn9jdVIl8+kvdTNbnBCBjdxVayqe1J8V/HkdLKnTYWgmeDNnUuvEB0KltLDmT
+mgIBQoAAGA8yMDEyMTEwMTEyMzY0M1qgERgPMjAyMjExMDExMjM2NDNaMA0GCSqG
+SIb3DQEBCwUAA4IBAQCju3tyAtcJbqaCfKbo1Ta+fmMMbtEkdj6wqfBqpyXi/Uyk
+aPvbydbJ26+bQ2xT6n2Gp4nqihKDPXrD+gR3Pvwh/FkB7o0gUIn55YwfAiCMoEBE
+bmt7K3bAYNQ19o4kOQREsmTmoJs6GxfqjYl8yCid/KHEYJgKV//Tjqx11KlgPZHu
+A691RF3FQOPBdWVALMG+snNjM56udD+YmcH/y2+/btpI1avnST5NpRswedz760Wk
+POLc5ZrsKAnoeL2uw/U9gdTwpWcCTMh3athWCJECJfyulHJfJeZI1DjyJkZSSDFA
+tG+Ud6g/xdFG56nRz6FrKDPIPEdyyT1OMHVO900F
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp

new file mode 100644 (file)

index 0000000..44aa6e0

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem

new file mode 100644 (file)

index 0000000..8a45227
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem
@@ -0,0 +1,33 @@
+OCSP Response Information:
+       Response Status: Successful
+       Response Type: Basic OCSP Response
+       Version: 1
+       Responder ID: CN=clica CA rsa,O=example.net
+       Produced At: Thu Nov 01 12:36:43 UTC 2012
+       Responses:
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
+                       Issuer Key Hash: 6377155acaa7b527c57f1e474b2a74d85a099e0cd9d4baf101d0a96d2c39939a
+                       Serial Number: 42
+               Certificate Status: revoked
+               Revocation time: Mon Feb 01 14:27:09 UTC 2010
+               This Update: Thu Nov 01 12:36:43 UTC 2012
+               Next Update: Tue Nov 01 12:36:43 UTC 2022
+       Extensions:
+       Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIICEQoBAKCCAgowggIGBgkrBgEFBQcwAQEEggH3MIIB8zCB3KEvMC0xFDASBgNV
+BAoTC2V4YW1wbGUubmV0MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTIxMTAx
+MTIzNjQzWjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCBJRtpvr8b8gvx9u8nJ/ZHi
+Ea9mgJ/Y3VSJfPpL3UzW5wQgY3cVWsqntSfFfx5HSyp02FoJngzZ1LrxAdCpbSw5
+k5oCAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTIxMTAxMTIzNjQzWqAR
+GA8yMDIyMTEwMTEyMzY0M1owDQYJKoZIhvcNAQELBQADggEBAINZ0UwWNOq589lh
+Cx3z/EAI2gHHmJzQK4qJ/Gzv7YBg6Aag91oox+BjpKG0saA2cpSJz7roL1nfPfO8
+BTX2DHeIvxdJPSUvh2gaJP/vH8YGPvym0NEBAfoK0KzMxg/E5ikWISfTzH/yQfUQ
+LGwucVckMvCe6EBJTyDv80rKQQxOY7bF2lVwHFm+oyq4lbtQJID4C044cvnW5tMe
+X7cs5T07YyYVcxc/OKL7LoKtAKMQACx8zjNcR1F/YxuoOxgzFxof+seMOSnpTfYD
+O0QnDN1GLfLMb+FDDAMtg//2GUZ/+I0OqFpj5VpTBO4enJxp29xq81cCXQcUa1qw
+eOY6zvw=
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12

index fd5c08d4cf8741ef737041db8f0b47a3ad678bd4..955f1f6391e67d23773da66d26a7330cb26ac431 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12 and b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12 differ
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 7054c3540f291e474495fcdbd3b1c1da1d71eb63..5bdc0adf9e546ff0b5a30fd02b8cb2e352bb3443 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
@@ -1,19 +1,19 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl\r
-3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2\r
-AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa\r
-CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5\r
-dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg\r
-RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
+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
  -----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 230f9ab7820846f0c859c4f1c0a9ac9f4a2af3dc..69fa36b5d671b48db7b7c540606ac26aacc09ee1 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
@@ -1,18 +1,18 @@
  ; Config::Simple 4.59
-; Thu Nov  1 12:41:03 2012
+; Thu Nov  1 12:35:49 2012
  
  [CA]
-bits=2048
+subject=clica CA
  org=example.net
  name=Certificate Authority rsa
-subject=clica CA
+bits=2048
  
  [CLICA]
-ocsp_url=http://oscp.example.net/
  signer=Signing Cert rsa
-level=1
-ocsp_signer=OCSP Signer rsa
  crl_url=http://crl.example.net/latest.crl
+level=1
+ocsp_url=http://oscp.example.net/
  sighash=SHA256
+ocsp_signer=OCSP Signer rsa
  
  
diff --git a/test/aux-fixed/exim-ca/example.net/CA/cert9.db b/test/aux-fixed/exim-ca/example.net/CA/cert9.db

new file mode 100644 (file)

index 0000000..1bba357

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/CA/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer

index fbf12fc1d308980e9cb3a55b923486c17d52012d..4ae5de1e8205ca29667cf4c63ff595663f7460fc 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer and b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt

index ab7d7b073f1311e92c7d7af5aaabf263cdfb9437..7baa9aea2a813fdfec9f680e0168dbbe3040a496 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
@@ -1 +1 @@
-update=20181127215819Z 
+update=20210604172341Z 
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem

index 70e2b5d5a0be364f055035c0318207eef5767579..913f6bf9b6c5ab8267fcf93ed02b4b842921c21f 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
@@ -1,10 +1,10 @@
  -----BEGIN X509 CRL-----
  MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUubmV0
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTgxMTI3MjE1ODE5WjANBgkqhkiG
-9w0BAQsFAAOCAQEAmoHDEj+wCPagwutH/O2ntIDfdMsnZ6GonnLxF1AywzjPhzne
-e6Q2FAGs3jeRVJc97UM4r6C71WCbcGZASL5QacZ9wKlvfSHt0r7eFpJQ4PdLt0el
-mpBAH1OI/6w35sraXh7ZZQYquXfoskoIWo21Hz6PYOUbb7eW+ldewBdyk0h5noMJ
-0ZWZ0r//+7p2TF3sTL2YQUOXWhQJ06QKa/fDGB9IaMFhya827l6ycbUiHPPra0W3
-HHa9A1P8B4lcrUxqAl57H/eIhRNAzVwohakBa/yEc6p0mzgK7tKL0oAvCKm2Voj2
-0fHrlxV43dLYavq9AITjQ3fyf/aF4RKQ542/Wg==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjEwNjA0MTcyMzQxWjANBgkqhkiG
+9w0BAQsFAAOCAQEAQVfATtFRSCocxdugg8mizIFHUQOgZ7+ffkdY4MLyfi/W9tI7
+F5lKpnDy01q+W1w6jdZbA440aW/rCgsXJlWzQy9QAAPE9svl9VYxCWGgWJOn8DEH
+q/XrnMP0qa8sG/4OS21TKpbtbrtxvvDoultq9UduJkJO+bOxmLEOOujpEi2eCQTM
+EFX9ZzzJZhDTd33mp1CZczGyNmyzB/bCKyphh0kz0kguDOOXq8vT3UFxdWyXHSMv
+TuHhqK8bkwhKPt0SYJj/DQcGC6sujIE658U7QcRTEjh8oCyzYNvx4Irl1So89DOX
+Zq5v5ZTZGxefP5eng5sLIoQGEwmODjhKxq46rA==
  -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem

new file mode 100644 (file)

index 0000000..c32c208
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem
@@ -0,0 +1,21 @@
+-----BEGIN X509 CRL-----
+MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUubmV0
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjEwNjA0MTcyMzQxWjANBgkqhkiG
+9w0BAQsFAAOCAQEAQVfATtFRSCocxdugg8mizIFHUQOgZ7+ffkdY4MLyfi/W9tI7
+F5lKpnDy01q+W1w6jdZbA440aW/rCgsXJlWzQy9QAAPE9svl9VYxCWGgWJOn8DEH
+q/XrnMP0qa8sG/4OS21TKpbtbrtxvvDoultq9UduJkJO+bOxmLEOOujpEi2eCQTM
+EFX9ZzzJZhDTd33mp1CZczGyNmyzB/bCKyphh0kz0kguDOOXq8vT3UFxdWyXHSMv
+TuHhqK8bkwhKPt0SYJj/DQcGC6sujIE658U7QcRTEjh8oCyzYNvx4Irl1So89DOX
+Zq5v5ZTZGxefP5eng5sLIoQGEwmODjhKxq46rA==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMTA2MDQxNzIz
+NDFaMC0wFAIBZhgPMjAyMTA2MDQxNzIzNDFaMBUCAgDKGA8yMDIxMDYwNDE3MjM0
+MVowDQYJKoZIhvcNAQELBQADggEBAGYlOfzEqSZhQ4Ko6PwjX8WmMdAcxbJvb7qp
+T36EqSAiel0u+fIbg0j2pRYdlPxWZz2t0WNq9frDsQ/EwOiWFDokeC094IdPCA5A
+t0tg80kNw8pIgumWPbmXMs0kPOw3EeEmbyC8NBY1UX/lh8AkLnOsxZMMcgme4qRh
+vJ+83TDyfiXGRIWgadWv6YGgxJIPohXvQ6rkcmGoJRJCYk7hpGLiMkc0RXf30fE3
+gR1/RR4tb9gIciFLZ+k7UY1hAiNSbsUVjBKqs5XwHivjLttTynpnyYH8QeBq3GCO
+KKnWaZ3cODyy3prEUX85ZqpfZFllDzmWT54TcP55Ublp1+6xNYk=
+-----END X509 CRL-----
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 d4a07fbbf850b95dabee9b761702c8ff13cc9bc5..91e66bcb70305e7fa8917d69078c453a8f700f41 100644 (file)

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 ebd4a952d128d35af102efa42e24862fea91fefd..d6a7ec83634bfceb26aa201ca0db9f3901b2e7ce 100644 (file)
--- 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=20181127215817Z 
+update=20210603224937Z 
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 c2edcf46b1bb3454827a8e82455a95ac8c855e98..d5f1f45d83903cdb465e9d18a34f48a7b8c34ded 100644 (file)
--- 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,10 +1,10 @@
  -----BEGIN X509 CRL-----
  MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUubmV0
-MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE4MTEyNzIxNTgx
-N1owDQYJKoZIhvcNAQELBQADggEBANGAO0waSVFGj9/q0XOcjqk+0b7bp8Qdlc7O
-EZYhe0myDz7+mPBTW9N7595XWprSKy/4H6l5wczDXHM8zSWmSuvaBlQXeYK63N3V
-+kaT4zl7crLnEsxjtED+Rt8jujEHPbUl3OmQkVRei5Hic1Aju8mF0CvvIPIXZqCW
-ZUyKg5oN4R+MRrnKD0dc8Bd41nA0MHeQGmMzv5xVVd+09a+FwJC5mTgFAI+QNNs6
-bm2HWOWsDPaShXgaSIf7dz6T0l3p25OsYMiQ6tZvs6VtupRy3LaOML9wYw/tzPSH
-w+LoigSP7MWJr0rHZ6ex2HzKBMr4Fi2fwUULZ93YsSsZkGYyQeY=
+MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDIxMDYwMzIyNDkz
+N1owDQYJKoZIhvcNAQELBQADggEBALX1o5JRF+a/ixZfG3nfAN3xo+JHg2l7tfeB
+2473T3E5CRbDKd58ya+JoPePUv9UjUMzOP+F2NVZc2qUdrHEZVnZCRYVpdwUW/0V
+go+sqf87hRCUbMdljHVTc4kXjTfKpU6Tej4aRuodPl0grgOYlMdEsgRm8auEzVZ8
+9a6hAjFd4vRKPiYY5XrGQhyXGeC5EqFn8zUw7p8o5qbsLBblpHNpGU4S/KOFfEpQ
+m7SFLXJS/4A/IqWc+gB7lqlVPQi+wLjEaWNyhmYZKazwxJPrCBW1lx4zlGPT6q2M
+G3ptcdtYaUlthSWhU+Ueg6BMp1tMa9KzCJyoeWaBiE0LM2LyUZI=
  -----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 9d722435bdf4090356b2ac302aa5e71d8a8feaf5..713084e77e14775c178444aa1e063309de60919f 100644 (file)

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 e47bb50ebd280b4c19877e838b01e842647686bf..16a6076481bd307895a66e2352674cfc666fd0ba 100644 (file)
--- 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=20181127215819Z 
-addcert 102 20181127215819Z
-addcert 202 20181127215819Z
+update=20210604172341Z 
+addcert 102 20210604172341Z
+addcert 202 20210604172341Z
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 4f3e84d4ac232403f33732979bad694aa5ba4af7..5f2c05be31ee384422ec40c7f7177c27c72dbcf8 100644 (file)
--- 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,11 +1,11 @@
  -----BEGIN X509 CRL-----
  MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxODExMjcyMTU4
-MTlaMC0wFAIBZhgPMjAxODExMjcyMTU4MTlaMBUCAgDKGA8yMDE4MTEyNzIxNTgx
-OVowDQYJKoZIhvcNAQELBQADggEBAKv022Dqq1GH3B6AbE9mDaxe/J6WBydq0r5l
-r759+v3X8+EZx164k787Of00Zm0IY44++OPZug+TkzQ8Za37R1+UpWBICpwrRBj9
-8Ltpz9QbwzNcioo/8vxqiEvKhJB1w7USqJ0TA0ZeeAo/dARMOeHoHkbJY5PrJgRY
-ftArrNg8kqaJbknxnGrBX7AkxIJzv1wb4aQQTIbuiDO6CYQyOJivwynLcSw10NLT
-seUlXoO6eh5g+FF6SLvsaiHQhvzlhKT2D2yxes3mosgTA7yVl/Q7lFius1i0jDxq
-rNPUYGT6YvT92Oz5hWTvvhJ1yLtub+OnJZwA9ulG0aZyjC3wJo4=
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMTA2MDQxNzIz
+NDFaMC0wFAIBZhgPMjAyMTA2MDQxNzIzNDFaMBUCAgDKGA8yMDIxMDYwNDE3MjM0
+MVowDQYJKoZIhvcNAQELBQADggEBAGYlOfzEqSZhQ4Ko6PwjX8WmMdAcxbJvb7qp
+T36EqSAiel0u+fIbg0j2pRYdlPxWZz2t0WNq9frDsQ/EwOiWFDokeC094IdPCA5A
+t0tg80kNw8pIgumWPbmXMs0kPOw3EeEmbyC8NBY1UX/lh8AkLnOsxZMMcgme4qRh
+vJ+83TDyfiXGRIWgadWv6YGgxJIPohXvQ6rkcmGoJRJCYk7hpGLiMkc0RXf30fE3
+gR1/RR4tb9gIciFLZ+k7UY1hAiNSbsUVjBKqs5XwHivjLttTynpnyYH8QeBq3GCO
+KKnWaZ3cODyy3prEUX85ZqpfZFllDzmWT54TcP55Ublp1+6xNYk=
  -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/index.revoked.txt b/test/aux-fixed/exim-ca/example.net/CA/index.revoked.txt

index b141dca6bb3ed1d04fb69932a5c48b81fd860a37..15e39a0a0e9526bb78c4700d98f6660758aa2289 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/index.revoked.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/index.revoked.txt
@@ -4,3 +4,4 @@ R       130110200751Z   100201142709Z,superseded        67      unknown CN=expired1.example.net
  R      130110200751Z   100201142709Z,superseded        c9      unknown CN=server2.example.net
  R      130110200751Z   100201142709Z,superseded        ca      unknown CN=revoked2.example.net
  R      130110200751Z   100201142709Z,superseded        cb      unknown CN=expired2.example.net
+R      130110200751Z   100201142709Z,superseded        42      unknown CN=clica Signing Cert rsa
diff --git a/test/aux-fixed/exim-ca/example.net/CA/index.valid.txt b/test/aux-fixed/exim-ca/example.net/CA/index.valid.txt

index ee52d836874681e10c2cefa55605f7d9fecc3b40..a60ca3f3217f44cfa2d7f9cb4eb5dd341ae49592 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/index.valid.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/index.valid.txt
@@ -4,3 +4,5 @@ V       130110200751Z           67      unknown CN=expired1.example.net
  V      130110200751Z           c9      unknown CN=server2.example.net
  V      130110200751Z           ca      unknown CN=revoked2.example.net
  V      130110200751Z           cb      unknown CN=expired2.example.net
+V      130110200751Z           42      unknown CN=clica Signing Cert rsa
+V      130110200751Z           41      unknown CN=clica CA rsa
diff --git a/test/aux-fixed/exim-ca/example.net/CA/key4.db b/test/aux-fixed/exim-ca/example.net/CA/key4.db

new file mode 100644 (file)

index 0000000..f40d20d

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/CA/key4.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 a3fd77068bd5dcecba1e6f0982fc89daf56fd7c3..cbde61288045c7d33d8504bfbe2c5075f96a1d78 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.net/CA/noise.file
@@ -4,11 +4,11 @@ cpu family    : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.567
+microcode      : 0xe2
+cpu MHz                : 3251.173
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 0
  cpu cores      : 4
  apicid         : 0
@@ -17,9 +17,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -31,11 +32,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.304
+microcode      : 0xe2
+cpu MHz                : 3389.936
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 1
  cpu cores      : 4
  apicid         : 2
@@ -44,9 +45,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -58,11 +60,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.904
+microcode      : 0xe2
+cpu MHz                : 2700.000
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 2
  cpu cores      : 4
  apicid         : 4
@@ -71,9 +73,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -85,11 +88,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.140
+microcode      : 0xe2
+cpu MHz                : 2700.000
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 3
  cpu cores      : 4
  apicid         : 6
@@ -98,201 +101,94 @@ fpu               : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
  power management:
  
-processor      : 4
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.316
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 0
-cpu cores      : 4
-apicid         : 1
-initial apicid : 1
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 5
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.052
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 1
-cpu cores      : 4
-apicid         : 3
-initial apicid : 3
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 6
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.211
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 2
-cpu cores      : 4
-apicid         : 5
-initial apicid : 5
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 7
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.089
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 3
-cpu cores      : 4
-apicid         : 7
-initial apicid : 7
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-            CPU0       CPU1       CPU2       CPU3       CPU4       CPU5       CPU6       CPU7       
-   0:         23          0          0          0          0          0          0          0  IR-IO-APIC    2-edge      timer
-   1:          0          0          0          0          0      20892          0          0  IR-IO-APIC    1-edge      i8042
-   8:          0          0          0          0          0          0          1          0  IR-IO-APIC    8-edge      rtc0
-   9:          0      17253          0          0          0          0          0          0  IR-IO-APIC    9-fasteoi   acpi
-  12:          0          0          0          0     975537          0          0          0  IR-IO-APIC   12-edge      i8042
-  16:          0          0          0          0          0          1          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
- 120:          0          0          0          0          0          0          0          0  DMAR-MSI    0-edge      dmar0
- 121:          0          0          0          0          0          0          0          0  DMAR-MSI    1-edge      dmar1
- 122:          0          0      30204     286226          0          0          0          0  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
- 123:          0          0          0         54          0          0          0          0  IR-PCI-MSI 327680-edge      xhci_hcd
- 124:          0          0          0          0          0          0          0        459  IR-PCI-MSI 2097152-edge      rtsx_pci
- 125:          0        168          0          0          0          0          0      60672  IR-PCI-MSI 520192-edge      enp0s31f6
- 126:          0          0       3771          0          0          0     457003          0  IR-PCI-MSI 32768-edge      i915
- 127:          0          0          0         18          0          0          0          0  IR-PCI-MSI 1048576-edge      nvkm
- 128:          0          0          0          0         52          0          0          0  IR-PCI-MSI 360448-edge      mei_me
- 129:          0          0          0          0          0          0         45          0  IR-PCI-MSI 1572864-edge      iwlwifi
- 130:          0          0          0          0          0          0          0        636  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
- NMI:         16         14         15         17         17         14         15         14   Non-maskable interrupts
- LOC:     911203     934148     935935     986987    1035225     900206     962225     942413   Local timer interrupts
- SPU:          0          0          0          0          0          0          0          0   Spurious interrupts
- PMI:         16         14         15         17         17         14         15         14   Performance monitoring interrupts
- IWI:          0          0          0          0          3          0          1          0   IRQ work interrupts
- RTR:          4          0          0          0          0          0          0          0   APIC ICR read retries
- RES:     243281      93274      40196      24339      17700      13145      11662      11183   Rescheduling interrupts
- CAL:      33860      31849      33687      32823      33578      33525      32134      32426   Function call interrupts
- TLB:      16415      15608      17440      17663      21127      17152      16593      16540   TLB shootdowns
- TRM:          0          0          0          0          0          0          0          0   Thermal event interrupts
- THR:          0          0          0          0          0          0          0          0   Threshold APIC interrupts
- DFR:          0          0          0          0          0          0          0          0   Deferred Error APIC interrupts
- MCE:          0          0          0          0          0          0          0          0   Machine check exceptions
- MCP:         29         30         30         30         30         30         30         30   Machine check polls
- HYP:          0          0          0          0          0          0          0          0   Hypervisor callback interrupts
- HRE:          0          0          0          0          0          0          0          0   Hyper-V reenlightenment interrupts
- HVS:          0          0          0          0          0          0          0          0   Hyper-V stimer0 interrupts
+            CPU0       CPU1       CPU2       CPU3       
+   0:         16          0          0          0  IR-IO-APIC    2-edge      timer
+   1:       6491          0          0        413  IR-IO-APIC    1-edge      i8042
+   8:          1          0          0          0  IR-IO-APIC    8-edge      rtc0
+   9:      10190       6724          0          0  IR-IO-APIC    9-fasteoi   acpi
+  12:    1604003          0     508743          0  IR-IO-APIC   12-edge      i8042
+  16:          1          3          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
+ 120:          0          0          0          0  DMAR-MSI    0-edge      dmar0
+ 121:          0          0          0          0  DMAR-MSI    1-edge      dmar1
+ 126:        930          0          0     332105  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
+ 127:          0          7          0         16  IR-PCI-MSI 327680-edge      xhci_hcd
+ 128:         38        174          0          0  IR-PCI-MSI 2097152-edge      rtsx_pci
+ 129:          0         39          0          0  IR-PCI-MSI 360448-edge      mei_me
+ 130:         28          0          0          5  IR-PCI-MSI 1048576-edge      nvkm
+ 131:    1349951          0     395394          0  IR-PCI-MSI 32768-edge      i915
+ 132:          0        104          0          0  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
+ 133:          0       2695          7          0  IR-PCI-MSI 520192-edge      enp0s31f6
+ 134:        995      71213          0     120236  IR-PCI-MSI 1572864-edge      iwlwifi
+ NMI:         98        110         97         88   Non-maskable interrupts
+ LOC:    4594510    3966533    3675926    3520797   Local timer interrupts
+ SPU:          0          0          0          0   Spurious interrupts
+ PMI:         98        110         97         88   Performance monitoring interrupts
+ IWI:     627218      44368     237554      44775   IRQ work interrupts
+ RTR:          0          0          0          0   APIC ICR read retries
+ RES:     197252     198643     185080     177520   Rescheduling interrupts
+ CAL:     484165     477415     459187     488397   Function call interrupts
+ TLB:     782229     815197     819069     831513   TLB shootdowns
+ TRM:          0          0          0          0   Thermal event interrupts
+ THR:          0          0          0          0   Threshold APIC interrupts
+ DFR:          0          0          0          0   Deferred Error APIC interrupts
+ MCE:          0          0          0          0   Machine check exceptions
+ MCP:         29         30         30         30   Machine check polls
   ERR:          0
   MIS:          0
- PIN:          0          0          0          0          0          0          0          0   Posted-interrupt notification event
- NPI:          0          0          0          0          0          0          0          0   Nested posted-interrupt event
- PIW:          0          0          0          0          0          0          0          0   Posted-interrupt wakeup event
-MemTotal:       16284452 kB
-MemFree:        10021040 kB
-MemAvailable:   13201980 kB
-Buffers:          264456 kB
-Cached:          3327020 kB
+ PIN:          0          0          0          0   Posted-interrupt notification event
+ NPI:          0          0          0          0   Nested posted-interrupt event
+ PIW:          0          0          0          0   Posted-interrupt wakeup event
+MemTotal:       16247944 kB
+MemFree:         5675196 kB
+MemAvailable:   12670920 kB
+Buffers:          537676 kB
+Cached:          6970708 kB
  SwapCached:            0 kB
-Active:          3261616 kB
-Inactive:        2456108 kB
-Active(anon):    2127964 kB
-Inactive(anon):   244648 kB
-Active(file):    1133652 kB
-Inactive(file):  2211460 kB
-Unevictable:          80 kB
-Mlocked:              80 kB
-SwapTotal:       8212476 kB
-SwapFree:        8212476 kB
-Dirty:               692 kB
+Active:          3771416 kB
+Inactive:        5913828 kB
+Active(anon):       3080 kB
+Inactive(anon):  2691256 kB
+Active(file):    3768336 kB
+Inactive(file):  3222572 kB
+Unevictable:      283428 kB
+Mlocked:              48 kB
+SwapTotal:      12406776 kB
+SwapFree:       12406776 kB
+Dirty:               272 kB
  Writeback:             0 kB
-AnonPages:       2126256 kB
-Mapped:           481400 kB
-Shmem:            246332 kB
-Slab:             324580 kB
-SReclaimable:     173192 kB
-SUnreclaim:       151388 kB
-KernelStack:       10096 kB
-PageTables:        39944 kB
+AnonPages:       2460524 kB
+Mapped:           837280 kB
+Shmem:            517484 kB
+KReclaimable:     342932 kB
+Slab:             449876 kB
+SReclaimable:     342932 kB
+SUnreclaim:       106944 kB
+KernelStack:       11616 kB
+PageTables:        30076 kB
  NFS_Unstable:          0 kB
  Bounce:                0 kB
  WritebackTmp:          0 kB
-CommitLimit:    16354700 kB
-Committed_AS:    6637056 kB
+CommitLimit:    20530748 kB
+Committed_AS:    6245924 kB
  VmallocTotal:   34359738367 kB
-VmallocUsed:           0 kB
+VmallocUsed:       56292 kB
  VmallocChunk:          0 kB
-Percpu:             4256 kB
+Percpu:             8800 kB
  HardwareCorrupted:     0 kB
-AnonHugePages:    806912 kB
+AnonHugePages:         0 kB
  ShmemHugePages:        0 kB
  ShmemPmdMapped:        0 kB
+FileHugePages:         0 kB
+FilePmdMapped:         0 kB
  CmaTotal:              0 kB
  CmaFree:               0 kB
  HugePages_Total:       0
@@ -301,14 +197,16 @@ HugePages_Rsvd:        0
  HugePages_Surp:        0
  Hugepagesize:       2048 kB
  Hugetlb:               0 kB
-DirectMap4k:      282088 kB
-DirectMap2M:     7968768 kB
-DirectMap1G:     9437184 kB
+DirectMap4k:      325096 kB
+DirectMap2M:     8974336 kB
+DirectMap1G:     8388608 kB
  Inter-|   Receive                                                |  Transmit
   face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed
- vnet0: 1155867    4102    0    0    0     0          0         0   959892   10304    0    0    0     0       0          0
-wlp3s0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-virbr0: 1098439    4102    0    0    0     0          0         0   735824    6022    0    0    0     0       0          0
-    lo: 7424702   45950    0    0    0     0          0         0  7424702   45950    0    0    0     0       0          0
+    lo:  757127    7251    0    0    0     0          0         0   757127    7251    0    0    0     0       0          0
+enp0s31f6:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+wlp3s0: 128939359  122393    0    0    0     0          0         0 19221916  102381    0    0    0     0       0          0
+virbr2:  442398    6834    0    0    0     0          0        16 17312033   12683    0    0    0     0       0          0
+virbr2-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+virbr0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
  virbr0-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-enp0s31f6: 39251323   34779    0    0    0     0          0         0  5044761   25668    0    0    0     0       0          0
+tun_wiz: 76308729   78375    0    0    0     0          0         0  7300186   68090    0    0    0     0       0          0
diff --git a/test/aux-fixed/exim-ca/example.net/CA/pkcs11.txt b/test/aux-fixed/exim-ca/example.net/CA/pkcs11.txt

new file mode 100644 (file)

index 0000000..4a30b48
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='CA' 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})
+
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 c5b00da24223158003a04695f434269d51d08cbb..28ee5da581fe43d7e8a6fd291958904f9fad2445 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.net/CN=clica Signing Cert rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica Signing Cert rsa
+
+issuer=O = example.net, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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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-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.net/CN=clica CA rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica CA rsa
+
+issuer=O = example.net, 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.net/expired1.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.db

new file mode 100644 (file)

index 0000000..2495422

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.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 60fecaa4b5c5bbc70096572c98ae2996bb68ab8c..4c00f240700fc0109f12bfd3d955efc91d3f69bc 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: expired1.example.net
-    localKeyID: 8A 4F 4E D3 55 83 6F 81 A0 9B 27 0A AE 6A 70 F0 5F E6 7F 54 
-subject=/CN=expired1.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: 4C 36 56 FE 4C 54 22 97 4E E9 9E 57 E3 75 DE C5 30 BE 2F 2B 
+subject=CN = expired1.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQxMTdaFw0xMjEyMDExMjQxMTdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoPjPeMGY
-s/5oiazaIe1/UtAeJVPKJXL71t+5CK5FjN1umswps6lxmEaNV99cKTxvLvcmbibn
-iD+DS01LsM7VEv0WLOMKNs42a6IS21ux7JklBVlYTr7oNi6k/gnOLQRkhkhii9MS
-+fVipfa0hLbXbV9HchqufjN6yCMyX8xwBMb01024TcHV/ibJJAXoT0qCzp+1MCWY
-uCZfgLVchb4y4tp3vLWu17nbwSMQ/55V+V2itlWqvR9bsgMj6zoS+wK4GnxZ7pMr
-oqQmVW3TmMNDFjbjPdkXhKxbUGETb/Xu256XLR9a4cm8JN7Yqmm8mn+WLUjjh8J1
-56fdsWwN6YqW2wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM2MDlaFw0xMjEyMDExMjM2MDlaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvWHU2r06
+45JJmiIjvhfA5P+XY/EF3DIK4yI4x8h8SqjE0Jjx1nN0MlWjnYHidagXVcKxGWpZ
+8vQichF3LfDzGj1tpHdhSD2li+dHRUV4hrD2Xmr/BWcarjrNT0vcDAIV21cyt1if
+kM7Ur6JfPfTKaqQEdGxpmlJrxyoS1G3CDaNBDc1uiCgeIARnrpQy7u8MpO4bwg3K
+rEHhOFz1ONpWjIiccd77BYJRG1iIyC2PIKuBZBRRjvdVIAUwmfsgpmu78rS3xIRM
+AC/725cpBdInaJhyNG3xZjCMtq1PW8pi0aDxoGG7ebHfmUjW5x3NGdX4lxk/ACZT
+DZB+Lvc/kgdb2wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQDs0tvqjmxMihXU
-4Kf86vo1mXpR+tlk2lMUcnE0OwxA0kVoVVZPruO1Y29TFfIl2uxncaY2XgR2Q9BH
-LGMeSsQdIMgLBA0AVJQ4MzNgdwPqLLbnNVCXG6lrFTWLuS6j0Zu4uX9V9TDb4FnW
-IDgbHCtDMGX3t47DoXV8YsPfw6aTOncjoVYVeE2NVvLAvaLqwpiuYkymWO2hwX0M
-UY+Anfn3WSDO6+NMHLnPLU41T8S06Nu/PjH13JOErEhd/rWfcd5xikLcgNN3yZs6
-IG391dQz0zTmoG5HfdvzobGc58HAx+YZ3jNyTZ0hsHxJyvTHOD3oa34KDRcMbuU2
-9NoOjUvc
+cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBmYhQn/VfZNqDZ
+WdsWGuf78fJ1dIeIQEEhJT6eFZi8a7Il4EMqQJYSAVVCxLEgTZsBSVYfMfprNdRW
+Hp8HjYqhq/A+a1XWas6A4CtZxZcyQHDkCPNsShp9NC2WPCzDYri5/pl+HCiGI+vd
+m89GZhPGGlxtBDOVTs+7+jTy7nh4hfnSOL1f7RHq5rX3D6eTIgUx1sl88S9z+zfK
+6TG4vJvIyIa03ZkjJqlaYqfPB8DCjTW98ljwJHq5jsDBlGZpYQ/NNX5BaOjnhF97
+bzdTzu1S1/cXrjIs45wmOGgC7O797UOqMPnmNLsoGv4xuMiIF2dIY5cny8yPcygZ
+1JYtPHnV
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 d77c234baf7509ae60c5c52d825993122bd266c0..ab229fef059c27743236bdb38aaa83b85afe169d 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: expired1.example.net
-    localKeyID: 8A 4F 4E D3 55 83 6F 81 A0 9B 27 0A AE 6A 70 F0 5F E6 7F 54 
+    localKeyID: 4C 36 56 FE 4C 54 22 97 4E E9 9E 57 E3 75 DE C5 30 BE 2F 2B 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI165RINayKDkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCpmNR68bPwZBIIEyBpQcXmzJL3Y
-H0y7gb3eEX7jmptKkZHJ3f7IUTlstt1UNzwNGkQRKp5K7PcRiTL3cu7ayLNyZaF5
-m3q6ULCQ9QHbNW7Uz3HJo2XzSNi25ev6x8s9ee9P43y6nxGjcSY4wlfcMB0pNc0b
-mckeURDBden16RpA1eb2gYSh9NKXI1SdkbICVnLsWzdpoRYfRWDW1ptAnXBt5CVO
-nil+HfV69gbNjxiuxQiHak3jRpekpWGY7V0KwHnx3lXzTlLbEJrr0m4pawXx1kVh
-DWP5Fd5bLNVkRH2lie+1XmuKEM5BFV8kQ0W7bJL16TzWB6BB/O1YN+ThMc/tgaLA
-T2Y7gDkBwQ8IRp01g5Y2jFzfBpwEBVO+SmvLCMlP0mHpMCnRuY4SyS4u1nQmRukX
-NU3dxRqyiXgmSsTtgh/E1O22Rq9tUVTCIdi7agbPiutpnU5USdkh3PxXpiBZJOL5
-9QXkaxaQ74tWbpfYXmDXlxiRSTvs5p6UCBrM3MxkwPe1QsWbGoddW4Es9z6aYjH2
-3mTh1YBcek6Rchxx7SZX4s2zB2bSwai7KO0hounEi2LXgzVxsZQPjkQddgBhCXrz
-+PxT9u25TkN9s45P5sH1x/2AWavTw3ztT/Xng6zLbXqWeacxiOTLSUEuwb7oUwSr
-xOV2PmxNPZMAspb1J0j7hHLv3uKr/opUBt973FkzLCED+4fPweP5MU8HcHcfeDJ+
-d51nJ2BJT3WYpjpjTX1SHA40MOHtf7X541oRU2okpZmCdzQvW3Y/YazUcjCVTI+A
-MIQsBXl42bq94TUBbHemZAlIYHRlWqFD42oEoiIWypch89qy0GwvFWYJDH26khzi
-LjC8zmYTugmsFSuP45FFFhj0JHeCqOrm6Mvg52pj3TKGiL+ROvCPO90+Wb1j9Afu
-/UVGv7v6Orjdt7KosxCHssiF7xJRBtbagyjqMb3oPOJWWtgx7NBCt0KTN+iPl1oh
-Vpr6ivToOEBymmE+3eXmmgrcGCr7L91saJ4cfujE1IaptbrF5QUAngTLFt0ZgxV2
-YNytpeSU3g6aeXMyfvr4a/fikjgHY+Nfm6yLIrq2IvjVnINHVojM+Z1vq4o/LTB3
-8oyWuv7c7F5ivaY3S+SSp/hncbcZ76MtSAUpHe5EJ+iKBW9b9yirU1Wn73q4yMsw
-ZwNX+vAM0z/xhQOwXcvgNXiW01+b+bSDmSOczMkbK72jfJN6TVinZKcpJyBp9Lnk
-otdx6Ly8DhwiHrBI8R/0+mL0m3vyaopYJayLR+jXg5d89Mus0yOUNrnLgJGVrhn7
-8V2HD3QdnCWYO+nsXgj6+toPBf3IKw4/0AI7u90cLEGuNomnQcKpzqkpmYZdqZQ2
-WolTnvbJumTwVw1Yjb6akI/M/qYgAaAw+RtFqrecp/hncumY1Ri92A9DzWh9vrT0
-CUinco7MUsFFj0XkJwqP91RL643dw0FXuOGt+ftCL4+COZuE+xAqOR8M7O5OoVXU
-yRDSyU56higgEwuVnEXW5bmM/Li9/UVEWGF6eyUGTmec7ZrtgqHauNk9mw71G0c+
-W1CfOXSVTsJAb9QzCllAiuoqHaDKnp4WmOLJxPZYIqKa8PaIrJZBAkYf1Wd/633k
-MOiq/uPUS2zQQPTrz6cHnA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI9+2r8CEbtMACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCqTJnf1zXhxBIIEyCQFLiqyN+dA
+Ynb1G5/CgeEuUZ1BrQ8zjQI4lFuFtv1AnTs7XvVNsfTujYCVHUJ93/VJeY3bPCEB
+dBv7OVAZA58z96PlP8v+eTEawo6kc9QALSTuXCiyE+x/wpot7cirRhSfUn2Kedq8
+8ecZJ7tE1eFO0g4t6U9Zgrs1rcsiit1CeXWojvlprIR23uQOl0Rg8ntZIaG+LgJ7
+f0uhqeAYY/ehcldI+WHtWh8LwHbwLe3BiGTgj5732JpPlDo2C7tTrmIJkY6tefB6
+A9hN6p3A7rc9azmZX/gD3keNVsTZesF++4rLEEwmrbkF6QeqHryr6PiTEAtnX25W
+srU5aW1YMsUkq7poZB04dTBykHeGoNEmPUzQRk3T7ugugKGWjVxhquREZeYZo9sF
+a/w5Y4qrLULr1K+1jz+r4K9nvEp3wMYW3EeY4+mmLX20l6FIDjp1l4GbwjvXuXtG
+PHDiKMPqortVkE8wNL77a0ea6NdJJAvILQVIkwAwJvmm28bhQ70SqvQjCbsKdjH1
+0QCnNAQW97+wviZ9iWJHPd7OAgzMrb4IpKj/YXSxw5GUDOgpC5CSpb9w4HohGjTK
+BOCdZQvfQNBYl5azgn03ibaupz+lndxqrZ6EsRghlJ9MvDzpfZlnWxMdpCY6uME4
+CKuopfuWI07T1rj90TrS9bo1YtwE+gMitY2EHuX4peb4bF/qLMe54pW+Cj3bEU5Q
+3Wug+4pqjbLL14xhXJ3JCwsbnIefvG9xePSMf0ZFgip+g1FwovtcyK+XdiQrjSgO
+Ev5gOWITRAcBO768BgYRPRazeQ3MpTniAWo0mYQkhtpJx2Vdwy5cTJXWTC1W812t
+OfFo4Py778zl2goCMl7HboLm43fuwckG4OibumKCwf8k7nYJ2bzGTP+wZsc2r1gD
+3efpYf+zMDqbs4m0UysFXY802ECNZJKJ72oVa5Qb6lFkcsa01NErGKzA3CbnHexX
+c4LlgY/yfFHmCccTcUUQ1769XHMmhcX/JuaxBS+HAUCX61ExtpfZOcdpFkrlhX+g
+qn39Ys8Qo+LSCFDWPTBsE8ukU0ul0fp9hw1HvRQUE5Lqlfjn98SfbQAd5gf2Z3j7
+PFQSMyZEJElQEnnqQAfsgwgBTl/qAIq1K1bDwnxJ2252e6ETa6fC5h/x6AHlDspJ
+cz8oHyUa1Q6FDhafLPhkpt1re3woIHmFc2LzyGbJ3/iHejIO4HkAKYMQCh6gDFuR
+4in7EP8BQHNcxXHPDh1/HwpzNDw7h8Q060Kb6MXfZLO14xJjZcxCLWW+LuS5tjM6
+q9Jyd7lpY3Xjb8NFexsw7jqxMd/AztphRCou4JsPO3HEDnlXHCwhGBE2XizUNvhV
+yUO2GH7DkPhwqgLarDBGppG2+3FB5OCmcD4Z9GIX/bNziTHfKY9SKHolT5YaPmMz
+OgFrqbNlI49lOht9L8HUPw83wdLDePLsqI8hL8E8VaKuDi6G6P2Gz77vw+iuAirZ
+EEXHSDwIORZZKQoI7D33Z8mReRJfxOX/hSkvZMCIHM+VLuhyrBeQNGdh42FXJRFB
+J0sbvQAig+t5bs8h+gUiK68gcmBq5eNNWlBe2PdS1B2K9Gwrbcmp7t5AzMqyCxtU
+P/wL9HbFssgsR7QDSlzPZg==
  -----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 16b9cd1f6a06f032c5fb5b426d0b9a6dece9e266..f2aca26715caac50ada8cbf5d06b721607fc4fec 100644 (file)

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 bc375428c5a7842d0d9806273d978b8e75f6daab..ddebbee241d3c030e3efe6f49bdd41dea9186b50 100644 (file)

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 f1055519bf9e942006a53e047e1387524a419796..e2cd8ab97ec051af08ed24eb91b60c01bed92682 100644 (file)

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 e3e5c2229329bd5826e1a91e67f003ca7e7d1108..701d26a941d4359d572177abd3e78f5a702effc4 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp

index 090a4dfa39e20603492a4f4b4ac2e1582ad7c24c..fa9bdc435d72872a361e3f5df78d813599268525 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp

index 3fb9262bfc5484de0ee8adfb71efb9da00eab91e..d63570a905efe4d3a2d59cc9959fbb7160cca22c 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp

index c75929e2d1f23f386b7cb88314e6ec43ba221707..ac9eecd802a9f108187e287aa3298264f7571316 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp

index f7ba29276a86d3eda24f5d9b3256e071501929ab..c629d98e03174005e315422d211fcfd5ce86cedd 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp

index 3407ec72d9bba534eb17456638029f9252627975..a9d87c033996fe82c40fe52f65d691210df953b8 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp

index 90ae93303726e5c1bc87c565d3171bd28e5623fc..56a2b7451e95125370fa702cba72e7e8e1143fba 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.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 a7b63caf4ca6c2aa5beb71f0e17172b6b42562e7..9ddb0eb24d097cd127d3ce88ed1b421c80304ae7 100644 (file)

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 43393714c5e98731cd4f489a3382ade1a12291a1..cc4588941132bf22316b31191a850b643c161243 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: expired1.example.net
-    localKeyID: 8A 4F 4E D3 55 83 6F 81 A0 9B 27 0A AE 6A 70 F0 5F E6 7F 54 
-subject=/CN=expired1.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: 4C 36 56 FE 4C 54 22 97 4E E9 9E 57 E3 75 DE C5 30 BE 2F 2B 
+subject=CN = expired1.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQxMTdaFw0xMjEyMDExMjQxMTdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoPjPeMGY
-s/5oiazaIe1/UtAeJVPKJXL71t+5CK5FjN1umswps6lxmEaNV99cKTxvLvcmbibn
-iD+DS01LsM7VEv0WLOMKNs42a6IS21ux7JklBVlYTr7oNi6k/gnOLQRkhkhii9MS
-+fVipfa0hLbXbV9HchqufjN6yCMyX8xwBMb01024TcHV/ibJJAXoT0qCzp+1MCWY
-uCZfgLVchb4y4tp3vLWu17nbwSMQ/55V+V2itlWqvR9bsgMj6zoS+wK4GnxZ7pMr
-oqQmVW3TmMNDFjbjPdkXhKxbUGETb/Xu256XLR9a4cm8JN7Yqmm8mn+WLUjjh8J1
-56fdsWwN6YqW2wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM2MDlaFw0xMjEyMDExMjM2MDlaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvWHU2r06
+45JJmiIjvhfA5P+XY/EF3DIK4yI4x8h8SqjE0Jjx1nN0MlWjnYHidagXVcKxGWpZ
+8vQichF3LfDzGj1tpHdhSD2li+dHRUV4hrD2Xmr/BWcarjrNT0vcDAIV21cyt1if
+kM7Ur6JfPfTKaqQEdGxpmlJrxyoS1G3CDaNBDc1uiCgeIARnrpQy7u8MpO4bwg3K
+rEHhOFz1ONpWjIiccd77BYJRG1iIyC2PIKuBZBRRjvdVIAUwmfsgpmu78rS3xIRM
+AC/725cpBdInaJhyNG3xZjCMtq1PW8pi0aDxoGG7ebHfmUjW5x3NGdX4lxk/ACZT
+DZB+Lvc/kgdb2wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQDs0tvqjmxMihXU
-4Kf86vo1mXpR+tlk2lMUcnE0OwxA0kVoVVZPruO1Y29TFfIl2uxncaY2XgR2Q9BH
-LGMeSsQdIMgLBA0AVJQ4MzNgdwPqLLbnNVCXG6lrFTWLuS6j0Zu4uX9V9TDb4FnW
-IDgbHCtDMGX3t47DoXV8YsPfw6aTOncjoVYVeE2NVvLAvaLqwpiuYkymWO2hwX0M
-UY+Anfn3WSDO6+NMHLnPLU41T8S06Nu/PjH13JOErEhd/rWfcd5xikLcgNN3yZs6
-IG391dQz0zTmoG5HfdvzobGc58HAx+YZ3jNyTZ0hsHxJyvTHOD3oa34KDRcMbuU2
-9NoOjUvc
+cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBmYhQn/VfZNqDZ
+WdsWGuf78fJ1dIeIQEEhJT6eFZi8a7Il4EMqQJYSAVVCxLEgTZsBSVYfMfprNdRW
+Hp8HjYqhq/A+a1XWas6A4CtZxZcyQHDkCPNsShp9NC2WPCzDYri5/pl+HCiGI+vd
+m89GZhPGGlxtBDOVTs+7+jTy7nh4hfnSOL1f7RHq5rX3D6eTIgUx1sl88S9z+zfK
+6TG4vJvIyIa03ZkjJqlaYqfPB8DCjTW98ljwJHq5jsDBlGZpYQ/NNX5BaOjnhF97
+bzdTzu1S1/cXrjIs45wmOGgC7O797UOqMPnmNLsoGv4xuMiIF2dIY5cny8yPcygZ
+1JYtPHnV
  -----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 f238946740039389aa1fe062b530e2ed1cb5606a..5140d6583ae971e6cedb641d35dd90ee001b275c 100644 (file)
--- 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,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.net/expired1.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db

new file mode 100644 (file)

index 0000000..975d1a1

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/pkcs11.txt b/test/aux-fixed/exim-ca/example.net/expired1.example.net/pkcs11.txt

new file mode 100644 (file)

index 0000000..1450754
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='expired1.example.net' 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})
+
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 c5b00da24223158003a04695f434269d51d08cbb..28ee5da581fe43d7e8a6fd291958904f9fad2445 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.net/CN=clica Signing Cert rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica Signing Cert rsa
+
+issuer=O = example.net, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-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
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzU1MVoX
+DTM4MDEwMTEyMzU1MVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
  FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.net/CN=clica CA rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica CA rsa
+
+issuer=O = example.net, 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.net/expired2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.db

new file mode 100644 (file)

index 0000000..61b2d74

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.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 77819b6dddcc6b4cbddbb61de6cacfe939e88134..c51ad0da1d1c8475a5844cef8dc428487466b9e1 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: expired2.example.net
-    localKeyID: 42 D3 9F 5F FD D6 1A 5E 45 FF 77 93 1D 17 6B C6 A7 49 57 9D 
-subject=/CN=expired2.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: 45 79 70 3F FE 66 A1 31 F1 7B 7C 4B 3D EE FB B2 7A E0 72 2C 
+subject=CN = expired2.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MTMxWhcNMTIxMjAxMTI0MTMxWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/e+I+f
-FtycWiSx1SgvyUlqtLk8hyw28Lf7VOcEz31PSVM/VMe8kcODn9EdmO5W5g5n9Cuh
-A1uPbtPdRnwkZ2XqPyJvXhUu5bfYYMF/H+Ui64hvDZ2fWR5Sx35q1FH5amUfzQkx
-9QUPPgU5yNLSpabxFuelJpL6zq8zMYm5ywXZ0gXk88B9ZpHCZJi1oMax5j8t9qOj
-bz9+HUSEd1mYgS+hEVSCFuMk/d1sadAlxdSXaWvGYltas2jGsyxMSasIerwIJkIM
-ySpDRCBOrJvJ6QsvwpXNS3KPt07Ly8MwrBSaxYii/NVPZBUdWMgmmxt3bSSbWf4i
-JGpGaqNE755YEj0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNjMwWhcNMTIxMjAxMTIzNjMwWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCwAEcu
+tavKP4kFHPlKxVgdU/1rS6p6Gsx5RGf2mCMscmVugxP1t6bpuI2hZWbL4oUyXBoD
+ciVbc13kAnq4GlZ0mse8Ps0YrNC4evE6tvmak/snREQNzjCHsvUcKgoOg8J+/bZF
+2dkO4apf3I89K/WCSKrD0Qwmp/a8/jN/LDY7d00l7UM/5pF7LzNV00/K5si0Ix4S
+pMPV125jaEolCbfroKdPN6JnDkZkhTYNE+nIWfvPmfPnysVFH0XSk8yrGDBg+Lsl
+HQupSLxP9Ljimz6NqvymrkM2H2apcZ7GCBkIMqjmEJ4Vfsk+aHuoBA3MD8TwS5dC
+0MwjJ3qycquf5IUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAlHp99YUJwSN3
-TuRa/qcZjKtmDvbbt1uBKS2zUVup23d9efzNtBX4JuKid6iVJSpQCzIAK4pgfmaG
-P0tWmw/nx4hy/KyMZCCKcRDvkWWVUENtcra2jSRXFTfpsSJQM1HiH0JibS4Nydre
-7NwIwEVN89lWqGASFlmc8LTmm400oRqHTJEn4Q835exqkj9rzoMfh5uqgf/Uo12r
-Rk2fwG6d1S7Y+cVczPGXcSXwfUoC5oABnfV04uvDJCp2QZrnD5na4/6Py0ASj/HO
-yGTRYLv5Gr1sdYTzSMvay9/l/fwdvxAmdcZzwsmORdkJ7Zfoqeeg79HeNuWIxrZR
-bFClzZrCXg==
+eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEArDOnw0sy9VQU
+V5ktm8zyJzDB5R4KKuhbtSNGuOsYYZ6jrCVnYzLAs6QuYfrgf3z9oZWSbSOudDUW
+CYNmNeS9YskRpf82ThHgTzjnFbKR/nIRhgFCxa4zL4BE6woCJZ38aX6qUn/6JsGh
+7i21fXwFNxoCn0RxwpgRAeFdHhnScP1beI12YMxiZjCQ6klFzP70y5laWfmseuYs
+Ao6ldAZnOPanikiUQF/6CaKyM37yXI+Q5S2abeK2wZS9QlTOc1FWXUM3wObWVPSR
+CrQ6YbhqlJWpZ7nBlLm9tACx2kO8b1xO6ZLUTUsJwc735t9+5bkGE+c3pnPRmnt/
+rt/ASq2reQ==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 cda33505a5c86cbe5dcadafadb2c2e3dfbff7341..ba8e799bb0b0a17d52ba8abc267541466c4330a1 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: expired2.example.net
-    localKeyID: 42 D3 9F 5F FD D6 1A 5E 45 FF 77 93 1D 17 6B C6 A7 49 57 9D 
+    localKeyID: 45 79 70 3F FE 66 A1 31 F1 7B 7C 4B 3D EE FB B2 7A E0 72 2C 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIjLg5MpcU6qoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAZYAXEHM2l+BIIEyHn+wubn8m13
-LVsuTTJWIErS8fD8wBruKo+rvR5+X5u+slODcNBdKuwWOvEPSyUCpfMcsQ1lqyOv
-hbBUXnp5yl/Ft3YUOrv2gxyQPILZrNotAgrViG6+uqVxsbTJhZAKLUrkr6C3ex8V
-km0jT8WY31itR5dGfeqGZUf8EAtvbVxXbEk/8dB7lF1iYN8LuY6W/VsNce0HyYbm
-ckVCECas79B+hpa0lRWRUpWjdsDrQHx/9+GIrC8niThxf0u8GV+tYhL7BPUDx1KN
-Eht/Mp4yR1TyRnDI/V3B0tJCNv4NkoPVc7u1R5m45OHxvzKYYwnG6DgwDAamwPUW
-c7Skn9ryEpitIsUt8C4or0b1YhacE0fvUjqmv3vQtgGnro4qh9jiqR0jK+faPkvj
-Beg9n0mGgi/AkepQn5HcrAyamrppB4JYYBq9cgoT8MDeAky9AF7eZXLS7ICMurNm
-AenfSVnauZKb6pfy+JT8KOqCojmj00VCXz4ggh0/CDnh/NalOhvdfEF4bfDCqrgd
-eQNyMxvB0Ze1JFrI4/fkggSsA/f7PCTQ+syaaezxvqsD0OGXeXMBttOYTT9y+yp9
-cGXM3Szi1uRmu6A7slOxVijnhp1cle1pf40xys3OYuMTpmAVDqNnIaBCTZ/sSLPL
-FnNOhb71J/q1XduuOp/FNHBmjmEYS8MEsOPK+7YSVlrMlqV6PNa/PCab14ZeVFsi
-TGQIzQGaF7IASompty74E17Sq233zSXR6zm6Yk4Cs6XA5NiI1Bvij9KRwkR0W9S4
-AasZHS963KKmFYNrugzrc3TrEfH0CDVCn4GBv9vL2bQC0t34C1hr8OSro3s+OLkm
-d3Lr8TNbPrI03xvnuUKJU3c3mtlv7X1xTM/mseJU54ZTOW81ccxPgQpdxrLaH+8o
-VaTZnX2PST++ui99qEh0xjcYWALiq44dCon/D9POuc9UzAgHPYtMFT30MmbHQoec
-7PPojl0ixRL8Zxyakj1HQYuqv7G5ZShHlpypaqeUjpsOYVnFyGDvzv5EVPosLOBG
-IeDd2O11JnKmEBO83mCiFmPtSKhg3yMo4BrFsfBA6e6y6+vJtskogI/N/1s/Ex9f
-JGVYL3qvnHaDcABQrV/bmXpx5BDUjV2Pm4vVA53dt4J6dz0EN92XFUzfw7MbKL8X
-dy0hXpGRHu7p6sBvmXw2im/jqJenr7mGY3W0HAAIWtDDCDRUhj+wjRibaUBbnT3g
-7Jm5HMY6jHZ0vKvyMgaeczdmzjm0JPTHQH4tYa1v912qrPoc9WzH3zmOBywC/j+D
-zlqea5s5n5BYYWgq/w8TBEqsdKZVRMP5hQXYkA06RbMhsCcvbCS8xRu2e2196ejq
-wDwaoGtis5+7faISj1EOeNozGkPSNnaUVl/j0630D07NimcHmAR5eP4J2Z7zcy0B
-VlBQJs8kD7FqO5+yyx2+6o5KcX7Mp0CNuO7KN+iXsUM7qUeeuVNEEuEjmdqb/iLO
-tpwkXjP+HluiOZAcsGJLUaKJ7zvEFnJPI7H12VVrv2dZLtCknI2jfHfNtdxfB7h5
-htiZtyYeMW1u3R6F9fygIurs2vmXnJCdJ12o9anCZQJFg2tKby0dqYVvA9wufd4T
-qDy8ppnMt0X0w5JrakMwFA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIMFTH66XMWsECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJyrR38HroNVBIIEyD95knqG9Hh5
+H2X9KIcd7ytb8/PjSLTiArKNp5KpJP753djjlZZgL+xc9f9+iD/tWfQ3d3+2mcM9
+9JZ0oXQcWAWIkAI/vq3C5S7qyDtLjXFkqIqvRMd6m5W4AuH0gCVpJ4QTnYtbMol5
+ea850fKgzjolhoQnne+v1rT7x03E7tBea/Tye6KNZzJQiilKQY2PcwBy/6hL0BZn
+GhxQu6BHHjWa5FE2V6Fj5Byz2XEzyiJmp5Z7dFhBhCAaCPb3hzvty1lDbWNDluGB
+XLuOzADzDIDurtVZNf1t/RnyL/nb8o9IsVtMkThTYx4akcxRyCAmZ1TuuVuKRM6q
+6Za63fevwv6UyIHsNbhxgRJjzd8bn72XLu46tOArBsz5pBYSLf1IS0uDLxsSsTPr
+4tYu+LTyBzN4039JI4b1eZan+NPpTd4cRXWY0PHLoXB2zdlZ4f0cv2Y4TqPioI1s
+V+VhufNHpyHKVW40QquotbnFWKhenaHZ875ydmApnig+B0k+kOffdfPpFbY8VEmU
+F9Fytmy53TrcBUhBf3fJisfedWOsvrrNq2Sw7feVe5TxYrUr0L3SnhYpBKooFiea
+mIt8cBeMy9URTq9ZPMk7T+lAZ/x1bB6nBDtA99ulgLqNdueBT/udZyj9YEMOPTM2
+4HWnpwex6EW65t4VfKWHxNQk6JIwIRu56kV/tYk1AlULtHcJ7UDe9UsBKNu8FCQV
+GPu2X0mKeq6hp5xXti3PZmEo1lYaowE+90KqcyRQ+0FWDX4ksav9kU99LxLRd3lZ
+gMelV+Y/DbVDzLOJayR4fRHdPURlQkqwW1B1m+V3yPLpDGTpGHooBmI87pCmeh2J
+VFnmMOsH3hwSir4h369DkgEuGA7IzVazjNi2VDv+X3ZS2O+SBvjq8qirBJVeF0lZ
+KzpYbKRnnXiG66ijBijJchY389UxRM/QKBJ3lbO+1iAvVd49tScSF4OLpa6VYIhe
+XVRSr//vbJO7xaJZBRVC4tl/wCcu0kZBv32nIxLIqirRI0ieuvnzJNXLy8FYRLAu
+xzA/qVjOC5D+6X7aC0Hlc1yCjEWO2QdiVlg7UzUnHVGLl4pVO0nAGKn8menD7ATi
+fX6El92qN30G4V79WoO0AabwMlZaVdiQseF2Q/9G6M594Xv+BinugyxjNoDWdlK7
+p3vqNDMGvTDshqROIuiBZE87X78cBOKCv/ZomGB0gCDPvPJUxz+Aqp17MmYGCs3V
+Gfq5TmyXchS5gVT2ZxEHYsB2G59512QSCjbL5PxPj9jya5mzniEpBUkh/N1lRfRe
+m/nMxjykYAqLImQtk92uVfIiuAn6w2frkE9PEAYNRtpfQXWdZRMAGiSIzX9dQNHM
+g5+l+5s313FBAYzbVrigW26k2p31pfLh6jaiza9vAwjnigkwuH8qsjlYEx4urJZx
+FBEEUw7U4u9GjmoHaHz1BUMad1NQchHbiztPN4QZH1lw3hqUatdi2VZZj3K9DTUT
+YSk8BjTgV7YUNA80JLio+2gZ628rIa3nZj+8H813dRNpTEyYSRzygz4PSzWHzqqC
+xttRAhXxKOH46X5Cceg2sZapErqgq9O88+ExBM0ZAozYLkwWx0VPhG4w795XMeAv
+dpwdmokmWTI+YDC23Wc5oA==
  -----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 3e9937056c581b46b69a7373bbfdc3e2af8aa515..69a8e0937be58dce8f3a8656f1ebc5c4e8cb1d8d 100644 (file)

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 447adcd96efa30cf88ea0ce94318fe9ac2ca84ac..63978639e36e58fe60c7f693bbca7a300770b6b8 100644 (file)

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 5973b1e1909bbaf314322f3f3b4e6f70e45cfc35..e0b5892f816360fdab59dc1fdb5db4b6793e8e79 100644 (file)

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 447adcd96efa30cf88ea0ce94318fe9ac2ca84ac..63978639e36e58fe60c7f693bbca7a300770b6b8 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp

index 8112a7771ebd91cd64fa5b0105a346fa3ca13133..77499408e66215c789ed063ce1cdfb7d810ba368 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp

index d47f73e08117b51122a69e41067f4039a204deab..98bca16de3e722f78d760df6a3024bdc3ce89ff1 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp

index d47f73e08117b51122a69e41067f4039a204deab..98bca16de3e722f78d760df6a3024bdc3ce89ff1 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp

index c23489521e1b4c933b0c67b387382b1f3fb284fe..ca40d84fcd5543dcedbf24ae6e67775997d97375 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp

index b54e090810febf589c79d161f25a0601c87366ff..f671249752150ad065a31df2d172e52c7500ffbd 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp

index b54e090810febf589c79d161f25a0601c87366ff..f671249752150ad065a31df2d172e52c7500ffbd 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.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 b09b06fad254a1fef9d8dd7791a598ea4f1fbb88..23ee858804c44820c78e2a468be6f98e6b565b32 100644 (file)

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 1c9560df9fe0d57636faf665d2804990855430ee..cf96a8a49397647c8b322fdd226fcf3b464308f8 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: expired2.example.net
-    localKeyID: 42 D3 9F 5F FD D6 1A 5E 45 FF 77 93 1D 17 6B C6 A7 49 57 9D 
-subject=/CN=expired2.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: 45 79 70 3F FE 66 A1 31 F1 7B 7C 4B 3D EE FB B2 7A E0 72 2C 
+subject=CN = expired2.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MTMxWhcNMTIxMjAxMTI0MTMxWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/e+I+f
-FtycWiSx1SgvyUlqtLk8hyw28Lf7VOcEz31PSVM/VMe8kcODn9EdmO5W5g5n9Cuh
-A1uPbtPdRnwkZ2XqPyJvXhUu5bfYYMF/H+Ui64hvDZ2fWR5Sx35q1FH5amUfzQkx
-9QUPPgU5yNLSpabxFuelJpL6zq8zMYm5ywXZ0gXk88B9ZpHCZJi1oMax5j8t9qOj
-bz9+HUSEd1mYgS+hEVSCFuMk/d1sadAlxdSXaWvGYltas2jGsyxMSasIerwIJkIM
-ySpDRCBOrJvJ6QsvwpXNS3KPt07Ly8MwrBSaxYii/NVPZBUdWMgmmxt3bSSbWf4i
-JGpGaqNE755YEj0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNjMwWhcNMTIxMjAxMTIzNjMwWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCwAEcu
+tavKP4kFHPlKxVgdU/1rS6p6Gsx5RGf2mCMscmVugxP1t6bpuI2hZWbL4oUyXBoD
+ciVbc13kAnq4GlZ0mse8Ps0YrNC4evE6tvmak/snREQNzjCHsvUcKgoOg8J+/bZF
+2dkO4apf3I89K/WCSKrD0Qwmp/a8/jN/LDY7d00l7UM/5pF7LzNV00/K5si0Ix4S
+pMPV125jaEolCbfroKdPN6JnDkZkhTYNE+nIWfvPmfPnysVFH0XSk8yrGDBg+Lsl
+HQupSLxP9Ljimz6NqvymrkM2H2apcZ7GCBkIMqjmEJ4Vfsk+aHuoBA3MD8TwS5dC
+0MwjJ3qycquf5IUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAlHp99YUJwSN3
-TuRa/qcZjKtmDvbbt1uBKS2zUVup23d9efzNtBX4JuKid6iVJSpQCzIAK4pgfmaG
-P0tWmw/nx4hy/KyMZCCKcRDvkWWVUENtcra2jSRXFTfpsSJQM1HiH0JibS4Nydre
-7NwIwEVN89lWqGASFlmc8LTmm400oRqHTJEn4Q835exqkj9rzoMfh5uqgf/Uo12r
-Rk2fwG6d1S7Y+cVczPGXcSXwfUoC5oABnfV04uvDJCp2QZrnD5na4/6Py0ASj/HO
-yGTRYLv5Gr1sdYTzSMvay9/l/fwdvxAmdcZzwsmORdkJ7Zfoqeeg79HeNuWIxrZR
-bFClzZrCXg==
+eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEArDOnw0sy9VQU
+V5ktm8zyJzDB5R4KKuhbtSNGuOsYYZ6jrCVnYzLAs6QuYfrgf3z9oZWSbSOudDUW
+CYNmNeS9YskRpf82ThHgTzjnFbKR/nIRhgFCxa4zL4BE6woCJZ38aX6qUn/6JsGh
+7i21fXwFNxoCn0RxwpgRAeFdHhnScP1beI12YMxiZjCQ6klFzP70y5laWfmseuYs
+Ao6ldAZnOPanikiUQF/6CaKyM37yXI+Q5S2abeK2wZS9QlTOc1FWXUM3wObWVPSR
+CrQ6YbhqlJWpZ7nBlLm9tACx2kO8b1xO6ZLUTUsJwc735t9+5bkGE+c3pnPRmnt/
+rt/ASq2reQ==
  -----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 57247084f7fe65b723d108087058947dc7a65e2d..71bd6a6097a4be56f1fb54ec96b262ed1ed4b751 100644 (file)
--- 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,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.net/expired2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db

new file mode 100644 (file)

index 0000000..40edfe6

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/pkcs11.txt b/test/aux-fixed/exim-ca/example.net/expired2.example.net/pkcs11.txt

new file mode 100644 (file)

index 0000000..6017801
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='expired2.example.net' 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})
+
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 c5b00da24223158003a04695f434269d51d08cbb..28ee5da581fe43d7e8a6fd291958904f9fad2445 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.net/CN=clica Signing Cert rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica Signing Cert rsa
+
+issuer=O = example.net, CN = clica CA rsa
+
  -----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-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.net/CN=clica CA rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica CA rsa
+
+issuer=O = example.net, 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.net/revoked1.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db

new file mode 100644 (file)

index 0000000..68e2a3c

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db

new file mode 100644 (file)

index 0000000..6cebd8a

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/pkcs11.txt b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/pkcs11.txt

new file mode 100644 (file)

index 0000000..8787925
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='revoked1.example.net' 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})
+
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 f0d5f02f2ca886677f102fc8bc3d1986e2aa0024..c9c12a01a8b001da8fb1bccd1f40bfc79f6a61b1 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: revoked1.example.net
-    localKeyID: 0E E7 EE 1E 59 29 64 97 EC E6 FC D4 5B 23 7A 8F C5 CA 4A 63 
-subject=/CN=revoked1.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: 4F 5A CB 71 24 F2 E3 EB 09 56 F1 FE 07 38 E4 96 71 45 AA 21 
+subject=CN = revoked1.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQxMTJaFw0zNzEyMDExMjQxMTJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtPqSirLu
-tXEB9YO/EZsDQvDqeAVQhfQH4Ky9bWGOlndu0fEO5Omg/YIuWzBnD8/i5TiYw6wx
-S5k9xbRx4adP5Q1FH9xkOlLf+HZ116mcXsrUBtQYMDwp5wgr6emnXCU/f4mwua0T
-NhdaZsKXhQ0bIdQ9uOMAzhK5nq+FMmrfsDjuujJfuAJ9MgUnIErVETtKRDhstcs3
-hiUyQv4RXI2uXngc3SiaP16EjVDlEuklP7guCY3rZnEfC+aeiYcnKhUAOFI4LjGq
-TpyHB0LIKNk1dfjgvL9ur69JAr4NZJtOAoPrsPgzHdquFhLDscyKX4RH8QRf9rBR
-XZLcBPTVrJRYHwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM2MDJaFw0zNzEyMDExMjM2MDJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Xt8fsTC
+Uzx+sezS5/3xDxR6Zq6AtR7r0QQcxn7Xkj8M2wXH6b/c0Sd+1oGonK2wPpHGVCyO
+y4e3Tt4R/i00W8fX/PuO7UXbVuST7SHUMAZYkrbNeSIl+DiiH+d5o0sMTfqDocCz
+i6ato73DRL9A86Ug/55Pi1MedmtlmYSGPkE5lA7ZV2pIKvF0JvEz6wjn7uLYelTC
+VTk+aKazM/vLtT41j/z26w/EG5y6Yjs+iRAHaiBWJVoHBlBw9LGefdEWf6/lNUaS
+8CH+jUgvZ3LajAItKAyvJr/DNNZtfPE45KpzUJ59PtFQAOQ9ihukgxiDOvVZLKVD
+S3vg4Lw8+pgL1wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQB3pqryqTXKjjjN
-+/DHZXcfWRkNU1PbM710I8SJUzAhe7p2GKERwBLzc2No6OeSo0a6gz6rYEkhBvov
-4sWv6N1luJMCKweSQG1VD3kjK10l+j7uroUt469h1lT4Mvjb7mCbI9ebpQOOYJVx
-Qsw6YM1H3GZmsEb/HEqZwt7WBmcW+jiomiJsUSXngKe+dcXbd0IjBxw79JU/shRa
-O1edLG8AhvqNKvhvgSjANMw1uYK4aaVIu9+e7VV+/J+sZqeF5Xqre4Kk/uz2rqzl
-djgDQD3ik4alDZ1aKXXfvbjSY0KL96gtpDmygjO0AeC9nvl9vcrFnz2rIMrIzFtr
-qxJsx4KO
+dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQAM5ArjARsRqzbi
+VL/F2Y71KuapeiTiYxpPAGuGDU0/mcK6hJD6v094d/ZOD2q4+BdrVnpw/TdfpcHD
+ytHO6SP7nfOzips8VBuBvdTkP2RWqBePLC+8L/h8sS5OaDSa5te7eRuDmmOUplfX
+yXKFw7qlIU0Nx1OeXGPVJLrBg7VhGRd+A+FFTE4LEq2Kk3yGfpyDSMLMo5z7BNhf
+VHRPgBk4wqAkbhiGFSZp0xq/Qo1YaSdtICKfXyfxarSzx+GDIeqtbg1/6mhlm9zo
+TRkTw+ou97qApFadzI7LqVYUy4TUiyREtWRln8uncab3KZV3UYw/Dw9VgD5L2OWZ
+uEK/AEKW
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+CSqGSIb3DQEBCwUAA4IBAQAg6ciW78JLHz2MjwIx/m2jX07ENqBIWl12FJ9PcwwM\r
+E5RDetwUq5heQlYYEQdGom+yc2zwp7/4TwHJZaEx9GExnReF57a67Ikkr4WYD1Qh\r
+4I1my69EZtLI4+coEYfGyKLqjiN3XEFhTQia+4/dXgYFM1s2iMVbRlPe6ms7oYoz\r
+GCs0ZW7ZE+yT4NH6jfxnKUgH+MvGwGG5TLixmmD8JOxp5HsgNC8IuMy3hNnltg/V\r
+eIAvEAzTy7XLfoGp7o4t2WVpL+di05imcFW6GVyjeJhbzIByPC41KKpHSkpBbEbF\r
+SanDKy9b5Uc6JRJBqkubR898AudSB9+cGfVjTzOzrBzG
  -----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 91d72e98bd002772a629b2b67361bdbf845a4ca0..bd754a5698c4c3cde1c44ab29f25536b57364d9d 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: revoked1.example.net
-    localKeyID: 0E E7 EE 1E 59 29 64 97 EC E6 FC D4 5B 23 7A 8F C5 CA 4A 63 
+    localKeyID: 4F 5A CB 71 24 F2 E3 EB 09 56 F1 FE 07 38 E4 96 71 45 AA 21 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIYGVWLt/VpXYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECImfVSLhCy3OBIIEyOuFKsz9blsW
-rVfm3j5ejkgGx9ehzZyNGRAW2O+9H/+oqnleJ0+4CWFf6pEzb8/18BGLWQR5xzOb
-QeYIyWqNVXWrDV+LTUw89HxMRpNmO8sLln73le1HGFzp2KJwAAJ48gf4G0YhcMJE
-61rRrmMvBsHNdUFERyUbdXTDV/Ak6C8KDTYLFWJ3emzfof3ZyqtJKxNO+hV7i9wS
-NtMIFu0+UQ+vM73Wjxzbcl0eQpEv1nvr/a0DCBJxIUs2HiWOIujGPEkg+RaZBBwH
-4J1kde6Q8jTxvXfYnQvG9KA6IweL494KXmNqWKuAr8g2VLGE+mO5TyJ5CjuoPLxJ
-NbpJbnaOm3hDdycrPDR3UlUePYFn/8klE5s5R5zuks7M9ZB/zEJ4EtjTxbCd1cGB
-aVIK4pvo/mG/H615KVveqGwdqOgF8ZaC/wh6+ywr6dpYJ4kNuqqhiMlMRS2qz4U0
-lsBBEiXGEcn1MHCSOIgS+XFNtxvCrjztoQb/IppFyEE5ij9OW+qXJLKXAqFa+zsp
-UzEH1L0G4Kn0qNCBc6PJVsVivkH4m3Qi/wDJ6adeffWcOXO51pjW77iPbaNWRD5x
-M1tlpg8rmzeDZBW2wE1tjoFsWd5wP0pivnl8FV56mXajJ0oP66H7yEqr2cN3MtQo
-VbUYQL+coSsWTkvTsLt7IYcbkghqpQb9WQ5baFywjEAKpuQ4ZbpA1UHpeX6kWqWM
-Ta0V5Xr4fcarfKYJwNNrXoKKHnos/xd9u6/qpjnyGd0hyfgt8hbSmwRFBrI0gWiM
-mVOjsLEDwY4GvZfCO5BEXo676Lx+DLXJ7Fw6+RGEMmtsIlTRV2pbAR2abztUZotR
-+citzi80JOYgSOPB3pt9P2ShdN3uSlIPIcZMvCryeIQ/ToFqSLZbnEd+pAoXN42+
-u5TmS3csvhuVD9okNumw6FJyTeWvRNe3m3Gb0y+xI9x8ZFykTB28AJIBFuF08OJb
-c3IByMvFmiCwrRuH7q22oyGjx5h7SpDOFeu8QwJqnPRFJdssanF2OwWHE6sC76fo
-uaQKibDyBsEIqo0HwlhQN6MbeuGr6tQL9dTc3EVbmviHYfk7HNZYp7ZG1EFDDxtk
-KYA56ypGmeHnW3+DbwFJ5R/5LveXQyVWP7A6+r6/+l0DLDEYROlqmPO2b8A5dSSt
-ko7hNuv1DdMKwOMPGZBMY7NGXb8T2AoVW3wPskIBK0OuRxBZenR45JPE8/+Vu/RM
-jVh/AtaesDsYjfBN060WrigHHXQjkGMmg5IcF+9ljTRrE+8MNEt+0K+psaPuNzrh
-2TP6k/LXmLlgocY40HCYIyaB75/OeQYSEGLeniBjcKTgEUVoO2nGxZRFkqh9vS5N
-RHmhxE2UK8OVfOpVGDWrb+yFsjkBtdxFq2Y7H7QpFwlYWCXgC3ZC/LoUocJZfEdE
-+5wrJRvhLjii9H8vfhW+TGWlKpflC9t01Sf2uz7M9/rCRsWo5fcKqe0HCKNXmJrz
-nAR+7Foviw+35B9iNSbjyAKMiP3nYSQViy4WtHozamGLK6xNo8u2urcnmPvdfM0u
-MpeB9vONOjrURYSli6m+ezyGYxWqYl+NUvq+H3z7ceVVfJg/pOkigLuK9qBNmqCz
-aJTlEJPYzKnN4YEggP9/2w==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIV6whfcDFYI8CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBOu0NjdYbcOBIIEyOdS7RoRqAX5
+4tkJ9ohZoSxhIvSWSGxxMt6vn4YUNKth0wTFPk3xOyau77GsnKKsVA1Tn+PKmrLp
+XCoU09iJuaKWubvNhDp9yo+9Fpkg1JgvB1Im/mpzuz2PlaJ2YelBdsI00D2becWV
+qBfuUhg5RxJ6OmitYgAvxlV875SB9LRbuAeQHrgod7qLmQJuvyQFww4vRGSF+cDK
+waREAu3KgbdA3NUF7caHo4hsnQf7xVsm6BSe5sszL0pXDnc4qwXcAHeW+wXlTWzM
+s5FJ09cg2w522OFO5czbOLsVMpz58zF8YWNUekovUlKBg5TdCgPobumKfBSOUANi
+bl//2zRPannqlHT5GED0B2qSEsXKpSxjNnkCLdLvyBf1JJjRdc0LEiU5VC5UbIie
+2GjvFr1mjZq9uqczaCsWFxa4NAJstUrLZ7xbALW1JjE6KUcusbgqKUxARSHwpHmy
+0VCSDCrnGggQ7K/WhyMU7uMtxbYOZTwS8vKCqA+9xgt38twEohy/2XXcp2w3U0oF
+I1CaqvmTkgJDhKLCsbrf8tM67744smCPWXbHjStSN5fadXuAzsNLvsMdRT7YyiYE
+QINFY7W3nb4SBCoHx9WnDetUOquzvb00Qibo4TADGL0mmYl9Drj3VqqT/zL9HnOi
+DpYO6fd1WkunUFEvz640Tyidfgjm8FRRKSPYiJvcyaD6/VL7LJXas+sLCTE1HIO4
+UHIZvPwOYxK/wDTsVyKJMo34G7AcctjaJ/KefGgRYV2gRKbCWLCUUW21sb+B6jIv
+NlKdjrIUJQLzJ3VsrQ+7DykgNPDQaYHgr1jYLdexJ21FIE6OhkhLhaO4/1ao6oeF
+45QeWzqcucUYaMmhOaQwa/D2bEfRMXOl8sjv9QzqekgQiZu2AHNjhYreY08GQsGd
+YAPP7kWgdBLT4PvZyIHKYl6z99IXYKkU4JNdziW54LCfRzXA+iymKLThCo4/vk4o
+6Gg+bz9cO2s4D9jTcAmE9pn3yivEizINuEAvCYah7iL88TxdbvIkZi2KfwB5Z2s3
+JdWXx8cqNCh4vR954ZGp/0ta0cHe1LBwIW5BSvEuMwv5cBNZwqaLjP/iabNYd54m
+5yeLrsG4xSHjBI0Hdj6NpBaF4/MIdPMent0Pflln+w2w2sYQiMG8oeBFgTPaIe2+
++RFShjgVtdpSMs1f43YkYQhzCrE7BbKsMqf/LRtr9aI8iC8idg9pl8vgE5rkI95k
+aqCO4dV7KfiMsL94zZVpbRTremThltEo943UK57PsNQXPoUXUiwDNNwuU2uL+OiI
+1seFkrtokkZejjV5iae2Dm0uJt7FjK+prF5+UdHFBBMy85dw39VruPKzQp3Lpkpr
+k93NMoHZPbovPwm4eALo0RHQmYKxOAyV8KRwUlUcWC6M38G35xUCy5Frdl8/QEDE
+cs5e1u1lQkep82rFQGT4tRYXd9bXT6fXhu1SO7Hbv8SARSORwNgKJu5hdGWH58wH
+H7FgWlCg4MytRc5uzQtlcv8/fEgP88n/YmGtkoQrXQ8A4vsbk3OyM5CL3/rMX3sb
+fbctpj3j4YuzidzNhQb3SETLGsG0Tqt0uI6mUPLSd4Zs62S3MwuWI2BZih7ky5h8
+dF3u8sWyKxp/ecJEFwmgXA==
  -----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 c196ed15690946e72aade946bb25bbb94a9f4e0e..9ee8936e27a49af3061a6a4718ddfdea5b84265a 100644 (file)

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 7565c86e43920c790aaf380b67d102e30f57f280..44d87931d345f7e12618928aea357c9957eb1448 100644 (file)

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 18723af5d8b15a3478d506e3a012b726e0169bea..87263b8ac5d9eb6cab44d00e90363cbe10db4b73 100644 (file)

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 fa6b5bbe995d0465699c9c4509e491cee0e59be1..a7a31258d9df20dbb45822dbe52b90ec8e35d957 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp

index fb31e255068178703f93a47adf208f92992db01a..104ca7d33916f12e182e89d2eab18b0c72c2be54 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp

index 62bf9eccaec9a36518ed552c23d80daef9951072..1dabcf826cead6e05f78bd03b574d98f6a45c1a5 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp

index c1d78dae04769aade47f136ed7a36afd4f985779..b37e6c4b1df3bcb4876a7a98fd81921052ce3704 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp

index 65a082ef8600b49ebf8b44925c63631109e90f4e..7888256048f7d04eb06e36b1c3f4d59ca000bf51 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp

index 21abb184af9a18a61680b72cd8cb9cc95df69dce..677c4c0fa52768adcb065ffa41e2de02ac656b97 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp

index 158ef1b10c61ef05355375d9a9e4f6b02486d7b9..814e092d7dc7f8867334083d0f0ae5feaea92c15 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.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 672dc8004511762146e833b585fb2b8c8c7ecb53..f7feec301199d1c6e30d3c6f502211354538f914 100644 (file)

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 d6ac436cb5d7d4f9646da76c542a093b657b15eb..6c3ba8359c241e9cb2c3e67743227f64f35e0c3b 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: revoked1.example.net
-    localKeyID: 0E E7 EE 1E 59 29 64 97 EC E6 FC D4 5B 23 7A 8F C5 CA 4A 63 
-subject=/CN=revoked1.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: 4F 5A CB 71 24 F2 E3 EB 09 56 F1 FE 07 38 E4 96 71 45 AA 21 
+subject=CN = revoked1.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQxMTJaFw0zNzEyMDExMjQxMTJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtPqSirLu
-tXEB9YO/EZsDQvDqeAVQhfQH4Ky9bWGOlndu0fEO5Omg/YIuWzBnD8/i5TiYw6wx
-S5k9xbRx4adP5Q1FH9xkOlLf+HZ116mcXsrUBtQYMDwp5wgr6emnXCU/f4mwua0T
-NhdaZsKXhQ0bIdQ9uOMAzhK5nq+FMmrfsDjuujJfuAJ9MgUnIErVETtKRDhstcs3
-hiUyQv4RXI2uXngc3SiaP16EjVDlEuklP7guCY3rZnEfC+aeiYcnKhUAOFI4LjGq
-TpyHB0LIKNk1dfjgvL9ur69JAr4NZJtOAoPrsPgzHdquFhLDscyKX4RH8QRf9rBR
-XZLcBPTVrJRYHwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM2MDJaFw0zNzEyMDExMjM2MDJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Xt8fsTC
+Uzx+sezS5/3xDxR6Zq6AtR7r0QQcxn7Xkj8M2wXH6b/c0Sd+1oGonK2wPpHGVCyO
+y4e3Tt4R/i00W8fX/PuO7UXbVuST7SHUMAZYkrbNeSIl+DiiH+d5o0sMTfqDocCz
+i6ato73DRL9A86Ug/55Pi1MedmtlmYSGPkE5lA7ZV2pIKvF0JvEz6wjn7uLYelTC
+VTk+aKazM/vLtT41j/z26w/EG5y6Yjs+iRAHaiBWJVoHBlBw9LGefdEWf6/lNUaS
+8CH+jUgvZ3LajAItKAyvJr/DNNZtfPE45KpzUJ59PtFQAOQ9ihukgxiDOvVZLKVD
+S3vg4Lw8+pgL1wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQB3pqryqTXKjjjN
-+/DHZXcfWRkNU1PbM710I8SJUzAhe7p2GKERwBLzc2No6OeSo0a6gz6rYEkhBvov
-4sWv6N1luJMCKweSQG1VD3kjK10l+j7uroUt469h1lT4Mvjb7mCbI9ebpQOOYJVx
-Qsw6YM1H3GZmsEb/HEqZwt7WBmcW+jiomiJsUSXngKe+dcXbd0IjBxw79JU/shRa
-O1edLG8AhvqNKvhvgSjANMw1uYK4aaVIu9+e7VV+/J+sZqeF5Xqre4Kk/uz2rqzl
-djgDQD3ik4alDZ1aKXXfvbjSY0KL96gtpDmygjO0AeC9nvl9vcrFnz2rIMrIzFtr
-qxJsx4KO
+dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQAM5ArjARsRqzbi
+VL/F2Y71KuapeiTiYxpPAGuGDU0/mcK6hJD6v094d/ZOD2q4+BdrVnpw/TdfpcHD
+ytHO6SP7nfOzips8VBuBvdTkP2RWqBePLC+8L/h8sS5OaDSa5te7eRuDmmOUplfX
+yXKFw7qlIU0Nx1OeXGPVJLrBg7VhGRd+A+FFTE4LEq2Kk3yGfpyDSMLMo5z7BNhf
+VHRPgBk4wqAkbhiGFSZp0xq/Qo1YaSdtICKfXyfxarSzx+GDIeqtbg1/6mhlm9zo
+TRkTw+ou97qApFadzI7LqVYUy4TUiyREtWRln8uncab3KZV3UYw/Dw9VgD5L2OWZ
+uEK/AEKW
  -----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 069e5c7dcff061116db4db86011d9491c2f9876c..3675b446e974e25869bdb705a576e31bd0062aa5 100644 (file)
--- 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,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.net/revoked2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem

index c5b00da24223158003a04695f434269d51d08cbb..28ee5da581fe43d7e8a6fd291958904f9fad2445 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.net/CN=clica Signing Cert rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica Signing Cert rsa
+
+issuer=O = example.net, CN = clica CA rsa
+
  -----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-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.net/CN=clica CA rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica CA rsa
+
+issuer=O = example.net, 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.net/revoked2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db

new file mode 100644 (file)

index 0000000..9dbeb4e

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db

new file mode 100644 (file)

index 0000000..54aba1e

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/pkcs11.txt b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/pkcs11.txt

new file mode 100644 (file)

index 0000000..1267847
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='revoked2.example.net' 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})
+
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 f2ea6de3fad58843e7bad0e3419ed156265ac2ba..2170b7e624dff70246ea5194283430f5682faf86 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: revoked2.example.net
-    localKeyID: 5F 66 9A F5 43 76 CF C5 A4 1B F6 48 F5 A2 02 DA D1 F2 1A 43 
-subject=/CN=revoked2.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: D8 5E 30 DE DF 54 0D 19 2E 79 19 AB E3 81 B0 DC 75 F5 71 96 
+subject=CN = revoked2.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MTI2WhcNMzcxMjAxMTI0MTI2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4IKw9j
-fdtnAMpvGSQ1kir80uY8zhAbf9581GSNBlsQkZRUcQDUkLcDuNnKRXnd/Vzk9fzR
-60VRTCT0RAdZJdPAbgUniQxzuu2j930Cd1tqyRFmu6EyZHlS55+l4SZyODSsrf8i
-tVsI3BQXoQw9e9fOzcXgJEu5TfweBKmKi+v5GrGA0KZ9ktXk7PBQUieK1nNzBwKU
-uNT4DtgRLy4Thbgq6MqsjfmjtAL9Lubbz5kWDzR1jfm8muBkrB88pEa1XK3a5TE3
-uQ0JlNW8PVAvmA7GLOP1FeJ9d5nIDiFJwAI7NPMcxXraC5ZlXXcucYqah+Q4O1Rb
-6whxVy/KfVSc1QsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNjIzWhcNMzcxMjAxMTIzNjIzWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTLk9ub
+3r61ZpATuda8xGBM5V26YyKNlnZJFHOWNYFMG+Zljz0KdKs1oPGH3UxWWFSOch4x
+Hsb9+JkTgZwW8CpMm3bWNb+sc4c+akMEBoR0MP0e1IVwrHJqb/YHSroFNZHu34Hc
+OqImXrwO5eaMhMyqrZFtvBXcrtZ1JVan/rgmnr79z6g9nPLFwb1hig5EzbYcGcRo
+553cWIU+Mn5ZlDeoky7JCLRQYH1EOyXro/StMkDUcmk0Yqjl+NEJH1b54onvhzgr
+LNfCRKB+k1FZjSlGFPBz217PawrOVG96oYpy3MMEmWjDdyufSuGTQNM/SAUnkGtP
+FdfemU+y4hgbDVECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAPAvtLB/KBjSx
-Oo7wkcSOt2CWolSBOU8HasaM122q+q0d8xgT7rCzSXCRWlcnpuL2d10P2GGWgquw
-B7Ma4i13MOrdcElpwIz6Zsm14CymhCRf9E1IFxZg0bYSGswQPc/tFfKwf5TIM3Dz
-4u+9vKCD+r562A9AUw7JOTxcR6vcAWtIL+BDGaeZE9Gh5l9DwZ5glM7FUNAXAVt+
-2pitjRsCfv2emKCW5wEfSLB6gEZbrw1es5CoXj+oQn6AOmfoHgQMRZmootqRqy1i
-574dNw6v/8F5s6LNhms5jt78JYzugvAqR0jxjH/3ibGXXSq4Wx3N2gEmrjCVc09A
-O/hty7z31A==
+ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAdCoCBEEcf/S+
+2CcDopWISmY57zsuGasXJv5dCIwOAmVXSjMoBm421PiP1CD6TZ5e21TF/Tcl6G5F
+h7ppDcaCFsz2qLY4oYvptAIjtknA7ojeAp31dGdTkccNNXcnRQmWIdfdqg572qcY
+Fw85I+MwboEiUpmBi1dpmdO3ZIO99gRZBeA9G4KGynle5xKNNc64segmff1B6e26
+X+U/I4//LNGTaLnP2Vcu7hAFtm0V9lymMyxW/n1Jzgg4zgU2+cSNnfJFuKsL2Dyk
+BJKfnxUI0qspBSz/Oo+2SgjpYG9Lel4fQ8Kow339ueELa+nYdbGIfTG2DIYFyG8o
+E8s/jiCE4Q==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 2de47e56252e9c3602a8ece34bd202b36af34f6d..ac1bd17d753b9dc5efe7e751aea5a19004b7368f 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: revoked2.example.net
-    localKeyID: 5F 66 9A F5 43 76 CF C5 A4 1B F6 48 F5 A2 02 DA D1 F2 1A 43 
+    localKeyID: D8 5E 30 DE DF 54 0D 19 2E 79 19 AB E3 81 B0 DC 75 F5 71 96 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIjtaZItJ3IUYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDfRZdY9WSvIBIIEyGlGGfYWSEeN
-tWPTJwylMfJbb7zPaN6zAWAsza0plVEVqGaBY9tzGoM3dxjlNspX14pX5APUJggr
-lbXYelt4ZuJ4OH6HOfVNGz/gLxV0ldqub2B7B3LoReZAuL+G0TZTqjQl0bLkpCA2
-2s0Z1+jNsbV0uQ+J6B311HgIc4wiXFrFE6cIKYa6ZLBK/Y58BdwLh65V1UJOHtn/
-R1ZI7oEnPaBY0d6upiNDWzSo3x9LEHEt2linZ0zmgDjfNJtGnl/nM06+t+HXujCb
-PoHvvNLvk8SaqH5jcVcxNuSJleAvRcZ37b+m4OOU9Se6zO5NMAKnSJ+9veGVchTJ
-4PrsMS4JIIbRzVngBkIsukoDwzCt7yNapAFg3JZm4c8kA7cyP6DzXutLfa5mDE2T
-qRQaSKCUxUBhftlvblpLHPjMeYqNUsdwBthqtnDMqdjoqtel4YKgEWvEQdA1kRR0
-2AEqzQ5rBpRS9zGw7EEfzUuhd2CbcfnXOdV+/3xWoR3o4Fs6UWqGHJDI/op2RZ4o
-BpmhYZukXbcNDNTyfDb3L8qmEHndtOM037l9dXBzn1Sbu+qraYG5oyoeChdzFfKj
-6KKJdxgMkjViTD9r3CHeClQNbB90RwleEUktxq7v3l/82ZtuZlOmUgx03OmI7uZV
-Ne52CALyRq5lAtugfSGwb175uE8TGbyawjAd6yls/TwzWjBPGH2XcJvFAgSdAFYR
-YfcrXUWFZCDs6ewoiVfBBBbaxvGCEtZMdkH7vSgvEuMsFurnO+Uvoekt0EhWiTi5
-L4LOd8rVbHgTz5TSrhSUFwaP3L4hsYAzezrC+y7N7LEU4MJ9dDAuB66ekXugo+EA
-hy2EYfOMDkyYklcwIaEOdtlpvDzdK2m9BrbmHa8Jyt/I/n8mjuKyo1q9B2fliFmi
-pAvxriiN0N1728VE3/zapD6kzPF1Nh/X85hB+5aDykEfFIWOZwj6zswPbJJxV1h3
-6zMiA8YAH2DzE1jKFraDjbtjfo93xfXpcV6rLdOwDy4Tv1F8AmKFkd3pcP/BCxM3
-o/wWJUCzMDWbLEmRXg7FXHiRqWlRvn0Xohw92uuu2WZO9aDI5dJhu56ZG4YDdjvN
-EoWeAnHTeXeOhojSNbsIlDNc04z68qHKDfhKyMEGQHTADKRzsIWdOZ5+uhZdkF01
-hQBxVNWPJ2m24C8zFS0UqUBCcW/yPZDGfwGG31nQDPK04+6l9ATPbmAL//vjDgVT
-TQHqnoa0ttrh0HzWSHuR6TqabjROxi6pI+f/e4t854GNLCfZx8KAY+Lq7tGX3kDV
-Is9Lt+s1qcKX57IOZsz6/3hhgp6iphb/GcTpqMo0aHq00LGWNf2YqKXI4JlIjSdt
-zjnYV+ygpD3BcJVD5wrCyJkCTK3RhqTIUhWFB7xm3yj0SiVqnjiTg2e6ZOSl4fUy
-hpTLhSxC4kT+0jFdBavO1K1FpleSXkEY+hMELJmk4ebRSqngXHhbC+x6ch4IP2rN
-sCGgoxEOMXQUNxgILzxMPJl6pW3li8NC0c+rerMUgjvrmY9a8CPpdZepgucfji7f
-VZoM1QT3LM8ndmJzOTAkqrXEXKyljzpOct6J1t+BzbuZpYs/tsD1RYggnkZXcNwj
-kRTvsZ1yZd7XTsj172UfxA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQItjusVpKe2j8CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCOp/axSkLGDBIIEyO+boLyLUFqR
+DMmvomahOzr/DZ/GjzH45XtkEJTD8mO3Cq7lS+56qTfBKhSr8AkshKus1jX22yP2
+0rUkjOXkE84n9p9hkXT+vnJm76z/LxicCTU/2ycIllPZGSJGQwV0FLZpHNS+7k6z
+DJSp4LE3naZjz+++W3u8Cp75lVIinuB4YIqYFrR1Zift3vXSXG9IM3MFIky5SalZ
+S8wCHqtlRtMW9nWdFCqz0mdG2ZzwXGU4mzeqjimRMA4S8VaC8odzpfIke7XK3Fwf
+gzu07SIH65fh/I9Rp7cb8AvbeHA2NC+p76VoBxKRL+Q1FK+vG69XNhiiEZ8ZASCj
+FrV01UVHbvzLc5gxDmtHgYT8hKEjTIU9hXi0IaLs6pCQMXWS+Ay3ZzCiJZHX3C5n
+0AovIdJYQ5S0BWUVbPQx5Qncb2LbCt7Xjy18YXBCynbk+qzvvQ9M8qZzPidA/jnV
+QK0B56qc0KDk7elKvUiqgWXCj8i3jZYfuyGmcWqP9oWR4VoSk+OSYk5TWbeGDt0q
+pWpV2DAIenXUprGgQrnNcqjiez0aC7ox9uGCOFFTgnZseVgu7l04U+bP4xHFk+pi
+ctq2bLY03kuKqBBugpkGJs7jXHR57NQhIGbTE9UV3JWTRRdIiYutB741OsLSAFNm
+YmUrK5uidJ1Ibel5GBxtGJovT/2uPKdzZDTGZr2ajG9h8twwjpBeEzteOFaOiGfS
+eJB2Ud0n1jd9P8dvA6A4pallzzJF1xVY0nkJFFss/lzmpj8obJdbGQajhorKJyUQ
+8+sxxVKxUhlOCsEsGnrevE1P4+czE3xuXTvOrU7KeA3FkU8KYuaSTKuGP0R505+n
+GN7ndA3fXlLEEqKlJnjn2+/pb6PxaFSNJZgrA+c/EMZ4xOzQO6SAW/12X86s1bWQ
+9rGhYGkZQOQ0mDIwPjm7G6ciKMboiYCPrzhPRSlvjJ79/CL2dHlseR6KPunTRhff
+kKJ+mGIjVVblqAP9D/p6ZWeL7kqfISgLoFJLwOn15Hvyq9Rh6o2Oa2ZjjydOMX4c
+UeVfHwnYurmXNBoaF8KsHm1xmQgGO8MaGNWMWQYQ3YcvM7hWkqUOVjb7i5AiLlOk
+50D/er1PIJHIuiBOtKhaHG+LUG23Tua88ZHPN9BjmsxR29qRbLCu50H3laCcfBwg
+5TauJMOfXGYa3bezkj6xNWL4bsb46VZvu7OsNPTimKmvOozxEPcg2ZuJasv9ZAPL
+GAigOstfenTQYWgte9UhWaOjm1fm2xq+qhC1n8CrCG+cFs/hcvOWknQnsb/DCGdf
+Ocuwo3cnGvMU6a1Fu6tCB7XeSpknthhWETjKGVtzYx0ODbI7OZQMWCyLfQLq6wX0
+UhihI2Yvd7aPLe8J3w8m9vmuPbXjiOsBJLvfBYwogSlesWAZ1GeUOKWHOCH5YNaJ
+Ftdbh0MkAIOeNr4+ULtGkoXcEjf5zsyRFmSZjksXWfIs86wuWqrthJ1Pc1aZbvON
+QxpSCtrBnV4SFo3LaMNZaYBL6ZtexlvwQhgSCLjiQTIMGufR721SsyyZ00pGKfjp
+zIVqKQXYHF+qYX5RZZqx+tgHTWJtBlhxaGM4+sZZEJDslfwt3VtOMfTnXUjpvAwg
+5HyznpQ18rSaZ/SOJ6CbCA==
  -----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 44a041eb6d97ecd1e5ae83d6e2100b4c0fba014b..c10f04980fe3a64f58321403ed8f36b86b978b6f 100644 (file)

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 9ce30ce5136dfc99002e5db528ab78b21b8c9a86..6cbdc204246b11a3abef9f139b71926765b115b0 100644 (file)

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 2211191ef2326bb665434312c65fc516dba2e146..da55d8dfba97bc80e36d2221c24ce50865b281a7 100644 (file)

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 9ce30ce5136dfc99002e5db528ab78b21b8c9a86..6cbdc204246b11a3abef9f139b71926765b115b0 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp

index 043a85ae4fd06994d19aa26384d87a91a137de6a..496558aaa365b2343eb338a3e18b3e2dd7f9a405 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp

index 87ef092024d9cc144f200d06decdd9ab3ef5d1fd..a091f6ebf4c388bbfab4ad5717e248bcd21e7569 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp

index 87ef092024d9cc144f200d06decdd9ab3ef5d1fd..a091f6ebf4c388bbfab4ad5717e248bcd21e7569 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp

index 7e90b59887dc29e67c8088b9417c53f09a05fdbf..346326e59c515ab2533b144060cb97edc3a10b33 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp

index 4119bb8b5aed243c6b2148fc88fb282ad23ea2e4..3f5bd3a7a28974924a3d14b0fa324c17368ba728 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp

index 4119bb8b5aed243c6b2148fc88fb282ad23ea2e4..3f5bd3a7a28974924a3d14b0fa324c17368ba728 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.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 6dfc956090ef5f36a87556678a0dc10780157135..8b388042f6877cc82075b6d0b8db4f68a4203352 100644 (file)

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 69fe4d288169628429639e7d96ecbbb10b5ff885..0deb64ae9d59c4a859f4761966165cc473b42c40 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: revoked2.example.net
-    localKeyID: 5F 66 9A F5 43 76 CF C5 A4 1B F6 48 F5 A2 02 DA D1 F2 1A 43 
-subject=/CN=revoked2.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: D8 5E 30 DE DF 54 0D 19 2E 79 19 AB E3 81 B0 DC 75 F5 71 96 
+subject=CN = revoked2.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MTI2WhcNMzcxMjAxMTI0MTI2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4IKw9j
-fdtnAMpvGSQ1kir80uY8zhAbf9581GSNBlsQkZRUcQDUkLcDuNnKRXnd/Vzk9fzR
-60VRTCT0RAdZJdPAbgUniQxzuu2j930Cd1tqyRFmu6EyZHlS55+l4SZyODSsrf8i
-tVsI3BQXoQw9e9fOzcXgJEu5TfweBKmKi+v5GrGA0KZ9ktXk7PBQUieK1nNzBwKU
-uNT4DtgRLy4Thbgq6MqsjfmjtAL9Lubbz5kWDzR1jfm8muBkrB88pEa1XK3a5TE3
-uQ0JlNW8PVAvmA7GLOP1FeJ9d5nIDiFJwAI7NPMcxXraC5ZlXXcucYqah+Q4O1Rb
-6whxVy/KfVSc1QsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNjIzWhcNMzcxMjAxMTIzNjIzWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTLk9ub
+3r61ZpATuda8xGBM5V26YyKNlnZJFHOWNYFMG+Zljz0KdKs1oPGH3UxWWFSOch4x
+Hsb9+JkTgZwW8CpMm3bWNb+sc4c+akMEBoR0MP0e1IVwrHJqb/YHSroFNZHu34Hc
+OqImXrwO5eaMhMyqrZFtvBXcrtZ1JVan/rgmnr79z6g9nPLFwb1hig5EzbYcGcRo
+553cWIU+Mn5ZlDeoky7JCLRQYH1EOyXro/StMkDUcmk0Yqjl+NEJH1b54onvhzgr
+LNfCRKB+k1FZjSlGFPBz217PawrOVG96oYpy3MMEmWjDdyufSuGTQNM/SAUnkGtP
+FdfemU+y4hgbDVECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAPAvtLB/KBjSx
-Oo7wkcSOt2CWolSBOU8HasaM122q+q0d8xgT7rCzSXCRWlcnpuL2d10P2GGWgquw
-B7Ma4i13MOrdcElpwIz6Zsm14CymhCRf9E1IFxZg0bYSGswQPc/tFfKwf5TIM3Dz
-4u+9vKCD+r562A9AUw7JOTxcR6vcAWtIL+BDGaeZE9Gh5l9DwZ5glM7FUNAXAVt+
-2pitjRsCfv2emKCW5wEfSLB6gEZbrw1es5CoXj+oQn6AOmfoHgQMRZmootqRqy1i
-574dNw6v/8F5s6LNhms5jt78JYzugvAqR0jxjH/3ibGXXSq4Wx3N2gEmrjCVc09A
-O/hty7z31A==
+ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAdCoCBEEcf/S+
+2CcDopWISmY57zsuGasXJv5dCIwOAmVXSjMoBm421PiP1CD6TZ5e21TF/Tcl6G5F
+h7ppDcaCFsz2qLY4oYvptAIjtknA7ojeAp31dGdTkccNNXcnRQmWIdfdqg572qcY
+Fw85I+MwboEiUpmBi1dpmdO3ZIO99gRZBeA9G4KGynle5xKNNc64segmff1B6e26
+X+U/I4//LNGTaLnP2Vcu7hAFtm0V9lymMyxW/n1Jzgg4zgU2+cSNnfJFuKsL2Dyk
+BJKfnxUI0qspBSz/Oo+2SgjpYG9Lel4fQ8Kow339ueELa+nYdbGIfTG2DIYFyG8o
+E8s/jiCE4Q==
  -----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 00108db30921dddbe12a31d2196dad272f2de2df..5c5345203a67930d85a5fa22fb437fc0001820a7 100644 (file)
--- 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,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.net/server1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem

index c5b00da24223158003a04695f434269d51d08cbb..28ee5da581fe43d7e8a6fd291958904f9fad2445 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.net/CN=clica Signing Cert rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica Signing Cert rsa
+
+issuer=O = example.net, CN = clica CA rsa
+
  -----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-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.net/CN=clica CA rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica CA rsa
+
+issuer=O = example.net, 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.net/server1.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db

new file mode 100644 (file)

index 0000000..aa03bc8

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req

new file mode 100644 (file)

index 0000000..c754e13

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp

new file mode 100644 (file)

index 0000000..07e6cfb

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem

new file mode 100644 (file)

index 0000000..d0ae671
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem
@@ -0,0 +1,52 @@
+OCSP Response Information:
+       Response Status: Successful
+       Response Type: Basic OCSP Response
+       Version: 1
+       Responder ID: CN=clica CA rsa,O=example.net
+       Produced At: Thu Nov 01 12:36:43 UTC 2012
+       Responses:
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 43f5e376b0d5e4b6726b036ad3f86cdb598e6554030274971b10c13035d140a3
+                       Issuer Key Hash: 705130a4764431b4b0458a3aef55603a9b99b8171018985b37d3e0b14139afce
+                       Serial Number: 65
+               Certificate Status: good
+               This Update: Thu Nov 01 12:36:43 UTC 2012
+               Next Update: Tue Nov 01 12:36:43 UTC 2022
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
+                       Issuer Key Hash: 6377155acaa7b527c57f1e474b2a74d85a099e0cd9d4baf101d0a96d2c39939a
+                       Serial Number: 42
+               Certificate Status: good
+               This Update: Thu Nov 01 12:36:43 UTC 2012
+               Next Update: Tue Nov 01 12:36:43 UTC 2022
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
+                       Issuer Key Hash: 6377155acaa7b527c57f1e474b2a74d85a099e0cd9d4baf101d0a96d2c39939a
+                       Serial Number: 41
+               Certificate Status: good
+               This Update: Thu Nov 01 12:36:43 UTC 2012
+               Next Update: Tue Nov 01 12:36:43 UTC 2022
+       Extensions:
+       Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIIC/AoBAKCCAvUwggLxBgkrBgEFBQcwAQEEggLiMIIC3jCCAcahLzAtMRQwEgYD
+VQQKEwtleGFtcGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhGA8yMDEyMTEw
+MTEyMzY0M1owggGAMH4wVjANBglghkgBZQMEAgEFAAQgQ/XjdrDV5LZyawNq0/hs
+21mOZVQDAnSXGxDBMDXRQKMEIHBRMKR2RDG0sEWKOu9VYDqbmbgXEBiYWzfT4LFB
+Oa/OAgFlgAAYDzIwMTIxMTAxMTIzNjQzWqARGA8yMDIyMTEwMTEyMzY0M1owfjBW
+MA0GCWCGSAFlAwQCAQUABCBJRtpvr8b8gvx9u8nJ/ZHiEa9mgJ/Y3VSJfPpL3UzW
+5wQgY3cVWsqntSfFfx5HSyp02FoJngzZ1LrxAdCpbSw5k5oCAUKAABgPMjAxMjEx
+MDExMjM2NDNaoBEYDzIwMjIxMTAxMTIzNjQzWjB+MFYwDQYJYIZIAWUDBAIBBQAE
+IElG2m+vxvyC/H27ycn9keIRr2aAn9jdVIl8+kvdTNbnBCBjdxVayqe1J8V/HkdL
+KnTYWgmeDNnUuvEB0KltLDmTmgIBQYAAGA8yMDEyMTEwMTEyMzY0M1qgERgPMjAy
+MjExMDExMjM2NDNaMA0GCSqGSIb3DQEBCwUAA4IBAQAtrbdf/HqN5ux6Gu0GsCVj
+NQVBFTRe1ixSqVcHjy0QK/Ij79JMbM3iQjmKI7WWFKu0e3fzKG1Xo7aYb8qCPumM
+bwU45RmLDu85RSCtEWO0WvZhBJrsh/b/OMUBUIXZygpi1inRu0f4VhKXe0rVkyfC
+LwalVRxx+j2VGW8Kqc9sizorT9FAAu4gOeEbEtjLc7nRZOvxuKzBclcOngBDag3n
+QDFuRK3lr61nTb6EP6ObkIa6TfjdA3b2oAztcOWC7xOEH0cQ98JU4jklQv/jQ3SA
+mBCJs7RMXL26tnMnQjXEnYJLNLfLN3nx+rZubDb9D6kmz9EBt0/Bu6HbgUtFiuDv
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem

index 835403766af1c2804df106925f6c64c60c412122..0c4bd9994fb57078e0813bde059c74358a300730 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
@@ -1,73 +1,79 @@
  Bag Attributes
      friendlyName: server1.example.net
-    localKeyID: CB A7 97 AF B7 78 B7 64 2E 05 39 4B 77 D2 DF 37 41 05 7D C9 
-subject=/CN=server1.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: 35 81 C2 2F B8 BC 4C DF 9B A3 E5 01 B3 57 B8 56 9E 1D BD DC 
+subject=CN = server1.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQxMDdaFw0zNzEyMDExMjQxMDdaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkRgF4m4N9
-6E9nSGO7/OcOzyULoG/muKxJmc2CRHXLXlD0wMO5pvj8iPAS1NbRHFGQcHIFDDUJ
-o7xq+2iT8ulOWxsJZR7p+pEUsuz5giTN75gYdPS2hNIwSP7YZAZEdzcjKETSl7rp
-gFX5lM5uCTszbQqNR/LMM6/AYq0Xm+byS+LbBYElV7zwCRuPzu/Eo/yGf1YaL+Ju
-eV8z7MMptIhEPfDPIA3u+xwiixWkGrQrOPLCuMeweo5AcNoKR/RmFMic+8rbcCq1
-5irPBOGu5CarqRDLHTth19o5ahRcDtS/rDcsUqkNpGTszGY7S7XkAXTo18AY3JkD
-dJ+1shxK7dzZAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM1NTVaFw0zNzEyMDExMjM1NTVaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE8ea5SkP4
++vXhJsGoALCaZrABJy0T27Zt5yVDk6n2R2KuqIzXTpf71AEAIaxeFvrGBIwpEWv6
+fZx91mMSMqbVC4DuMF5+V/Uv12U3BqLCj0kFKazJsxwrcG7Ah3nwAg96o9YSMy42
+N9L2+VDSzQXk7+oDDhNj0ITC6zHuzGraUSP8Hll+KpjTD5RZai1MNwR+ujnmodqu
+04owDvE9JGAyvpAG537UGf22RLVvvLmg1FPPU9TPfV9Y9OCJRgeAP/VwsWcXynAq
+QOT0YNxsO9tQxcWIvYXL1zKGyL4WK+il0el3RBMywZ98+CP9gWHJ6BU+r17bbkYK
+3rH6aJu6mOrvAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBnggkq
-LnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5uZXSCIWFs
-dGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2VydmVyMS5leGFtcGxl
-Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAdUuyNLI1p4WN4d/Dt/5Uuhs6V805Gouu
-jUklir5h51ZpK0cIuuLhai/jswGWN+GmM0ie+NEqj2EoxLfqYEuRm/0QdrlWYpLT
-WpIYfY9djM5fOgWyAaF+/8d7MUNLKjbz8MGTQzysBdhNSNEWRRi4ZXzxHt/VW3qz
-1U9pR1p0qsACYdTsbmOJw8CiExE04eEsz/0F4R8Grn8WYAuY1Yi7maXdByzXNTmZ
-WzIekkZw2eRIgvHpHG4yL7jyYyqCQg3+loGMzo4njY2WBv5VMqf58GW4ZZCNNwl8
-LpqswRJ3QzqMYv0OahEimggNi4d7OpYBnC1RBsJo4/7EGfg6EUdKtQ==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIIiYWx0
+ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLm5ldIITc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAaqOPrFe/ZvpvvQfRyeA6mAm07RLjo/Xq
+6+hf9o/LIwGZbn1jUxdmVKcHc1lIecz0tMrIVKfTwuTSee7HBH2BvWAex9bDW97W
+sVOZ09goLnTu+Z4CQAiU+RuyjzEBOfFgPJp2POTLF1oZH+yIUO2Lvq51LYZ4m5cy
+m0HGFNo4AqytYILmM9UMLFMkDuDorcOuxu1C5hRiOIcT4nc0GI7kSDcQl+vu68c0
+ZYnHIi2XXW4Pw1TLYSaTOf9byMgGfxq0jiwVnniycNHc5P9JnBVSmK2G2jKCrrHk
+z1bzQGir6h6/pQg3o+bMOcdO8GnoeIjLkdViOyVHZjc5XkRqvRBV7Q==
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.net/CN=clica Signing Cert rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica Signing Cert rsa
+
+issuer=O = example.net, CN = clica CA rsa
+
  -----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-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.net/CN=clica CA rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica CA rsa
+
+issuer=O = example.net, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-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
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzU1MFoX
+DTM4MDEwMTEyMzU1MFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgx
+LoczTwXUfZC5c/icw/5G6KX955gxPRYwe7Y1YNGByeErPAip2TQ7JIp3MS8RfUCk
+ss1simLzokwGpiqSHtaxEwidDXqDgO0dpNoAw729LmqDc2FUzijpDdiU0xsFt4Ks
+vB58EY5N8K8Xc8N7DM6M1vGcUVp3gEdsgb9SaRIteZEnHhxoys8DU4hu2xR8L+Ii
+w7hBE6sx8sOSa8Di/1z/ERRgrNbyaHFd9RPdGy/+oX/XhDz2Us7Tteycjmlburvf
+wE5jsBQrFrQ3GbSMahmVu/4kxOx3Opq/hnDIANV2bwe94acoDEh/ctLZqoQrVbp+
+Hv/12IlygqVJgiBgRL8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAIJCLWjkzXSI6+/fvL5j/6+5
+6ttBjtZhRAQdhmqJ1eUOo6Tnl4WzYSsKxEhRBxNeIgis5IQzn9o6sCSSfHEewCwf
+bABbjwqu5czA02XRrC70Mb6f2D1tBsGA2jzY9j8GBCPWJPanTTzHiWMmuckx1tKI
+vaPAb+BJfXIKSsenFAPGW+nrGwMj3BrvCedoozKcbK8zK3QaMibEwD/BcDFI2tws
+opCmi3tTXaLZTRwYvWj9qykjIoEnzwk8ARYBNHOOuDCdsE3IfKPdo3+Le7yEseRl
+1hfeZsa3AGvAm6Dp7XRYmrPQsVp+ngnEzQtNhLH/jVjbqTdJ6vN88VkL/M11yF0=
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db

new file mode 100644 (file)

index 0000000..22d681b

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/pkcs11.txt b/test/aux-fixed/exim-ca/example.net/server1.example.net/pkcs11.txt

new file mode 100644 (file)

index 0000000..5067419
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='server1.example.net' 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})
+
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 afcc2f24790d38e51c34130bd6a111feec8e043b..9413e405f4416da17fa4910bc0891aea78a59e41 100644 (file)
--- 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,47 +1,49 @@
  Bag Attributes
      friendlyName: server1.example.net
-    localKeyID: CB A7 97 AF B7 78 B7 64 2E 05 39 4B 77 D2 DF 37 41 05 7D C9 
-subject=/CN=server1.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: 35 81 C2 2F B8 BC 4C DF 9B A3 E5 01 B3 57 B8 56 9E 1D BD DC 
+subject=CN = server1.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQxMDdaFw0zNzEyMDExMjQxMDdaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkRgF4m4N9
-6E9nSGO7/OcOzyULoG/muKxJmc2CRHXLXlD0wMO5pvj8iPAS1NbRHFGQcHIFDDUJ
-o7xq+2iT8ulOWxsJZR7p+pEUsuz5giTN75gYdPS2hNIwSP7YZAZEdzcjKETSl7rp
-gFX5lM5uCTszbQqNR/LMM6/AYq0Xm+byS+LbBYElV7zwCRuPzu/Eo/yGf1YaL+Ju
-eV8z7MMptIhEPfDPIA3u+xwiixWkGrQrOPLCuMeweo5AcNoKR/RmFMic+8rbcCq1
-5irPBOGu5CarqRDLHTth19o5ahRcDtS/rDcsUqkNpGTszGY7S7XkAXTo18AY3JkD
-dJ+1shxK7dzZAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM1NTVaFw0zNzEyMDExMjM1NTVaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE8ea5SkP4
++vXhJsGoALCaZrABJy0T27Zt5yVDk6n2R2KuqIzXTpf71AEAIaxeFvrGBIwpEWv6
+fZx91mMSMqbVC4DuMF5+V/Uv12U3BqLCj0kFKazJsxwrcG7Ah3nwAg96o9YSMy42
+N9L2+VDSzQXk7+oDDhNj0ITC6zHuzGraUSP8Hll+KpjTD5RZai1MNwR+ujnmodqu
+04owDvE9JGAyvpAG537UGf22RLVvvLmg1FPPU9TPfV9Y9OCJRgeAP/VwsWcXynAq
+QOT0YNxsO9tQxcWIvYXL1zKGyL4WK+il0el3RBMywZ98+CP9gWHJ6BU+r17bbkYK
+3rH6aJu6mOrvAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBnggkq
-LnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5uZXSCIWFs
-dGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2VydmVyMS5leGFtcGxl
-Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAdUuyNLI1p4WN4d/Dt/5Uuhs6V805Gouu
-jUklir5h51ZpK0cIuuLhai/jswGWN+GmM0ie+NEqj2EoxLfqYEuRm/0QdrlWYpLT
-WpIYfY9djM5fOgWyAaF+/8d7MUNLKjbz8MGTQzysBdhNSNEWRRi4ZXzxHt/VW3qz
-1U9pR1p0qsACYdTsbmOJw8CiExE04eEsz/0F4R8Grn8WYAuY1Yi7maXdByzXNTmZ
-WzIekkZw2eRIgvHpHG4yL7jyYyqCQg3+loGMzo4njY2WBv5VMqf58GW4ZZCNNwl8
-LpqswRJ3QzqMYv0OahEimggNi4d7OpYBnC1RBsJo4/7EGfg6EUdKtQ==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIIiYWx0
+ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLm5ldIITc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAaqOPrFe/ZvpvvQfRyeA6mAm07RLjo/Xq
+6+hf9o/LIwGZbn1jUxdmVKcHc1lIecz0tMrIVKfTwuTSee7HBH2BvWAex9bDW97W
+sVOZ09goLnTu+Z4CQAiU+RuyjzEBOfFgPJp2POTLF1oZH+yIUO2Lvq51LYZ4m5cy
+m0HGFNo4AqytYILmM9UMLFMkDuDorcOuxu1C5hRiOIcT4nc0GI7kSDcQl+vu68c0
+ZYnHIi2XXW4Pw1TLYSaTOf9byMgGfxq0jiwVnniycNHc5P9JnBVSmK2G2jKCrrHk
+z1bzQGir6h6/pQg3o+bMOcdO8GnoeIjLkdViOyVHZjc5XkRqvRBV7Q==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 ed9cdee1e8fab62b4ec2af05e75adb44dc250508..63413c1b0532c464025979c5927f2f0d60d437f3 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: server1.example.net
-    localKeyID: CB A7 97 AF B7 78 B7 64 2E 05 39 4B 77 D2 DF 37 41 05 7D C9 
+    localKeyID: 35 81 C2 2F B8 BC 4C DF 9B A3 E5 01 B3 57 B8 56 9E 1D BD DC 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIGUwYfag5H2ICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHe7a7MvZfyxBIIEyJXMM87lm5z9
-GA/4DFdexz0+vOmd148ntjk6Vx/vAHlpRJtBd4dphhOl4FBH6oxdM0O1/RRIHNbP
-almzg73uyUGOiG6GgFFiWeId/tNSHT4DqbTIqFG40X9Zzklx1FwX2MRYvILVO99r
-KnrKLChVNhx3OCjvKvbB886znuNyXQX8LkE966MJGrV+NJ63mSuk83W45u8tjNaP
-BjhNg82IbqcKYorMcSCpH3G/U0rEEZTRq9ECxxMWQP0ou4iyfzwZfF5Or8fL3gIV
-N3G7hfnIxsdLCDNZ0j8dHBQiCUHCRwAMVK3geau3UOaax7LFYIcNjYRvkkR7nLXD
-omFqzspXzkg3k0YTOOots25qGjtiWIKD9UZMdVjdK7Bm3T+JAzLQyfMZCn4uv6YZ
-TnWkuHhR2e05EEafaULvsDRRK9JVn/GZbW4gTT9xVuEnmnuqmq+9wpuObH7ZTfeS
-tLm3EQDQSA97qCJ13ZXqovXnR4/+e86DmEJuY5IkzuajEqiLUV7Kv1BtemeIk5+P
-4R7nNT12HlEvq4qAGGku4huqf8AHlhvlo4KFzJpUMZCqpVwbud0bOQZFFiyJ2S/T
-w9hOs68Wyj8FAiXlREJlCzlFu5sU1IW9V2vXB1f1ERVrNUX+ALFtawL56yqZwSYB
-gQRlV+ywIp9L3pfTk+ndOa6jDTyS9ZLsJTfKfMn/SZC7QnO5eaMUAzkQ2Pmt+Sr1
-L1QY3Tw1Sy/WX+Si+YfSS74SSpf0cZgpWwN4Lxz77Rsg+6qUMpb8m5j6hM4njR8Z
-mxniCAI6iLT8S/VyB2wMMxaA4K3v/hjHfaZtfudEw9w8zMhIPb61u1Z9hx/1Uj4Q
-CRtIQJEcW5OkLMko/J4XZmh/l2z9QaqWMLsBnVGF+NYAreLWgEFxcR7GzJw1Rr2W
-mLs+MbhFQuQ/ef5mjXPOS5wRwzwAVjq+CTAAe8QWy4JVXlF0WnyJHnReM7N3yNmm
-ILpTD5aSglybQUTuWtHYv1rBEYCm0pjAQ6wXBD9IrE82vlPBeBsr67uNkTdlRDyn
-Oxey71mGbWxuQy/xO8yElAN/p4Rz6yrFB5km3IQEiQXGf/mbvv6Ce4LL9mokEtv9
-uLeVOw+reHwrokGEN+pydQUENvL7FAAGoy62PiqLt6DWj28Hd5Cs/H6mB/2UpeWP
-YyInqEuQXjGPJlYQq5ZdU4bGthVDwUWRLay+8i5OkqRv2C5H5U0vGWejPuXW9fa5
-Ryyt1i3O7JpXWDEphQHf07jH2vq6DH8fCo2rvUKKHUXJeVCY76/tXITeSuYi5ABb
-jqjZCEfZ2fahkHuN2EKiKUtFObcAZ6eMCOMVyMxiJbDktMRGdF2GaTkfEaGW1p1a
-F7NYo3HYmz/aiWOP+dfCRI7MvE4M7NeJhhnSPCk559KRDMmLsQAjHFFloEtu6itM
-O2MxrTCidAfjElai9bhYsLkyqh9vjggy1sNT73mmdVr/lWnNZZ2/CktWqtz+wDDR
-13Jgt8r51bz9EXih12aNzg3L5izk5OjEeDH9RlDr1PVjJYO8ziRaSBnmuT443Og5
-HsnnVhhWWocu9t8XPU1CBJjUT/j2/KK2eGYdbU/tQRV4a3bTd53JOMLncOOowHaG
-I5aWJwj7QPCJ/4RZfDCTgQ==
+MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIMH/SgtNlvrQCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHI1Yn7XIoBbBIIEwJ75MswxTnW3
+EBc/i3MuWyKoD1OmyoU99QA3Y3L5kywIA2GmiEEnzcWVih+aatUuq2J6B7wNT/ih
+Jx6tCBJSTTRmHs04q+KZG9nECRI4E3sXdmywoXlzAyZuYDChjEHvQeHuEfbLqqgN
+mmbGAZXY/f8hJVXTVRyKoxrdSOM1k9UtzDQl4Dz5VvNd9goGf0qwZ00K1bZ96L/C
+M1fwcC+OjLXQ6H6Kuu2DSq3ZIpKbVz66/F/0clQ5tK7y24PBC14LeO62L0YMAk55
+EGqfP+p9LHe+wAoV2BfQfQ6MCKFOdZ5khZg9PObCKN9Y/ivlszjgtsPzH3SwECQt
+yAzSU14O3zykBYefQr3RfDiaJarXKqqaI2raIVOPaDlJ4KsGRHt44GWrLxdCPrzd
+RLQbmpVmS8dWnO1gZx8IOdLYHxyOCRpLaXszaHk2SvBwvMwYvUL+cCYj+GFxkycP
+6yLJ5cGkTdwaEZlp6brmwv4DgzZMUOZGiSYDDSfp/0TpErK0n+cYf2vm2gbw/cWe
+C2+06O0hKjTI4rTNPmpXGiwetd3cSICoEZ2fGouq8tyH0VdnR2RPLZfgpLu3Rqbi
+asvcHfb1TVFD6yp4sZS/WFydVbrjgBbjZompe3Al/lYCBxTAJ5ZIfzVl0wLOSL0v
+SqaP2bIUYpDmWoVY+idP7/nMk395TRWHX7UJfv/sAyUkiE4hHbRk0K3aApC4i3ZY
+Snvss04ExyLQYy7Fjoq1zetDZE6iZfwCP1jR5CKiFJjsohk1eXXfbETIf6Mwu3hx
+vC60KXSkUvOLnoeJtiNQ3QmNqiMl3X18nVmlHOSKhb0/G0+Q4qZqa4eIGVhyzyWZ
+v0dS9FDFI8qAiWnzqlXcgcZKzqKSmq8gL5XKU+WyIelFkDfPtPXiWPtDx2WDa4j7
+5dr2Sw5MsZHf8WMBDu99m9hfzCHTlE4S4PwroMO8rWHvXTJm7uYilA4eYxiE+yO4
+nTyN4X+sdXiYztTm7IRbHhKt2UXz6kre3MlUhyhnZgm4/lBzpEgo9qjV0UXY7O7W
+YuoZHzPz7eMQH6r8sYB+5iqr5BHq7e9RcFKz61xnIIWRBCDhXeugQpjuA3jqsoOm
+jyGsFpJY/TavUE7QbSj5FJDPvhyOgPeBO1BuE6pOGD812OhwFALBzsUwD7Vpn/lF
+Th2g6JODTHJunQ+Dn2jGkYNh1NR5x/Z939TCsSnsFlExpO1vMmi4DLiSUnx2rgac
+q6B+AlLNFGzboMIl+dvIak/Au5jZDK7EjI6rQC3+E/buUBJFcgNFLZLybMTy6ura
+SYtItd/AerqZnBoYdY55xWNb2Bk5snhZ3S5SzkvfpmvNpsBeHCmqIKG3U0v8svYq
+IMeoHlbDwH5EkupnXzPS9CAQtma9uvmZ94wzgnWbnYCu48++r9EQuRT6iBHDTmY9
+aRESQsvenyTh9ZnIrUN7xKkDNmoq2sBaCX+qVvfrLKmURPWlUHDTfX0fP+PYjqMM
+ZuMcdSC+txbapfl0FQvhmXuAuQBjNyq3NKtNMnHM8yK86rjEw/WxwY+MtjgbYEWM
+jGnLqmnnO+2cJERm/BZaiUB6WOZPoa4vmkytg4hBsau3dYymFo0mpnSfMDKfONNJ
+YSUu8i7FdSI=
  -----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 d65a1f1608748b93f156b77254ec661d2f6be9ab..edbab43f2ffeaa6ef2ac2f0c4a48db2d6c64a052 100644 (file)

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 bd8176cd454ada12d80b29b6be0436abcdb0b5e9..b1f1e813d20c8894642d6034bc8f09729374f98a 100644 (file)

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 0c9360f3d395d8c55e6441866e46ee9b3744c52e..ee5139ad438c32a6c6d6bb0911b05975bc576edc 100644 (file)

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 3fb5a3bcd48e20dc6138d13a6c06320007cf74eb..63b764ffc81dac8fb9451854a81fa9274708e4e5 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp

index 35a0a8fd38a4efc227d225ca0397e5dc124aca06..4be856ca02fa8645f10ab8c30e2af7bd3f62cb7a 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp

index dc4d872ff604fc261b081920da2592e3170952fe..0bffcd940b39395e90ca7e58b253e509c68fdd50 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp

index 0426d38dae77b837c62f70a1b024e722b08d6a35..7ecc7877b04477494a5f7f87e4a3756685b92291 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp

index 59e526b739bc673ccaf475b18764a2cc2fc9784d..4560fe8f314535f02c93d0413ecd707f15546725 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp

index 77aa76df2edfddc08ab986b289146f4803b59b86..d4cea0296dde68e4317efecb6561a9e5a9cc8d8d 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem

new file mode 100644 (file)

index 0000000..acadb2d
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem
@@ -0,0 +1,31 @@
+OCSP Response Information:
+       Response Status: Successful
+       Response Type: Basic OCSP Response
+       Version: 1
+       Responder ID: CN=clica Signing Cert rsa,O=example.net
+       Produced At: Thu Nov 01 12:36:43 UTC 2012
+       Responses:
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 43f5e376b0d5e4b6726b036ad3f86cdb598e6554030274971b10c13035d140a3
+                       Issuer Key Hash: 705130a4764431b4b0458a3aef55603a9b99b8171018985b37d3e0b14139afce
+                       Serial Number: 65
+               Certificate Status: good
+               This Update: Thu Nov 01 12:36:43 UTC 2012
+               Next Update: Tue Nov 01 12:36:43 UTC 2022
+       Extensions:
+       Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIICBAoBAKCCAf0wggH5BgkrBgEFBQcwAQEEggHqMIIB5jCBz6E5MDcxFDASBgNV
+BAoTC2V4YW1wbGUubmV0MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNh
+GA8yMDEyMTEwMTEyMzY0M1owgYAwfjBWMA0GCWCGSAFlAwQCAQUABCBD9eN2sNXk
+tnJrA2rT+GzbWY5lVAMCdJcbEMEwNdFAowQgcFEwpHZEMbSwRYo671VgOpuZuBcQ
+GJhbN9PgsUE5r84CAWWAABgPMjAxMjExMDExMjM2NDNaoBEYDzIwMjIxMTAxMTIz
+NjQzWjANBgkqhkiG9w0BAQsFAAOCAQEAUcGj/Fv3/vwtN+1bEJhxqvfKEo77LwPI
+xIbpFiWNHayHvZr0EPKkRKexTArpE4M+rrF6Krx1MSHMN2fqAck4nDNkm3tucj7w
+kBVr4fz6HGqDsH9Ceq5m44gs8F3eT6vzXMuUJsFd611SipKDHyjVSlKJozbYtBgZ
++EpKvu2wxqP9JRDWq8QKjb/dWal+wziKlqMWGahFP+v2CCqTU2R1JXVKaFEiy2Xb
+D8XpRQtegbhl4RJrUxo+51Zm2/xykK1zabdQWmIYWIH+2gjD7xYFWhShSmmuL7MZ
+RCuaE7rnSWuiGEIJLjeTjB8rkDPqabiVea/GzsF1uCaB3+c558IHcQ==
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp

index a52a550ab8ed64c0995c9e9d1757127674d1f5c9..dcd0ded3b73665bc2861402b7b627c93df3ab4fc 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.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 b71a6983b35c79ba1686cecd7e717d9b2c01ad45..64accec80043c07c6e5bfa3bee01ea1f32e1e6ad 100644 (file)

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 b8e41d55f62f11a39664773d7652180407761232..744a9d4cb9356635f0ac4bc0d1aa47bc0b6c42fb 100644 (file)
--- 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,28 +1,30 @@
  Bag Attributes
      friendlyName: server1.example.net
-    localKeyID: CB A7 97 AF B7 78 B7 64 2E 05 39 4B 77 D2 DF 37 41 05 7D C9 
-subject=/CN=server1.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: 35 81 C2 2F B8 BC 4C DF 9B A3 E5 01 B3 57 B8 56 9E 1D BD DC 
+subject=CN = server1.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQxMDdaFw0zNzEyMDExMjQxMDdaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkRgF4m4N9
-6E9nSGO7/OcOzyULoG/muKxJmc2CRHXLXlD0wMO5pvj8iPAS1NbRHFGQcHIFDDUJ
-o7xq+2iT8ulOWxsJZR7p+pEUsuz5giTN75gYdPS2hNIwSP7YZAZEdzcjKETSl7rp
-gFX5lM5uCTszbQqNR/LMM6/AYq0Xm+byS+LbBYElV7zwCRuPzu/Eo/yGf1YaL+Ju
-eV8z7MMptIhEPfDPIA3u+xwiixWkGrQrOPLCuMeweo5AcNoKR/RmFMic+8rbcCq1
-5irPBOGu5CarqRDLHTth19o5ahRcDtS/rDcsUqkNpGTszGY7S7XkAXTo18AY3JkD
-dJ+1shxK7dzZAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM1NTVaFw0zNzEyMDExMjM1NTVaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE8ea5SkP4
++vXhJsGoALCaZrABJy0T27Zt5yVDk6n2R2KuqIzXTpf71AEAIaxeFvrGBIwpEWv6
+fZx91mMSMqbVC4DuMF5+V/Uv12U3BqLCj0kFKazJsxwrcG7Ah3nwAg96o9YSMy42
+N9L2+VDSzQXk7+oDDhNj0ITC6zHuzGraUSP8Hll+KpjTD5RZai1MNwR+ujnmodqu
+04owDvE9JGAyvpAG537UGf22RLVvvLmg1FPPU9TPfV9Y9OCJRgeAP/VwsWcXynAq
+QOT0YNxsO9tQxcWIvYXL1zKGyL4WK+il0el3RBMywZ98+CP9gWHJ6BU+r17bbkYK
+3rH6aJu6mOrvAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBnggkq
-LnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5uZXSCIWFs
-dGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2VydmVyMS5leGFtcGxl
-Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAdUuyNLI1p4WN4d/Dt/5Uuhs6V805Gouu
-jUklir5h51ZpK0cIuuLhai/jswGWN+GmM0ie+NEqj2EoxLfqYEuRm/0QdrlWYpLT
-WpIYfY9djM5fOgWyAaF+/8d7MUNLKjbz8MGTQzysBdhNSNEWRRi4ZXzxHt/VW3qz
-1U9pR1p0qsACYdTsbmOJw8CiExE04eEsz/0F4R8Grn8WYAuY1Yi7maXdByzXNTmZ
-WzIekkZw2eRIgvHpHG4yL7jyYyqCQg3+loGMzo4njY2WBv5VMqf58GW4ZZCNNwl8
-LpqswRJ3QzqMYv0OahEimggNi4d7OpYBnC1RBsJo4/7EGfg6EUdKtQ==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIIiYWx0
+ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLm5ldIITc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAaqOPrFe/ZvpvvQfRyeA6mAm07RLjo/Xq
+6+hf9o/LIwGZbn1jUxdmVKcHc1lIecz0tMrIVKfTwuTSee7HBH2BvWAex9bDW97W
+sVOZ09goLnTu+Z4CQAiU+RuyjzEBOfFgPJp2POTLF1oZH+yIUO2Lvq51LYZ4m5cy
+m0HGFNo4AqytYILmM9UMLFMkDuDorcOuxu1C5hRiOIcT4nc0GI7kSDcQl+vu68c0
+ZYnHIi2XXW4Pw1TLYSaTOf9byMgGfxq0jiwVnniycNHc5P9JnBVSmK2G2jKCrrHk
+z1bzQGir6h6/pQg3o+bMOcdO8GnoeIjLkdViOyVHZjc5XkRqvRBV7Q==
  -----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 63cd135dc559a7ca95b41f758781ba8270836504..3352cae8575010dcb1c5614de51bf6679f907204 100644 (file)
--- 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,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.net/server2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem

index c5b00da24223158003a04695f434269d51d08cbb..28ee5da581fe43d7e8a6fd291958904f9fad2445 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.net/CN=clica Signing Cert rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica Signing Cert rsa
+
+issuer=O = example.net, CN = clica CA rsa
+
  -----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-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.net/CN=clica CA rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica CA rsa
+
+issuer=O = example.net, 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.net/server2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db

new file mode 100644 (file)

index 0000000..bda0c54

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem

index f5c17e91c98b377ae2b86dcf4898d8a2ddafdc80..e3fce40e516b77165c7e9ba0f13910ba3cac93ea 100644 (file)
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
@@ -1,72 +1,78 @@
  Bag Attributes
      friendlyName: server2.example.net
-    localKeyID: 1A 2B 68 1A C9 98 AE 99 75 2F E5 B7 D2 6F 17 12 A4 14 57 F1 
-subject=/CN=server2.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: EB 51 36 53 11 74 FC 19 77 E3 22 5E C5 1E E0 8D 5B FA E8 75 
+subject=CN = server2.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MTIxWhcNMzcxMjAxMTI0MTIxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Ar3krE2
-ZS3e6fLaPkrl+zl3bHpQQ6qlK1emHoIKKm8ELuoqwQMXC5QA8Q/7jO3bhbYVBLyU
-ssSRS0PvjVaTPj52NEap4HmVPNzIMFV+hZbcOEiRoXCZAxLExWiip0HcYDLjUdia
-4dmumyqB45HFoZBaLTA+wFIzCH4gKBJfxyC0tw2bR2pSmKsQBUTzl4r+JIRGqvu+
-jdFFHdvVhTy0uXwlywIxbGab2XuzFw6PU16AqsFK3fUzAbQM9jJ7bPlTUNavNFdS
-XYG0jq9/YA0mqJO6sILFVApHqVL15JzD5WBFtOOHlCLjvD6EM1XYYtK8QJGCVBRG
-hBcUyICpGGlikwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNjE2WhcNMzcxMjAxMTIzNjE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujvIB2q0
+IClON+Zaemc0jT5QOltf8d5PTmIshxe6SdvyblFRUCXo69NtRsDBb1beRoERYXSN
+IBaPakPsBCF9pDQNnPTCdsJpmwNiUxTmFdcu7ob8GUCk3PUWn9UpB5sN9Y2BXVJP
+tK1jcnZaRVIWg4sG2tk+j4BeleTD3++7Rr3TNe+69NgheJT3M828iiutR4dixNF3
+gmamo7TZCgLFH4e8DwWf4a/VxEkGvtp77MBlpqGbx7Wsa/2eXNWiMX55N1aAABC2
+bysirIXmXdEs633g6iNyVHH0sh9bDP/dxcKLp7ToZ6ZBMIRsZhaBcF35iQM5LCyB
+M85moXZAeXSJMQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
-UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
  IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
-LmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
-bXBsZS5uZXQwDQYJKoZIhvcNAQELBQADggEBAHYgFC1Bo0I2sYZuOmIVt06ItcTc
-aQJFmqfa9HGvgsFEMDbzrTsIV30GopsCWC3g8C9dUs4bnoZKKC41mE2PECbed40E
-NTIwH91ZSspkm1A7sWJJqDQ6Doc74zIjwJ0luu4mdCPxb2EnpuWqyesR7z2cBzqQ
-pHilvVfIp0egGqw7/a2r/b9aDu+YECSUrPdivNa9GxPLXEFkLIOiEM8BExTVL8pG
-En3eLYNBIiUjfiR/JeESnPMuaJVYUA3yD9WfqpoE7ml/2UkT+ZbJTsWU459KeCtl
-nvLYbf54OSB3dczsoltY6QBffpyVwd2b9PmMdVRZ2BiKGNK0PB6o6Ycih+o=
+LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBABiKUPn/kz+6qgMxlffaHijAObOT
+991tNFt9zNiPPXboyn/Wmszjg/3NUIaI+hm2d8j3xH3E3Rp/52vXPnqztoI6v3YI
+9Dy+zuvc+1imFF0Wh9ha4hC1u0Z08FlSLLmnGHTpJKb2LlYCi8WdRd7UCkKB3QDG
+/PpTstmxYcOKZd5vfcLQuK4+AvqwS19etWXyS3qgYYYtrA4STiTHx6BQcEMTJklS
+e8zn7SbW4nRK8IX4na+XqOvFoGao9c/cErf1gVUx0nzR80TPSvN9owzWGOKJnjWZ
+AeRBfZ2ZjhOYNAiTdVZFtZYZ1C07Kk2mViUl4KviKTr0a69NOPy/l6YEKjQ=
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.net/CN=clica Signing Cert rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica Signing Cert rsa
+
+issuer=O = example.net, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-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
+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
-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
+ggEKAoIBAQDAjSbScAYCPW0cNADb6GPOz+pNf8BOliBkZCzVijCXUOj7Zes/B+jV
+qU27Yn27+BQ12DDftGA0b7K5hrhQCk0m2VIlK2207xfDF/0Xt3gpqLNrJ518g6p8
+XmvRQYoUIFzG4R2RhdDJ1doCXDKNaOviqye2yVELkhA0RCmysILUf8xxgnyFy4Vg
+oJi0Ibrbt8e10pP+MqtvX5j7Q6rxAnhA2HOZsAANbAd68meudwJK0oRbCIovayxt
+pf1WUGn8b0ijysTEPffX67dZYnOD8pSZx+AXr3NQkxIXCh8V01OxFFz/pJTWPpZQ
+cbL5sA5uFh4pLhJ3aIvlngFQNBMwdeaNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
  BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.net/CN=clica CA rsa
-issuer=/O=example.net/CN=clica CA rsa
+subject=O = example.net, CN = clica CA rsa
+
+issuer=O = example.net, 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.net/server2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db

new file mode 100644 (file)

index 0000000..4e86e7f

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/pkcs11.txt b/test/aux-fixed/exim-ca/example.net/server2.example.net/pkcs11.txt

new file mode 100644 (file)

index 0000000..024936d
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='server2.example.net' 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})
+
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 55a0403e99a91ca8f51ac0fe39cf9f63d3e0aa45..4b62befde703552abeb8fc28711378486d27063d 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: server2.example.net
-    localKeyID: 1A 2B 68 1A C9 98 AE 99 75 2F E5 B7 D2 6F 17 12 A4 14 57 F1 
-subject=/CN=server2.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: EB 51 36 53 11 74 FC 19 77 E3 22 5E C5 1E E0 8D 5B FA E8 75 
+subject=CN = server2.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MTIxWhcNMzcxMjAxMTI0MTIxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Ar3krE2
-ZS3e6fLaPkrl+zl3bHpQQ6qlK1emHoIKKm8ELuoqwQMXC5QA8Q/7jO3bhbYVBLyU
-ssSRS0PvjVaTPj52NEap4HmVPNzIMFV+hZbcOEiRoXCZAxLExWiip0HcYDLjUdia
-4dmumyqB45HFoZBaLTA+wFIzCH4gKBJfxyC0tw2bR2pSmKsQBUTzl4r+JIRGqvu+
-jdFFHdvVhTy0uXwlywIxbGab2XuzFw6PU16AqsFK3fUzAbQM9jJ7bPlTUNavNFdS
-XYG0jq9/YA0mqJO6sILFVApHqVL15JzD5WBFtOOHlCLjvD6EM1XYYtK8QJGCVBRG
-hBcUyICpGGlikwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNjE2WhcNMzcxMjAxMTIzNjE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujvIB2q0
+IClON+Zaemc0jT5QOltf8d5PTmIshxe6SdvyblFRUCXo69NtRsDBb1beRoERYXSN
+IBaPakPsBCF9pDQNnPTCdsJpmwNiUxTmFdcu7ob8GUCk3PUWn9UpB5sN9Y2BXVJP
+tK1jcnZaRVIWg4sG2tk+j4BeleTD3++7Rr3TNe+69NgheJT3M828iiutR4dixNF3
+gmamo7TZCgLFH4e8DwWf4a/VxEkGvtp77MBlpqGbx7Wsa/2eXNWiMX55N1aAABC2
+bysirIXmXdEs633g6iNyVHH0sh9bDP/dxcKLp7ToZ6ZBMIRsZhaBcF35iQM5LCyB
+M85moXZAeXSJMQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
-UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
  IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
-LmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
-bXBsZS5uZXQwDQYJKoZIhvcNAQELBQADggEBAHYgFC1Bo0I2sYZuOmIVt06ItcTc
-aQJFmqfa9HGvgsFEMDbzrTsIV30GopsCWC3g8C9dUs4bnoZKKC41mE2PECbed40E
-NTIwH91ZSspkm1A7sWJJqDQ6Doc74zIjwJ0luu4mdCPxb2EnpuWqyesR7z2cBzqQ
-pHilvVfIp0egGqw7/a2r/b9aDu+YECSUrPdivNa9GxPLXEFkLIOiEM8BExTVL8pG
-En3eLYNBIiUjfiR/JeESnPMuaJVYUA3yD9WfqpoE7ml/2UkT+ZbJTsWU459KeCtl
-nvLYbf54OSB3dczsoltY6QBffpyVwd2b9PmMdVRZ2BiKGNK0PB6o6Ycih+o=
+LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBABiKUPn/kz+6qgMxlffaHijAObOT
+991tNFt9zNiPPXboyn/Wmszjg/3NUIaI+hm2d8j3xH3E3Rp/52vXPnqztoI6v3YI
+9Dy+zuvc+1imFF0Wh9ha4hC1u0Z08FlSLLmnGHTpJKb2LlYCi8WdRd7UCkKB3QDG
+/PpTstmxYcOKZd5vfcLQuK4+AvqwS19etWXyS3qgYYYtrA4STiTHx6BQcEMTJklS
+e8zn7SbW4nRK8IX4na+XqOvFoGao9c/cErf1gVUx0nzR80TPSvN9owzWGOKJnjWZ
+AeRBfZ2ZjhOYNAiTdVZFtZYZ1C07Kk2mViUl4KviKTr0a69NOPy/l6YEKjQ=
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 0a37970e6b29c9f2e893fe6e754585af5729e963..7c31c72cc10356e428e8d2842ccc2b87f9045f99 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: server2.example.net
-    localKeyID: 1A 2B 68 1A C9 98 AE 99 75 2F E5 B7 D2 6F 17 12 A4 14 57 F1 
+    localKeyID: EB 51 36 53 11 74 FC 19 77 E3 22 5E C5 1E E0 8D 5B FA E8 75 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInvLX9INO9+ACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCFsY1y7YDtcBIIEyE3AvEfWukhe
-QSV3lJtV1wXYicAu2rByMfGlNtUYQ3Yof1b66kRaNUL8LnfIUvdbP2umMS7z5pcX
-L8X85/p5VWbrY0jeLwJv6HjMSpb1tnQ609NNrt2WrKX/2bmAUMa74/Eq6vs3Oh/k
-xH5BpWVvbCIBDtzHuTjgx/vN9K6lZpSFuHLXcj3cqAqjmg66rrTdk7XPeuxAmul0
-6kSqObO6Ac5r5ZEq5XlXvR9BK7lkawaSrkfNY0e0ngM/TdVDbdOaqBpoMqjGpat+
-ZucRAQqLefuFWRqn0efxDqiBjK6fXvpJlB8ndV9PGxu0iRpINmMvTGUv1EdUHzKT
-q/XNegPazcE/dJDmDYNgW+g+yqjPGB7unUFNTfOna//Lk19RA2Kqq7DRkHmU7R27
-PUYU6vb5V9fWdPn1RkcBbijlTfMPHIIPxEYKztUxgyPlMzYwxW+fx3EQNF1Sgv73
-ovoabdD8AGQB5U0GKx2MxBrZJmFZ43/RMbSCp4ljMR3vZK+3TGdhJtD+mlVDZ0KX
-COj8GN3bd3Yq75f8sgSVymSAz8PXT/mDw3rNSCl1Go3Blsq2J59P6MvZGtUOiI7o
-LFdL873ZyZs4qey4hOjD9CTA7KKWpIzLtiNgzAI5Dn8ai6JQ2GKwUGFK57pa6wTT
-dzSa0lWIGNyM2TCRMHW1xZ8TWODplEeBYtGcq396Qjpbc0aUe/eMpgSziaN/CEnY
-WqJrqCTQcLE7E+kr+Ff/M1MvBH4NCQpm18RgZj8DoXNjhLPAYh8UwN/yNpPU52fN
-j0cjl+5ik1sNbCQ3P+5922JeGDTuNvtC4Bs/6pSrcmmigc59O5DkwhG34KCNb3OT
-V0PbYv5Is8C3LzXA+SKjfxGZjZmHiWz9mwWhjpN9fOZ25t1VTRkoSkpJOrGIiVJ7
-nu72DpGqMChra1BaEKy8P/oRxPtaNrp8HnQg1jMseZO9v+8aTqzljydUCGW0+SM+
-/Hb8hxfvrasW4ImxeCg00nTteAkhW+0EjqBQ92zY2Cs8F/EBE5hResPI/5vBUmKH
-m/cRHE4VvYKnXL1YfTmpSVhgLmHzWMvC7c8yg8RPDE68UpQYhBa00mD1IPy4eI2R
-Z7YLYaYfNrRd/eExLmj2dTkYxXinBAyot8uBHkqh06p0YgHj1pV/nirbQwNtqWMt
-wi2QBVK7ZuBA62OedZgjGz3fXkIobUdbRlYT3SoEpG8UiySPjLvj6XaVCXsS0g6J
-A6biSYeI/ZqxIveQ7F2Y0eAaJG6kCT9l7So7AXoUW8NESucCRO7ZaH4xX4sq+bVf
-o6HK6TtkFBvGbxLcxegodmrd9F3eWqR3gaGPt2vMMm5xO+tVylnbDlRPc31rO9MA
-S6hwfB7tRvqmtE8LCHhBxiACGTPjy9GUmYtWMfNbGG+/qp4Ive4j/72eH4HtD2T6
-llkSPkgPeWZHGc8h8BEO2w8aqfXIuHOJ5wByGSF0E1JEEP2ZP+6u0dH/ct9HA0qw
-wke8NiQRnyUha3XhLJ7c5nx8U5rR8ThlTK7NkS9VYOq+5S6Oo6/SzJrZzcFr4cnA
-83UTFcAKbWnmx96Ik6NRvi2KsAQ2ksDFQFZtCurr4GjLSIzVoWim2q0H4CWz5lO3
-OJZG7ePfDidxIcC0r/e5QQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInF0aXxpnTUACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEXGdFprKCZjBIIEyG7cLY0CWZGQ
+LUPdutadnNbxqy+Y0eIjnO2IkafQ59ps0YQeotJbq1vyvZddKt0NO4s0lT1Lb4a1
+N1XuEY3HOycz2uXyTI2W48fU1r1ks8FFV2nPMeu01YAG7iOvnhS3Srd3FeEo4PVH
+9VPMcV6QoXCe4C41y06OEi+Kw16nwfMNg79hweRpjcLcAX0avYKVFBhx8mpxUdlF
+QDrm4B2aomCfuMYz0puJe2RXOtK2ZZHChIRLJKYucnqVDEwqG1UXxcJA+zt5xNNv
+YBtJUW3vLA0nzqeUrCUe9wON6bdQy+o9a+WAOsxIaYEmjhhd8kLS/mWbEbuaaBt/
+PADFGDNEGazNVuZtIOVzgAEWGPhq28Vjk08rgXMUaEuE3OgovTLuM3AkZ7OvdKYo
+oqQv2juaADWegfeJ62pNrTYdzWpfNvfHJLmBjX24mAO7ZE9qY+h1u0oJXOhXoqO/
+oV9/VQqGKUGtui9MRf7VmlMG0q4l+8thRQjheTuWeUeLeUrCs0jIa6C82OyNue8b
+U9WcImz9AV57ao8s/LOsxC65l+odtlGpZjgCCz1vfxIp1HXuUN60QnNDPkrgp5Bq
+0yB2IPlr0CTxWvOEQtQ5S1mYvrfOfwPf8TMGId2DpIllc7A6k7B9ZRoT3d/Jcupy
+5d5OJodWoFcnZ/Dw9O2MjtgqDbWdfDiWSk9ia8txY5SU/ai24R4MNGgG/O2ASbr8
+XJ/fdB0ZuSO193zv7AIz4W8814ZJZhbGbILTbxx2Ck0BK14c5YYAnWDGY1o44KXg
+aOCNm3ZZqPIL3mwGysET07IAsoqEcKIWddv8/W2/HVuuymCsXcXUkZBCe405u0gk
+udZWrbss9TtscRJHNEWqqkSh/NS25BoXlmIoos7JI+iDF0sKf/yun9lW4uXeWBBT
+XCRAIkPhAF/E1/zt+8Nvojt6nupy8yFqTIav8QAnddJOefUcn9jYAJ+2Ozw+eFlT
+2ySXeuUC/1UQBfdUHEyu3ZV0FaHvZ8ZQ0r1gS69vP/MlKudLb5g9qQGOuAPeetRJ
+enUChD8HYwm/gyy+KBDSIBIwhMsCg4Sr+enIpJUcQ21G2fcCJwP1PweO3OICGu2Z
+9qpuvIo37pHUrGrPlrSxVSYst9lYkese/lKlQiWV97FxHouz+IoCBt0v5hLuEQB0
+LhJ7EJD/pf8rhukbLIseafbqpK6gQajybJ2VAL3LCon1RS3c6G29oSUfjg3Wgwsa
+gyMbvc+dK8eYzR5BEvf0zPqmhE6RLNFHzDkywFZKYFcG478Uo1WoOQqdXoVnHdcq
+Ib4hDBwWbTp9qC5GWOUKokmWDEoNFngXMCiDZM6SpldMb+NOvh9ug+MKNI7xgC+V
+2eJi9uII9gOMBeE8bOyofMPJk1lS+ZPZ0eKJlq40rH9jaaCRba44rDASIA1D2DF9
+IlEDbjP2HoHqJ6Vq6Ki7LzoYZZBgN59jpoNf6ksvzQshpABR3Epb8qMLBF3VmE6B
+DNlA6erPWnjVqUZHirC9fO/eh6RLKw/LzHPoXO9qSyTY0/WWaeCy0TeFmOsbBhqv
+VU1wjVVcqEycL/mhV5LidY+YOVDUSthWjwvtao8dDgoWyQyYNjq85Vf7UGkGYSXH
+R5WSUqWDXelkpHB/2CkQTQ==
  -----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 96cf26887ca97d79dd3acc5e766177c6a3cfc64a..32f857265ae5b2fb1724e3ec6104b3e44a0aaca6 100644 (file)

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 2e7c6b47d4dc274167b0e6bf87c5bb8f44631994..25446e11897a84d8cdd99e7de663b970a396b102 100644 (file)

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 557ef39e5032c0c8fcfb67d0e612bd702627b0b5..28509373b81c7d76dbb5c5c35db8d6a9eb96561f 100644 (file)

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 2e7c6b47d4dc274167b0e6bf87c5bb8f44631994..25446e11897a84d8cdd99e7de663b970a396b102 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp

index b477ca69535f002bfdae25d65c64c1ec852a4959..779918797d666cc611fd482e8d8b38ec20960013 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp

index d3fefae3540bbd4121fe446626df8a33406262d9..5c0a30bde8a1ecb295bb1a3567ad8d31a0769205 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp

index d3fefae3540bbd4121fe446626df8a33406262d9..5c0a30bde8a1ecb295bb1a3567ad8d31a0769205 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp

index 0011b46485d2a9cf3a46b53df20dab60372e87ac..43f81d54bb8148fb5265e5b6ee307e0d06dbf605 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp

index 2295e06c10548bd3dc2217cf05bd4028c63c349f..b1fe43dcaf8229e146d612fbad94c0d29539c927 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp

index 2295e06c10548bd3dc2217cf05bd4028c63c349f..b1fe43dcaf8229e146d612fbad94c0d29539c927 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.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 4469fae1d8ee94c8e9bf3807dc93476e6d8ca931..5994e20b322bbaa2ac0b25245b63c55dc4b1611b 100644 (file)

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 56ed7bcf0e8bfabc7487dd861c99ccae34675cad..3ba03ad33f8258ed854a1b81c85bba23a14a5121 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: server2.example.net
-    localKeyID: 1A 2B 68 1A C9 98 AE 99 75 2F E5 B7 D2 6F 17 12 A4 14 57 F1 
-subject=/CN=server2.example.net
-issuer=/O=example.net/CN=clica Signing Cert rsa
+    localKeyID: EB 51 36 53 11 74 FC 19 77 E3 22 5E C5 1E E0 8D 5B FA E8 75 
+subject=CN = server2.example.net
+
+issuer=O = example.net, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MTIxWhcNMzcxMjAxMTI0MTIxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Ar3krE2
-ZS3e6fLaPkrl+zl3bHpQQ6qlK1emHoIKKm8ELuoqwQMXC5QA8Q/7jO3bhbYVBLyU
-ssSRS0PvjVaTPj52NEap4HmVPNzIMFV+hZbcOEiRoXCZAxLExWiip0HcYDLjUdia
-4dmumyqB45HFoZBaLTA+wFIzCH4gKBJfxyC0tw2bR2pSmKsQBUTzl4r+JIRGqvu+
-jdFFHdvVhTy0uXwlywIxbGab2XuzFw6PU16AqsFK3fUzAbQM9jJ7bPlTUNavNFdS
-XYG0jq9/YA0mqJO6sILFVApHqVL15JzD5WBFtOOHlCLjvD6EM1XYYtK8QJGCVBRG
-hBcUyICpGGlikwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNjE2WhcNMzcxMjAxMTIzNjE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujvIB2q0
+IClON+Zaemc0jT5QOltf8d5PTmIshxe6SdvyblFRUCXo69NtRsDBb1beRoERYXSN
+IBaPakPsBCF9pDQNnPTCdsJpmwNiUxTmFdcu7ob8GUCk3PUWn9UpB5sN9Y2BXVJP
+tK1jcnZaRVIWg4sG2tk+j4BeleTD3++7Rr3TNe+69NgheJT3M828iiutR4dixNF3
+gmamo7TZCgLFH4e8DwWf4a/VxEkGvtp77MBlpqGbx7Wsa/2eXNWiMX55N1aAABC2
+bysirIXmXdEs633g6iNyVHH0sh9bDP/dxcKLp7ToZ6ZBMIRsZhaBcF35iQM5LCyB
+M85moXZAeXSJMQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
-UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
  IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
-LmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
-bXBsZS5uZXQwDQYJKoZIhvcNAQELBQADggEBAHYgFC1Bo0I2sYZuOmIVt06ItcTc
-aQJFmqfa9HGvgsFEMDbzrTsIV30GopsCWC3g8C9dUs4bnoZKKC41mE2PECbed40E
-NTIwH91ZSspkm1A7sWJJqDQ6Doc74zIjwJ0luu4mdCPxb2EnpuWqyesR7z2cBzqQ
-pHilvVfIp0egGqw7/a2r/b9aDu+YECSUrPdivNa9GxPLXEFkLIOiEM8BExTVL8pG
-En3eLYNBIiUjfiR/JeESnPMuaJVYUA3yD9WfqpoE7ml/2UkT+ZbJTsWU459KeCtl
-nvLYbf54OSB3dczsoltY6QBffpyVwd2b9PmMdVRZ2BiKGNK0PB6o6Ycih+o=
+LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBABiKUPn/kz+6qgMxlffaHijAObOT
+991tNFt9zNiPPXboyn/Wmszjg/3NUIaI+hm2d8j3xH3E3Rp/52vXPnqztoI6v3YI
+9Dy+zuvc+1imFF0Wh9ha4hC1u0Z08FlSLLmnGHTpJKb2LlYCi8WdRd7UCkKB3QDG
+/PpTstmxYcOKZd5vfcLQuK4+AvqwS19etWXyS3qgYYYtrA4STiTHx6BQcEMTJklS
+e8zn7SbW4nRK8IX4na+XqOvFoGao9c/cErf1gVUx0nzR80TPSvN9owzWGOKJnjWZ
+AeRBfZ2ZjhOYNAiTdVZFtZYZ1C07Kk2mViUl4KviKTr0a69NOPy/l6YEKjQ=
  -----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 5b973453beda433851e46d2c6c2ce325dedd0d31..1f3cffedfdc738f8739238afc01585808cfb08bb 100644 (file)
--- 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,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.org/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem

index fd4f76fb4a07ba0773b41d43a7139609e543548b..cd482b8a6ec3cc8d853755befde69851d9e5baf3 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
@@ -1,18 +1,18 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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
+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
  -----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 ac19bee10af70f768a31d578fcb1af20f546ab0e..073d378e1db8625dcf4f6ca5ca7d3273c718363e 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
@@ -1,19 +1,19 @@
  -----BEGIN CERTIFICATE-----
  MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/cert9.db b/test/aux-fixed/exim-ca/example.org/BLANK/cert9.db

new file mode 100644 (file)

index 0000000..8a9499e

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/BLANK/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/key4.db b/test/aux-fixed/exim-ca/example.org/BLANK/key4.db

new file mode 100644 (file)

index 0000000..6622c38

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/BLANK/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/pkcs11.txt b/test/aux-fixed/exim-ca/example.org/BLANK/pkcs11.txt

new file mode 100644 (file)

index 0000000..89eef7a
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='BLANK' 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})
+
diff --git a/test/aux-fixed/exim-ca/example.org/CA/CA.key b/test/aux-fixed/exim-ca/example.org/CA/CA.key

new file mode 100644 (file)

index 0000000..9166afe
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/CA/CA.key
@@ -0,0 +1,32 @@
+Bag Attributes
+    friendlyName: Certificate Authority rsa
+    localKeyID: 35 3D 11 32 E4 9F 30 8C CA F5 59 02 54 22 C9 C2 2D 68 03 F6 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC+2dCSa1IX5HZw
+9X8oXwYRtbvtkxUxz5E8D4dP5LU+0eDPgd5yclkY0gQIFIBjeULAnRUCEv+sgqfR
+z4Ynh4Z0ngfFpBuxyns7+OzzcrPdPCmzIehGdehoD0JxW2xG+pWkIOVeZnERd6fM
++b2iMGhyI1upL7Ovdp3v4FAoeV7tHVZPxFJnU3jEEkAUX2Rw29e4EGjl5bsFYTy9
+mCW460DYykwIQ8hJXmDTUpyE8KuLYRW7KSePBvkvp+P14vPU0Y/IwTiQD/T7kW51
+3r3zHi76qNzf1DSUZlDtzv3VOkRUMPYm9C97bFs57nfGNBLTeNLQQqqxwqdpBBJ5
+DqKvK8vxAgMBAAECggEABc0JEepBLIi9MOHFY6y/unoTpDz8P+9XMsQmEL+a4rXu
+Z2BDKqdfHeoERVqaLGvbI4+iu9VoAA5Ym3/7S+hKpfDHu7IpRVYqOMBwM1YhMXBK
+tC8rqDidP8x28Ise12l2cu6tChmDBkzkxM4yfWOLSSzZ9GKGy6aHVmszBIfr4rkc
+GPm7mxkypJ/8890QWZZ2/uztl6SP6QLH3lQdYZYNS0Hkx+uDVdrG4Nko1l0VAORS
+HU/244YxFykgK7BYZF3UKlCgxHgy16qy7AADYrBTpQmIeYzAjJHxXAy1YJuvVVZl
+R8VdyZlKPK/J0aN1Vc1SwkTbeYzrdId0izR/FuRSoQKBgQDqCsdsPsg3LBNahrkI
+Xqx4lTAxm6EVXjF5nM8u9JXwYroJqc08kMUB5oLkTjUXNRyfjPBstay22sveNxNQ
+VCPUxaYRzFfwP/9lGwnkXD/emFyW/okLBF2FZwLomUY86eQrJiBClTU2n2JPqW3X
+waXRy6VniN6Y5x/n88W/eAULOwKBgQDQwasW4wsITJr3kHmb/L87fNhwRugspdAI
+5auzNPwDLzpoLRNtuuXe+STWFyDuCwuHctaE8FijUHZTQ18Myu5u6dC7L4vl6Bhi
+98FlELyZt/50xutHNT1+rRXsdFznaZBP3YgoqaziCVLGQiLki9P1wt1Lltkh2vaI
+w92rQwzawwKBgC7ulmr4dAHMTt06YuRwx7kugYmRIc49I0K11T4fQeoAgjnp2QQq
+K7dj2B+cJz1OIz1Db/r8u3O3kGYxOShElyLVt6WeCoxc6QQHVgZ7ETu75eVJiYWy
+DGbx7z1hbxpL9LtKW/G+JfucHoTG/wXjCTN22OZYJfsXbeh/k8n/cVN9AoGAELXP
++i8GbQ2kwfhgo6nhrONbd/FVGG3Vb0DjM58kJSUcqcYh7gCt8eFDn5eOXT+pFpiM
+r2uFzNzd++BCtYVw/JPez30I18hyW0m1w19JmYxu4+4gWzzZxVAZlynhXezHTn1P
+LuIWIqnYZGJa5KyEtQF6MVjL3LfoUB5Nmi3t030CgYAwtlOQF+tzjwGWrDBVWqTE
+SiXcUtOhtw0IR3+2HfSGfOrd81IbnlGa0hMd9vzqeKylhPg4Gc3avGukXr33U0Fk
+9DyunKRPGj4D4ldKT3pluyD267NwWtZMhm0Voy7J2jKvrxhrVvnns8XrbQ/dmCqd
+ne8xuAB4CMhuwESdq3l4iA==
+-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/CA.p12 b/test/aux-fixed/exim-ca/example.org/CA/CA.p12

new file mode 100644 (file)

index 0000000..6aa8931

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/CA/CA.p12 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 fd4f76fb4a07ba0773b41d43a7139609e543548b..cd482b8a6ec3cc8d853755befde69851d9e5baf3 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
@@ -1,18 +1,18 @@
  -----BEGIN CERTIFICATE-----
  MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt\r
-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
+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
  -----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 4ec6ac3ed4ad8dffdee7eb8b11e8c66bac4eeb20..073a2617634b4a8badf9484503c94064fd83dee0 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
@@ -1,32 +1,32 @@
  Bag Attributes
      friendlyName: OCSP Signer rsa
-    localKeyID: 81 86 48 8E EA D9 3B 75 FA AC 0D 2F 37 7E F8 81 C5 C8 9B A1 
+    localKeyID: E1 FA 48 6C 03 55 10 68 DB 1D 4B A8 47 B6 E1 8F 6C 91 24 CE 
  Key Attributes: <No Attributes>
  -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD1LIM/wmGvsZ9q
-Du0YRsS10PCs+HkG3jdGmQcYZoMfx9qS7i+U35YGIaW4cw/W8YBEzDVdrt4DRfcC
-2YEAVBy3Azj8pBwle/dav2v6RsEEJNiM/hqvnAgGN2ZabDjUgTRqMu0qnDrR5MKV
-JFcAugmmscf/vzR66UfcvtY+RzR3mDbU0Wzhm4khCofzvBDqGve2CwvJtD4L+7S3
-Fk5nGK82p/a1qIxLq5kB8JBXosx73aTDcJjdfmn/Knh4/xsWhbcUQGbspXOLCN3j
-0sV2XSJ8AAfhfknTvpdcv64lrubTHgMxl4njrZpFqQnkkzjzz4sy/6RTswNdYCNT
-t6zVZtAfAgMBAAECggEAa35utT/GkL+yA1A0B9bPXGAVheETPz2iwqNJhxs7Fm4L
-mSwxVHaLUnjiLfLU2QrdkExwgXiwAoNkf61ZcAlw5ZTWIX7akFy/4NvYvczTx7tX
-7slibehdZExZ5f9ZE2Lq1j0p2urQp0JDRhy+wKTQonOEGs98dP9e8JwDVx7lFCGf
-CMK+3S74XDFTdFgsoWfzuA9tFusxDS0MZ4sn8mSgmGY5uXPgREXh9Q3MZZ6aLtoy
-VNmpKXf9n68BqCabpNTL3XZVyYq8p7XDZs2//IGM9s+ctNseSw1qam64BP7p88Xz
-xm75/53lkAW7AkHkQ9QxDcthja+4PR+/AxrwpX83YQKBgQD7UarlInDk5tsq91Na
-Z5nNLIgl+FfVhGA5gzLiAXAwLNn09tkWIqiWm3UM7zEqbXqoqS5lB2ZTMdo121Oz
-e8yeX0jgo8wIBEKsKO9DfK0LZTEfKr0DtkmuBMGVh9egb0LV9Kkil405TexVjpdx
-mgNTXPMdzzEE6ZyiIIP+2r+peQKBgQD5vYtHsIDaHkQbc7nL95XhEibs9cMLNdrL
-ZiQJyvzOG6/yGn2fiKAGYiMMfeN6V+cihyqA7WiMViMT/foO0bmkhvmrYk6zS7zG
-sEbAFrfvYtE60WCmsL94JLfjBU4m/M/drKpC438cHgkeiO/MybZdWCyj8ccqnfVT
-Bj72BA/4VwKBgQCDq6X9pq2/P7RULoBdPSo3dL1gJ1zdYR2JBFQEVPySQO1wimPy
-VPY+8fPBcxAvSmyZMQo9pELYE6Zf0SlpP9NUpldoWmjrSlAkIs44bXm8Hqg9zAZ7
-i2XO5m8GCMXQKHq73hM/LGexPkI0ESEHQ8m6Q1icpZDpIfwOdTqyq6j/AQKBgBPE
-F7j11EzvJk7R6vukvd0Rdbk9flFt0sJUdDe+NCIP+O39gMHWq2u16rY7ZHyzZlzK
-O+f2YlbxHlefu2He4YWPFUWmQzpXnTpQi1j6s1YkCRFRrweiZ5UXuuIh8lyNl9og
-p10h6laMXgZnqisYL/HVX7seELhjxh3rGaKZEbaDAoGBAKjSKSBAm9zHUlmM9MOG
-FXzEBE7SY/KQe9M0NCA7tbI6R6iXE/djXpxYFZo7LsuZqi7lsN1ktJemACkNmU1L
-4Qhd9G4n2mXv40cQiqFR2uQkcUYUYswbpd7V+twphjZpfOUiHtrBTl9F4ILpdAlJ
-peZJsAVnfvD7dxSidaFffyt4
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQChoqHVmdQ/+BJp
+2tmgIg+Hdary4ROrubVscmU16UVRdw4H5AOK7hmrO0NYdY5pAU8iGebtFzKm6LXT
+LKSHeVanccpGRTq+JoE8IL5OA2y6C3/ZxQZnxemdIrPvcGBNtzkZpCEMGgYwHdYs
+tWAO6A3EWAf7XXopByw0CvqUKZFDz01ssQipRqztvPHNqKKvScsN/++lhFz9kRUq
+8LA3n8Ucc4C4II2d22MnxB1ikRn7wpdI5ZZklMuk2TBPPaCdY4EJ8maHyLpRG9Ai
+t9SFVgOIJjZON5luJdCYu7Og5B5fsmgzITZdVZX3cVPoeC6JYCgaLBjWvXSfjNqv
+Snbd5A89AgMBAAECggEATt95cS37cKuw8I6mm4mDYmp83MAQRT/908mOsdv+w14B
+LsCJKgY96Fym5EeZEoxc/Rr+oLstMF1mPIIQVztSmarhNaEapSdM8PZZZuAs8iwi
+WzXVhlYBRXhlrXV8yO+boXOB3NHmKxykInTvRtbdwO3kFzjqH5MscsjYtewCwr9j
+BnDU1lUGUYagPudY+pWTPlfh7oUyogkUwTOLXOuEFpjvdCRj/ahglE4vymMsligm
+h78z4N0j9uXRdiVEmqREVjoWfXxxvGJPn41hvwpVmNex8+q0Tl+tWOnHeqUF2wa9
+spxNnc6zcoUxZyhe8dHflwlJL7jqJvn02ULDP3A90QKBgQDXIMBvChpHhirm3CTl
+CwnD8urXXFfVfnt9Ys6tCsHfepboOUplQFRjTpFH7GDEDmHVLNnh2Eug985vq8j3
+q4SqGbwSfhHqQO+ypGr9M7MEpOH86oPv7NwPcnvkNBsTZ/0bzqFrVQTjRFct4JsO
+75Y/r8AzRU61+zbfyxgIaD1f+wKBgQDAWCP/e+++uFFAiF04vjrbn45ibMmDoM2/
+6qXl+COITx0hsU0kmkQwEKrHsD/XcAOCrcFDASaUFeSthdjssysWYczApzqlNrla
+/SfIlhhHpNEvmC1mgrJ2UFzRNvSmbKP4Q+MFc71lXIwDKHpbXVQQHP11O9u5zssk
+hg+vieRQJwKBgHAMsA5l7bApUrkyGsltyWVVZjpL77fUjE+PomSBAN/8wxMrm/NG
+4W1kI8mZdgFIGG7nUIkQlru9trl1eVR+8reCdfIP1hb0QaUDfHJrdifKFacdIyFZ
+dnlZQOxos12VQUE1i+ASxVv2YY4Uuc66vcBoMyzBQbEJqtg/uUHPwX/3AoGBAJFn
+UDdH8tJDtjDJpWdK72Wttc6UHLZj7oZBlY5Gyl22KPiadw3PjPKk9uWkSG7Nn+m+
+/pVvnkFeV5QR1g4B1/XAky+ke8H/n5m4PMX3KX2ni/el29RdwxmL4M7L86CICmCY
+uVsaxreEgde1VuIQqIbR0403ZgCN4qXGrr7tx+oLAoGBAI45/cu2Lvt6f4mqiDwD
+trKnRtPEj2FgHjXVnlSoe1aPdYfaJQ3rvGQyrQGDveLpKc5h9CyuEn/EOs5l1pbt
+F/qc3SSN7H6yW1vy5n4vWA78KBcyD6xzKtHh16mV5Eo4EMmlf75roA5VvNspQIJb
+fUVPYP/8v4h+OFtgobUyoQNS
  -----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 d57440db54f3acc98e8e7abba8e85dfc6898f09c..c33a16c765d67fdb59868aedd23fff3b38b538e8 100644 (file)

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 92212dd2ad3e39dce37e5e84dde7490c4792e7a0..a0ee92e98e7a877e818a10aad680d5bf1d27febc 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
@@ -1,19 +1,19 @@
  -----BEGIN CERTIFICATE-----
  MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt\r
  cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx\r
-MDExMjQwMjlaFw0zODAxMDExMjQwMjlaMDYxFDASBgNVBAoTC2V4YW1wbGUub3Jn\r
+MDExMjM1MDFaFw0zODAxMDExMjM1MDFaMDYxFDASBgNVBAoTC2V4YW1wbGUub3Jn\r
  MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB\r
-AQUAA4IBDwAwggEKAoIBAQD1LIM/wmGvsZ9qDu0YRsS10PCs+HkG3jdGmQcYZoMf\r
-x9qS7i+U35YGIaW4cw/W8YBEzDVdrt4DRfcC2YEAVBy3Azj8pBwle/dav2v6RsEE\r
-JNiM/hqvnAgGN2ZabDjUgTRqMu0qnDrR5MKVJFcAugmmscf/vzR66UfcvtY+RzR3\r
-mDbU0Wzhm4khCofzvBDqGve2CwvJtD4L+7S3Fk5nGK82p/a1qIxLq5kB8JBXosx7\r
-3aTDcJjdfmn/Knh4/xsWhbcUQGbspXOLCN3j0sV2XSJ8AAfhfknTvpdcv64lrubT\r
-HgMxl4njrZpFqQnkkzjzz4sy/6RTswNdYCNTt6zVZtAfAgMBAAGjKjAoMA4GA1Ud\r
+AQUAA4IBDwAwggEKAoIBAQChoqHVmdQ/+BJp2tmgIg+Hdary4ROrubVscmU16UVR\r
+dw4H5AOK7hmrO0NYdY5pAU8iGebtFzKm6LXTLKSHeVanccpGRTq+JoE8IL5OA2y6\r
+C3/ZxQZnxemdIrPvcGBNtzkZpCEMGgYwHdYstWAO6A3EWAf7XXopByw0CvqUKZFD\r
+z01ssQipRqztvPHNqKKvScsN/++lhFz9kRUq8LA3n8Ucc4C4II2d22MnxB1ikRn7\r
+wpdI5ZZklMuk2TBPPaCdY4EJ8maHyLpRG9Ait9SFVgOIJjZON5luJdCYu7Og5B5f\r
+smgzITZdVZX3cVPoeC6JYCgaLBjWvXSfjNqvSnbd5A89AgMBAAGjKjAoMA4GA1Ud\r
  DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF\r
-AAOCAQEANTWgabAYWFA8MRKb8R6d4zI467T5jDjK2UlWtpzJQgNulyosZeDmjRSw\r
-orsBrOFN7jOpWNgnIL/joZm3xiKb4V14F2yRa0qvbP8rtOWHRb09x0P08Hw8/sh7\r
-5cDBwtZCgS6RmZouG74Qz3GAN3tV1Z5geezP+g+u3RN2jU9KV1/Cx/0IfUNzRYEp\r
-fE8klaatrUwxg5vBd/BmcZb8fF40Qn/yz0pNLPCvZfSh+UUcXiqmvKDZUI9DGXo1\r
-BgjOMWLYJRccfzZq97zISvdx2ic2qBvEkYJBCptKDwXMDvx2vGswLYgXIeBtWmig\r
-qmn2HNOF/KBa8T5KCg232FUiDAlYCA==
+AAOCAQEAb0e38ZZSDwiqtzKKeOX72ulq916p9GI6Bdkan8aNNUurXEMz7KVFIbCT\r
+3I8pAWujdE60crBb92Mhr/KRFYmbbYCSEHOmUcTAyLnMFq50bVSRgHe83xt4gc0J\r
+/0yTCE+GoAHXgxwfqTtDhfWLZauraBnELdlC1RCgzCVtsBVVPUCetDRhn4EOMuIV\r
+ICobAgG1JyAOQOoGMf/fP6dPjMsAqm5O8kIlgnlsqJMnfMQ20j7UMmOdY6UnsZpv\r
+/la5jUQEPl4xHdw64Px8D6C4h/UagyE5Z42dptEdNHS9gF4oFIRhz+YEbZe1VsqI\r
+QvuQ8Ea8cLDJl6dbVqKX5KZvinkEJA==
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.key b/test/aux-fixed/exim-ca/example.org/CA/Signer.key

index f67c98107297c4ffeef2adebb1fcb61ebda0caee..2a0c7544ad52b91fcc66ba037026d38deaab0f0e 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.key
@@ -1,32 +1,32 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-    localKeyID: F0 4C 5C CB 3E 27 5E E3 A3 16 3D E0 C4 61 81 BD 27 8E 00 0A 
+    localKeyID: 27 5F D4 88 D5 6B BA 62 B2 2A F9 05 82 52 E4 7E 2E 28 F6 8D 
  Key Attributes: <No Attributes>
  -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGwlUZM/hbcUJ8
-4Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49KAJiC4WRhX5+sbvjWK9XeDZEb
-VCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3oreVGBCxEgyJs/aTT7Jtlav3
-SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ8KFs1wtSoG8UZiiOhEvCVNph
-Ry0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6WUW2yFVes4WotOa9ZjO3GHWV8
-Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50nBL0OPz2cVn0BgBMLPMFZUJFz
-+9ih/QlNAgMBAAECggEAKJwRk4/vBU3vkgCpJYYUCPDckTgag0q/uKI8S9ZC1Z7K
-KzQ9O7vkGrBi+NDQ9+U4BFz7GhVEQfWfKYiJuu5m2S6TxIbZGwSPzGvkxYiak+xY
-Im/V0S9cM6IrJLsRRACGT8dVkLUmpWXAiErXBe+YW8ckba3nCG5CqepvrkIa97Eh
-D+a6ubyDutCS2O7eB1ZNd68awG9hkTvuujNCINU/8juWt/5hlEJZlOHlTPSr6dGD
-yDfYRQq+MlJ7/6yrtFHNwhdv08rxxMU7uOEeBRvsM1cvXfWLdrhvYUWBohBpnR3V
-KVMncSxJ9+v7HNWrPQzgnY3pebSMeH70JBuvJlbNeQKBgQDqphYGu6RKqTkE/m78
-eHmDU0YBs7N82bNU+MhCbcs9MZNU5JVvpKfjLydX3CiKPkTZ020zef1muK3dCtEa
-GrfQBy9zUVODE5w3eMC3ivauUHjmvynr7j1R3hFVBm0X2Gq/dyXmREdl4fAcjumT
-htiFn0CblOKDh0CCeiW8b67TlQKBgQDY2DtTopqBVbqnDmKSX4obJ2ce1q783ftk
-gzCp6kXIEtPEOUbh8xonSpBIDhu44YKOoOzdFzRkqiKji0nQ2rshPIFQn35LXOgh
-5US/pHnAyO0qFqzve54X32J2z1cYG0xajep5TT4XQIgHl5ELcedB+H+xvhMeIsDa
-advvsrDw2QKBgEqHlldtIjHUrhe3+OiYG4Bq4sGHomr1etBydKkk1nkJVhKQyCY9
-1lWClKyDcRz3ykalsPm4tZP69L5QwTnZYqjgn2GxYyUvBV9ZK10g9llHlh80eMxH
-T5LBRiALensocj9+SLtq1IK30NxBSE9jdUJ74rmIAKpmO0c2JOZFUvJBAoGAVfvw
-EmrgvzZCTCndFlOCDOBj+IuCWcyf+aw3qLi3sO0eQanAnKnsDfZ4HcpSXc42Gd5f
-7g9cfComkBkUTRfeqgA2+sQzrSiK953U0/UhPjuuJ0lUi6XF+4tdnOT8kReKAEJT
-3oOtgkTZa8FDB3nEDJm/8LgBFqsLM9BUIMkHdokCgYEAgHreS54nY1owZTcnYD7H
-9elj9g4vJceMh/1GmJeegKwu9PWsgi480h+J3Fs0Ep5gEvk2zWl1ka9ehCRbgmdE
-Ao4782kjwFl0t7h9NDJQvohdTWiLKmgxmJQt7ip6TIE/DU3O6l83pgK4Ahxpije8
-LIBJKnxWfjeZrHLgwIZW3yU=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDWnBT4P/2nkS55
+UmKN1d5JFOyNDjNqSa6k5nkbaZ4jle8VDI2GKxDbojY6g31ZzmZD+yjFFSN3q7mK
+QgZdjuPLkuRGAzpCsOGk9u0tqEuQFD7FOoHPzi7dtpGdaSbkXYL91yfhwP09Er03
+g7raHx0sxAmgZul6rkxNZDTCTbPdXxgsb7sv+rNry9pAkpO4cubV+AsFqtvPXGVC
+OjyUmBwir05ifQhHmMNvsARH4YnCGVOswLtnzD81bHuuVYdfiJtCSZWOJFE4fQAU
+i9GV4pfei3Uw4+fZiY1FL/lu2NOA3048Yxa1j7WSR0rnx88xphxUhrLZXjMrfhyn
+y/GHMf4ZAgMBAAECggEAKt1uCs+tOGT1JWJhMPdAuNQnE118w4QIEAPAuMr1vSHb
+aRbixaOgcF4L+s/8n41sO7PUxticBvET1Buv7cv2j9i9I4bNgjiWOT7gzLfKr/J7
+PyWafAkwrzQiDZDNJdvPqCfrXVoQurwdcxMqpRqF10UorxMfG1PpBaQ4LX8bp+FS
+7UnDECn09RlNaUNx4u5USYbNH4TU/vSAJXOxwuZxiAnTvU1jfLyjU7WE4Wx1nFO3
+gcHbp9qm9ZWGVwfmanFhvoTvK1wxr3zmkhufTU6rIeM+JaIjrzMMueB8F5x/zzOx
+uo6eiJEQF39lnKuG7+vq9n4WlsBT06WlJ1zhi78oIQKBgQDspzEg81sWviKJ0dLX
+bZzRwRSd9/Of/XL5zasLEzYuMUu8P2ViHorO+MJ9AGIHR66X2Y8talIRrjgKdpmy
+0fn8PiK07R72Pbp6W/YlH2MVu+/qetVoKvXHN4fg0XQthFg9aRcQRD8vBTnWhZev
+WdITbzSbs/YyJa2gfZi8r5MbdQKBgQDoJ42vC/wsKpX7Y1mgPYiI8IfFA6oU0+CY
+/BeFPInHK/Rz60tDjU0BU4NmrdUwFs6iNzhVM9bmnDMTI1nIYcDq+iohR0Ri7QT5
+wIVf8CSFXuns3qa0OYjIu+yVxvWnmI/3KWs3d9q9sMYC1bU8hjhYK+aLnFVf385b
+cis1nL2XlQKBgB7rvYSTp3wyPasKSmUxgkL52mrFggSOhh5TnBynVvX0JPQkyGdo
+nDRs1mSkzyoqWIqot4d0k+KRg+sCEhUGUIZ/y+Md9GSyLhJcv62cC0NEuhVGFWo1
+6sUr4Uojs+1alHj5qTTL5gGLykHYVLhpoQQ/DH2npuxodeY5YuKMgkkdAoGAfJkt
++/Msxu+cS64I3m3oJ8cgt2a+FCubccBrR0E0mUdIDicM4Baoa7vM3IET2JmFEZ8d
+hu0pu9+9sdnZSCjfB754eh/r3kRj1T+01cbncwV7+3uMcVInzcS+t6xvECJbskXy
+m3SiXAjSXZchjHhlKT12oRuo3qoZ8Q6XjlCvmPkCgYAE/jRWze1b9XEu8cSbBMTT
+VujcLG04rW1edaGLGTnAjKWDghlyb1376pf+hkGkAIOu6osizVrBg9cfX/SNEmVp
+Mz92mWUhUiwZ0fdZJCdGGoujTYArxAydeDxUoa7qCInvwUq/UPl3tMjR+8z5Iats
+/WHqfyhaWbt1e2KPHi27Jw==
  -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.req b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.req

new file mode 100644 (file)

index 0000000..fd12864

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp

new file mode 100644 (file)

index 0000000..fd691f3

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp.pem

new file mode 100644 (file)

index 0000000..1308f53
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp.pem
@@ -0,0 +1,31 @@
+OCSP Response Information:
+       Response Status: Successful
+       Response Type: Basic OCSP Response
+       Version: 1
+       Responder ID: CN=clica CA rsa,O=example.org
+       Produced At: Thu Nov 01 12:35:49 UTC 2012
+       Responses:
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 6f5e8a1d1ee7f7b156e14e5f256318f0f2ef31c7440c12d789b0b3cc9f1224da
+                       Issuer Key Hash: 0c8b9b6aa3fcb4ad014f1d4ee22cfb498e6958fb2c33505ece667721a41633ba
+                       Serial Number: 42
+               Certificate Status: good
+               This Update: Thu Nov 01 12:35:49 UTC 2012
+               Next Update: Tue Nov 01 12:35:49 UTC 2022
+       Extensions:
+       Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIIB+goBAKCCAfMwggHvBgkrBgEFBQcwAQEEggHgMIIB3DCBxaEvMC0xFDASBgNV
+BAoTC2V4YW1wbGUub3JnMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTIxMTAx
+MTIzNTQ5WjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIG9eih0e5/exVuFOXyVjGPDy
+7zHHRAwS14mws8yfEiTaBCAMi5tqo/y0rQFPHU7iLPtJjmlY+ywzUF7OZnchpBYz
+ugIBQoAAGA8yMDEyMTEwMTEyMzU0OVqgERgPMjAyMjExMDExMjM1NDlaMA0GCSqG
+SIb3DQEBCwUAA4IBAQAmVUgaeP83bhQulZYfDDZaB55cjrr5SjlHJbIfwgSAByHa
+TKjGDN5Bl8hyCgmc8mVYF+/hcwpR6n9JOqFeMvTRp6Z+uExKt8GgcynclJ/V2EtT
+sLEPY+U9x/TxNMFY2pWGRZjIrIcyjwp7/sLfZ9h2GCkcRx7Xd4a6SLC8y88KT5Nm
+rFyxtLVyHOvRsMnoIKxMU1bNBPg2j2suzDjNymqGjN6xJcSykbjiNmqjVauo4E9P
+y/7Glq7PpBxYdq6s1vQMkjFluqKVl1tq7bS910NMDnc+nansyxLXxD4ygKZk4Cnq
+EvzCDyV2JaBgaFmiOyIfhnVWmOveEbY6Q793FQSW
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp

new file mode 100644 (file)

index 0000000..2b50eed

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp.pem b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp.pem

new file mode 100644 (file)

index 0000000..8322ab0
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp.pem
@@ -0,0 +1,33 @@
+OCSP Response Information:
+       Response Status: Successful
+       Response Type: Basic OCSP Response
+       Version: 1
+       Responder ID: CN=clica CA rsa,O=example.org
+       Produced At: Thu Nov 01 12:35:49 UTC 2012
+       Responses:
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 6f5e8a1d1ee7f7b156e14e5f256318f0f2ef31c7440c12d789b0b3cc9f1224da
+                       Issuer Key Hash: 0c8b9b6aa3fcb4ad014f1d4ee22cfb498e6958fb2c33505ece667721a41633ba
+                       Serial Number: 42
+               Certificate Status: revoked
+               Revocation time: Mon Feb 01 14:27:09 UTC 2010
+               This Update: Thu Nov 01 12:35:49 UTC 2012
+               Next Update: Tue Nov 01 12:35:49 UTC 2022
+       Extensions:
+       Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIICEQoBAKCCAgowggIGBgkrBgEFBQcwAQEEggH3MIIB8zCB3KEvMC0xFDASBgNV
+BAoTC2V4YW1wbGUub3JnMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTIxMTAx
+MTIzNTQ5WjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCBvXoodHuf3sVbhTl8lYxjw
+8u8xx0QMEteJsLPMnxIk2gQgDIubaqP8tK0BTx1O4iz7SY5pWPssM1BezmZ3IaQW
+M7oCAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTIxMTAxMTIzNTQ5WqAR
+GA8yMDIyMTEwMTEyMzU0OVowDQYJKoZIhvcNAQELBQADggEBADJzxf0cq4PlTANI
+96D3dQhmee7YscHlMjsDKuCWuZrsbEid6kbAYHGFYGNhoh/1I+s1qFj/kgy/I9a3
+XsaGZUQUQj7FqLLiIVbpexhfk7Cgo8DXjXkB/vlviEjXlzO2IaKA1esTTB7nIx/G
+PyRQ2wI5Zv/2k+liGWi0rGtegJC/Ia5F4XW5q73QqVBJXhvtFjgLZeVIcUGQR/eQ
+TY7mb+UwY6Stf5ixumc1HFoIo+2jY5gQSsJpTetWsNReq3trqFQjkw6OHQFKRzDF
+oVkdwthV4hboYy64ZATsxfiRkJlVHzWbIhN+HXt41G6fSryqQCYQtEkCe4fGsHOZ
+JlAIm30=
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.org/CA/Signer.p12

index e6727370b7ffbca6e75e087794575af8bc64c955..81681c352af96207fe283b7c9a2fb031194bfeaa 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/CA/Signer.p12 and b/test/aux-fixed/exim-ca/example.org/CA/Signer.p12 differ
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 ac19bee10af70f768a31d578fcb1af20f546ab0e..073d378e1db8625dcf4f6ca5ca7d3273c718363e 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
@@ -1,19 +1,19 @@
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 046f055d137e01e03326094ad5064ccac51896b6..800e1c61a9347abfd610b53337308489a8194160 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
@@ -1,18 +1,18 @@
  ; Config::Simple 4.59
-; Thu Nov  1 12:40:24 2012
-
-[CA]
-subject=clica CA
-name=Certificate Authority rsa
-org=example.org
-bits=2048
+; Thu Nov  1 12:34:57 2012
  
  [CLICA]
+signer=Signing Cert rsa
+level=1
  ocsp_url=http://oscp.example.org/
-crl_url=http://crl.example.org/latest.crl
  ocsp_signer=OCSP Signer rsa
  sighash=SHA256
-level=1
-signer=Signing Cert rsa
+crl_url=http://crl.example.org/latest.crl
+
+[CA]
+bits=2048
+name=Certificate Authority rsa
+subject=clica CA
+org=example.org
  
  
diff --git a/test/aux-fixed/exim-ca/example.org/CA/cert9.db b/test/aux-fixed/exim-ca/example.org/CA/cert9.db

new file mode 100644 (file)

index 0000000..7acbf3e

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/CA/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer

index 98861858b199914f17bb22164260adfae4bdaaf9..c6fb5bee2b91ecbb1d3804d14571c5084a3d2d01 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer and b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.in.txt

index ab7d7b073f1311e92c7d7af5aaabf263cdfb9437..7baa9aea2a813fdfec9f680e0168dbbe3040a496 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.in.txt
@@ -1 +1 @@
-update=20181127215819Z 
+update=20210604172341Z 
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.pem

index 4c268f5f9f0b1a207fea15ae9b971672e5b928ff..216faee97ed6beb3f93e4cb372b668c1a6caf0e4 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.pem
@@ -1,10 +1,10 @@
  -----BEGIN X509 CRL-----
  MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTgxMTI3MjE1ODE5WjANBgkqhkiG
-9w0BAQsFAAOCAQEAZNuqljjk01PdhqpTF/Y5ZOC6N9JHaqloDF7744k5uRC/9I1r
-gJHSQzVCwJMmS94Cbdyc157wDUOx1IqNm6EEH9xUH+ev93kjBqMa9o4NZbNyrJox
-OQ2voGK0bA0/KLux40k9zE31/B6q6njD07m909AOAxYoQ4U8jrf5M4MOfYfKcfFn
-4zyZhZG89QyeJXrrKKfhF1La4qfN2an92Qr6jGphjziodit1pKzxWr2oQCokk7WJ
-xj9+qPYm3I52X+863ORp8YqosFZ7lZ1AMT6z8oGlvjv2RS5ub6TyRJ6DjrrrQxnc
-WHkoJpn6506KRgU+HUuSP/fIq5CMqjv5BOHP7A==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjEwNjA0MTcyMzQxWjANBgkqhkiG
+9w0BAQsFAAOCAQEAnKFwjzYovN7a6/VmyLvhXrLCnIPEvTaQrY4mB3K1Flb23E2E
+v+IH4KEzFGdKuT9qNN/pk2O0y96j01H9zQ+RN7XwayvAr15wxkSqxLDAlaxU2rOY
+M6Fuo1FjiQQndTDtctfYRXdMnoXdFNPpx0XokH/VxvGZcsDkMiKu8+AzbuERBiMJ
+IKwsGrvsPt6w4Hl2ga/oibzECH6egcHIkvewvqTRYob7k8p0MAeJb85lnM58R5fF
+z3J85YmGdK+lvGIqfMfng4PHBvETv4dc8TYAZNalizSggMldfm7XQuQFETV+SoW8
+6EOTNIpNa4KEj4CFkZgjH1+M4OKSdgAaSE2FkA==
  -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.chain.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.chain.pem

new file mode 100644 (file)

index 0000000..179f4f7
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.chain.pem
@@ -0,0 +1,21 @@
+-----BEGIN X509 CRL-----
+MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUub3Jn
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjEwNjA0MTcyMzQxWjANBgkqhkiG
+9w0BAQsFAAOCAQEAnKFwjzYovN7a6/VmyLvhXrLCnIPEvTaQrY4mB3K1Flb23E2E
+v+IH4KEzFGdKuT9qNN/pk2O0y96j01H9zQ+RN7XwayvAr15wxkSqxLDAlaxU2rOY
+M6Fuo1FjiQQndTDtctfYRXdMnoXdFNPpx0XokH/VxvGZcsDkMiKu8+AzbuERBiMJ
+IKwsGrvsPt6w4Hl2ga/oibzECH6egcHIkvewvqTRYob7k8p0MAeJb85lnM58R5fF
+z3J85YmGdK+lvGIqfMfng4PHBvETv4dc8TYAZNalizSggMldfm7XQuQFETV+SoW8
+6EOTNIpNa4KEj4CFkZgjH1+M4OKSdgAaSE2FkA==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm9y
+ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMTA2MDQxNzIz
+NDFaMC0wFAIBZhgPMjAyMTA2MDQxNzIzNDFaMBUCAgDKGA8yMDIxMDYwNDE3MjM0
+MVowDQYJKoZIhvcNAQELBQADggEBAMTYOZSo/MGQ2gWG/PqYXRhCCoxwUvDwQNOb
+tjlkuzrIHWCMTZH+l00SNGHg2zoFehafsKmawHanIpE8gGN0bD+SAgrojVZxbOmW
+3caxGm0iU9GCzjzyxxeBkhSOn9dy9OtI8kOLGse26Jq7NPdcGN/rSnLb9K+f9jDy
+JIjemf7TdGuSuwgEYuH+mbRYhxs4He7GTMIz4Isc1TYN2JBccnhYHdIZEL65xe5p
+vkEofp8abqua5ZhPjbMWaF5Gf7S/dJOYxqGBvs+W0gUdZJJGB77iSE5eZs7hjq38
+QE6h/ZOdn4QSiaTgbvDUAxUfH6PWI2Py5J4EYUFd9PQGh6u0pGA=
+-----END X509 CRL-----
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 13d174520eb2359b1a50f602e5f9fc95131b0ad0..b9443c51a0deaf14fb94d464f70e04a9f63da446 100644 (file)

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 ebd4a952d128d35af102efa42e24862fea91fefd..d6a7ec83634bfceb26aa201ca0db9f3901b2e7ce 100644 (file)
--- 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=20181127215817Z 
+update=20210603224937Z 
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 66c46a7b5ce73e3d5d78311b4e75f2502e60f566..26d034223eb0eefd0122bea0293b61f9ba5702ce 100644 (file)
--- 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,10 +1,10 @@
  -----BEGIN X509 CRL-----
  MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE4MTEyNzIxNTgx
-N1owDQYJKoZIhvcNAQELBQADggEBAMZoBv3Ok7lA2iRRDUvOYxZ+l9vWQ3qzVPaW
-MTXk/FLsZCMbUHRI0lowUraJO9i93si/KgdyuOTjdjktKf6tvp23u7F2fgFWTQ5q
-lxJRt5Hn0jDKWXB2pRbfY1H2TdC2vvLlyyLiVcBVrgrigqeP5hmLF4QqfD/G11Ea
-ob65NF+eeRCmT7KK/GQYl6ck5HkBjjDawGvRocd1Q4MV5MU6hq5yCOu4mPCkb4PO
-lMEutae0L4hHs9YXjcjX8evmMLBC+z0MjhhX8wlYOedmJDJ5WChjm8pQzLYaKcn4
-lRU4t3WlJx6+FabB6zL7sHn1jClfZM6MPVIk5ggBXBCvTln0G64=
+MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDIxMDYwMzIyNDkz
+N1owDQYJKoZIhvcNAQELBQADggEBAJndvtrPS5PAu5bupW1rpHfQTT/85b0ZoiXo
+ib43Udktltlcd7KoFvnjNBM298apvCzz7I5Yc6en3vKVIX8g3fAc3Ga6s5PmyuGB
+M8lGaNTKaX1QI+dsHRVqsUxL4PEWO/DPu6U88kAS283q3UlLq0T2raMF7KIgWRuo
+iSwYIyNFNO1S77I3v9DccB7F+Nxe2YYMIGQok/+zvodWhDqCVFY/Iblp2CA8O6c3
+F3HVrG4R0640xM5S6sZhcWcXYYzeRxF580/BY+mJYByPmt7iIcmLx54/OGas12VS
+fHuDlBz/EEPdDAsIoNpAIkOTbpSvOa9ZGSGbQPaHWVmfXfmy96U=
  -----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 90157a148390fed8d93e785db7fd5fe78c85a1ad..0fae09e66ea27742bd02a25cbf21f08520a87df2 100644 (file)

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 e47bb50ebd280b4c19877e838b01e842647686bf..16a6076481bd307895a66e2352674cfc666fd0ba 100644 (file)
--- 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=20181127215819Z 
-addcert 102 20181127215819Z
-addcert 202 20181127215819Z
+update=20210604172341Z 
+addcert 102 20210604172341Z
+addcert 202 20210604172341Z
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 4747ec82412f2d08f25e8303caf5b3079697de82..16056e16dd1c2174b8f64c30a6afdc0d86b16705 100644 (file)
--- 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,11 +1,11 @@
  -----BEGIN X509 CRL-----
  MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm9y
-ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxODExMjcyMTU4
-MTlaMC0wFAIBZhgPMjAxODExMjcyMTU4MTlaMBUCAgDKGA8yMDE4MTEyNzIxNTgx
-OVowDQYJKoZIhvcNAQELBQADggEBAHKs7D3m2UlGFx/s9cqLmjz/yM7tABD9Tq94
-an1VWmAWWBvJYRlvuuP8BE8ujxO4LzKBfUzAEngYZsk89sqXjsNHW/bEp9ZSxsqo
-+O5mUnvfu9QYdqvJoc1ju5eRiK5hpd7HFWtG3r47PVIzBVlOyNwrbbeOrVrDoXFt
-PvfRkj/bdiWGUDX9EbMxwKsZPYA080H+n+uW/Wg1Ml8UNZODRRSpeqHWbnMumzCj
-KUyW7X8s/k66HNdyYuXQY0cH1J1ke2x5HtmkIna/N2spLDJidfhd79PIzuP9nnSN
-lgEvq+qocq74D6UaKzDVb1c18Av9+NVNXahvaZh3ZzzxykqM7Co=
+ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMTA2MDQxNzIz
+NDFaMC0wFAIBZhgPMjAyMTA2MDQxNzIzNDFaMBUCAgDKGA8yMDIxMDYwNDE3MjM0
+MVowDQYJKoZIhvcNAQELBQADggEBAMTYOZSo/MGQ2gWG/PqYXRhCCoxwUvDwQNOb
+tjlkuzrIHWCMTZH+l00SNGHg2zoFehafsKmawHanIpE8gGN0bD+SAgrojVZxbOmW
+3caxGm0iU9GCzjzyxxeBkhSOn9dy9OtI8kOLGse26Jq7NPdcGN/rSnLb9K+f9jDy
+JIjemf7TdGuSuwgEYuH+mbRYhxs4He7GTMIz4Isc1TYN2JBccnhYHdIZEL65xe5p
+vkEofp8abqua5ZhPjbMWaF5Gf7S/dJOYxqGBvs+W0gUdZJJGB77iSE5eZs7hjq38
+QE6h/ZOdn4QSiaTgbvDUAxUfH6PWI2Py5J4EYUFd9PQGh6u0pGA=
  -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/index.revoked.txt b/test/aux-fixed/exim-ca/example.org/CA/index.revoked.txt

index 8c67708d8d697e88b5d67ff4554eee0f65f829ce..59fcbbb4fad18a2fcb1e81ae64a313aec72e4987 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/index.revoked.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/index.revoked.txt
@@ -4,3 +4,4 @@ R       130110200751Z   100201142709Z,superseded        67      unknown CN=expired1.example.org
  R      130110200751Z   100201142709Z,superseded        c9      unknown CN=server2.example.org
  R      130110200751Z   100201142709Z,superseded        ca      unknown CN=revoked2.example.org
  R      130110200751Z   100201142709Z,superseded        cb      unknown CN=expired2.example.org
+R      130110200751Z   100201142709Z,superseded        42      unknown CN=clica Signing Cert rsa
diff --git a/test/aux-fixed/exim-ca/example.org/CA/index.valid.txt b/test/aux-fixed/exim-ca/example.org/CA/index.valid.txt

index c8fd76ee883ad7f5804a2e9dd5a53dee8cd19116..5cf6ab4d846d3bb0d1282e3f5b89779a9b904297 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/index.valid.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/index.valid.txt
@@ -4,3 +4,5 @@ V       130110200751Z           67      unknown CN=expired1.example.org
  V      130110200751Z           c9      unknown CN=server2.example.org
  V      130110200751Z           ca      unknown CN=revoked2.example.org
  V      130110200751Z           cb      unknown CN=expired2.example.org
+V      130110200751Z           42      unknown CN=clica Signing Cert rsa
+V      130110200751Z           41      unknown CN=clica CA rsa
diff --git a/test/aux-fixed/exim-ca/example.org/CA/key4.db b/test/aux-fixed/exim-ca/example.org/CA/key4.db

new file mode 100644 (file)

index 0000000..df68956

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/CA/key4.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 8ced64b3967b0252289cc4c5fc1abce5680eda79..c2453b869c6cca43f639dffc93f158bcf6ca1b7f 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.org/CA/noise.file
@@ -4,11 +4,11 @@ cpu family    : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.013
+microcode      : 0xe2
+cpu MHz                : 2700.000
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 0
  cpu cores      : 4
  apicid         : 0
@@ -17,9 +17,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -31,11 +32,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.112
+microcode      : 0xe2
+cpu MHz                : 3312.397
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 1
  cpu cores      : 4
  apicid         : 2
@@ -44,9 +45,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -58,11 +60,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.215
+microcode      : 0xe2
+cpu MHz                : 2700.000
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 2
  cpu cores      : 4
  apicid         : 4
@@ -71,9 +73,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -85,11 +88,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.123
+microcode      : 0xe2
+cpu MHz                : 3277.369
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 3
  cpu cores      : 4
  apicid         : 6
@@ -98,201 +101,94 @@ fpu               : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
  power management:
  
-processor      : 4
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.295
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 0
-cpu cores      : 4
-apicid         : 1
-initial apicid : 1
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 5
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.348
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 1
-cpu cores      : 4
-apicid         : 3
-initial apicid : 3
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 6
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1600.078
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 2
-cpu cores      : 4
-apicid         : 5
-initial apicid : 5
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 7
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1601.723
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 3
-cpu cores      : 4
-apicid         : 7
-initial apicid : 7
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-            CPU0       CPU1       CPU2       CPU3       CPU4       CPU5       CPU6       CPU7       
-   0:         23          0          0          0          0          0          0          0  IR-IO-APIC    2-edge      timer
-   1:          0          0          0          0          0      20849          0          0  IR-IO-APIC    1-edge      i8042
-   8:          0          0          0          0          0          0          1          0  IR-IO-APIC    8-edge      rtc0
-   9:          0      17211          0          0          0          0          0          0  IR-IO-APIC    9-fasteoi   acpi
-  12:          0          0          0          0     975537          0          0          0  IR-IO-APIC   12-edge      i8042
-  16:          0          0          0          0          0          1          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
- 120:          0          0          0          0          0          0          0          0  DMAR-MSI    0-edge      dmar0
- 121:          0          0          0          0          0          0          0          0  DMAR-MSI    1-edge      dmar1
- 122:          0          0      30204     284174          0          0          0          0  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
- 123:          0          0          0         54          0          0          0          0  IR-PCI-MSI 327680-edge      xhci_hcd
- 124:          0          0          0          0          0          0          0        459  IR-PCI-MSI 2097152-edge      rtsx_pci
- 125:          0        168          0          0          0          0          0      60654  IR-PCI-MSI 520192-edge      enp0s31f6
- 126:          0          0       3771          0          0          0     455167          0  IR-PCI-MSI 32768-edge      i915
- 127:          0          0          0         18          0          0          0          0  IR-PCI-MSI 1048576-edge      nvkm
- 128:          0          0          0          0         52          0          0          0  IR-PCI-MSI 360448-edge      mei_me
- 129:          0          0          0          0          0          0         45          0  IR-PCI-MSI 1572864-edge      iwlwifi
- 130:          0          0          0          0          0          0          0        636  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
- NMI:         15         14         14         16         16         13         15         13   Non-maskable interrupts
- LOC:     905212     930597     932722     977823    1028907     895142     955127     935727   Local timer interrupts
- SPU:          0          0          0          0          0          0          0          0   Spurious interrupts
- PMI:         15         14         14         16         16         13         15         13   Performance monitoring interrupts
- IWI:          0          0          0          0          3          0          1          0   IRQ work interrupts
- RTR:          4          0          0          0          0          0          0          0   APIC ICR read retries
- RES:     241612      92765      40077      24283      17690      13138      11647      11179   Rescheduling interrupts
- CAL:      33817      31808      33649      32783      33546      33493      32109      32390   Function call interrupts
- TLB:      16415      15608      17436      17662      21126      17152      16593      16539   TLB shootdowns
- TRM:          0          0          0          0          0          0          0          0   Thermal event interrupts
- THR:          0          0          0          0          0          0          0          0   Threshold APIC interrupts
- DFR:          0          0          0          0          0          0          0          0   Deferred Error APIC interrupts
- MCE:          0          0          0          0          0          0          0          0   Machine check exceptions
- MCP:         29         30         30         30         30         30         30         30   Machine check polls
- HYP:          0          0          0          0          0          0          0          0   Hypervisor callback interrupts
- HRE:          0          0          0          0          0          0          0          0   Hyper-V reenlightenment interrupts
- HVS:          0          0          0          0          0          0          0          0   Hyper-V stimer0 interrupts
+            CPU0       CPU1       CPU2       CPU3       
+   0:         16          0          0          0  IR-IO-APIC    2-edge      timer
+   1:       6463          0          0        413  IR-IO-APIC    1-edge      i8042
+   8:          1          0          0          0  IR-IO-APIC    8-edge      rtc0
+   9:      10105       6724          0          0  IR-IO-APIC    9-fasteoi   acpi
+  12:    1604003          0     508743          0  IR-IO-APIC   12-edge      i8042
+  16:          1          3          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
+ 120:          0          0          0          0  DMAR-MSI    0-edge      dmar0
+ 121:          0          0          0          0  DMAR-MSI    1-edge      dmar1
+ 126:        930          0          0     329821  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
+ 127:          0          7          0         16  IR-PCI-MSI 327680-edge      xhci_hcd
+ 128:         38        174          0          0  IR-PCI-MSI 2097152-edge      rtsx_pci
+ 129:          0         39          0          0  IR-PCI-MSI 360448-edge      mei_me
+ 130:         28          0          0          5  IR-PCI-MSI 1048576-edge      nvkm
+ 131:    1341154          0     395394          0  IR-PCI-MSI 32768-edge      i915
+ 132:          0        104          0          0  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
+ 133:          0       2668          7          0  IR-PCI-MSI 520192-edge      enp0s31f6
+ 134:        995      71213          0     120012  IR-PCI-MSI 1572864-edge      iwlwifi
+ NMI:         95        103         96         86   Non-maskable interrupts
+ LOC:    4548765    3913288    3632616    3476684   Local timer interrupts
+ SPU:          0          0          0          0   Spurious interrupts
+ PMI:         95        103         96         86   Performance monitoring interrupts
+ IWI:     623824      44368     237219      44336   IRQ work interrupts
+ RTR:          0          0          0          0   APIC ICR read retries
+ RES:     196690     198643     184345     176787   Rescheduling interrupts
+ CAL:     483424     477394     458522     487889   Function call interrupts
+ TLB:     782085     815197     818912     831361   TLB shootdowns
+ TRM:          0          0          0          0   Thermal event interrupts
+ THR:          0          0          0          0   Threshold APIC interrupts
+ DFR:          0          0          0          0   Deferred Error APIC interrupts
+ MCE:          0          0          0          0   Machine check exceptions
+ MCP:         29         30         30         30   Machine check polls
   ERR:          0
   MIS:          0
- PIN:          0          0          0          0          0          0          0          0   Posted-interrupt notification event
- NPI:          0          0          0          0          0          0          0          0   Nested posted-interrupt event
- PIW:          0          0          0          0          0          0          0          0   Posted-interrupt wakeup event
-MemTotal:       16284452 kB
-MemFree:        10022420 kB
-MemAvailable:   13200564 kB
-Buffers:          262860 kB
-Cached:          3327644 kB
+ PIN:          0          0          0          0   Posted-interrupt notification event
+ NPI:          0          0          0          0   Nested posted-interrupt event
+ PIW:          0          0          0          0   Posted-interrupt wakeup event
+MemTotal:       16247944 kB
+MemFree:         5675212 kB
+MemAvailable:   12669192 kB
+Buffers:          535912 kB
+Cached:          6970488 kB
  SwapCached:            0 kB
-Active:          3258808 kB
-Inactive:        2457468 kB
-Active(anon):    2127484 kB
-Inactive(anon):   246404 kB
-Active(file):    1131324 kB
-Inactive(file):  2211064 kB
-Unevictable:          80 kB
-Mlocked:              80 kB
-SwapTotal:       8212476 kB
-SwapFree:        8212476 kB
-Dirty:               596 kB
-Writeback:             4 kB
-AnonPages:       2126080 kB
-Mapped:           481728 kB
-Shmem:            248108 kB
-Slab:             324564 kB
-SReclaimable:     173120 kB
-SUnreclaim:       151444 kB
-KernelStack:       10064 kB
-PageTables:        39656 kB
+Active:          3768900 kB
+Inactive:        5917532 kB
+Active(anon):       3080 kB
+Inactive(anon):  2694220 kB
+Active(file):    3765820 kB
+Inactive(file):  3223312 kB
+Unevictable:      283232 kB
+Mlocked:              48 kB
+SwapTotal:      12406776 kB
+SwapFree:       12406776 kB
+Dirty:               992 kB
+Writeback:             0 kB
+AnonPages:       2463288 kB
+Mapped:           709908 kB
+Shmem:            517252 kB
+KReclaimable:     342964 kB
+Slab:             449816 kB
+SReclaimable:     342964 kB
+SUnreclaim:       106852 kB
+KernelStack:       11632 kB
+PageTables:        29536 kB
  NFS_Unstable:          0 kB
  Bounce:                0 kB
  WritebackTmp:          0 kB
-CommitLimit:    16354700 kB
-Committed_AS:    6641128 kB
+CommitLimit:    20530748 kB
+Committed_AS:    6245664 kB
  VmallocTotal:   34359738367 kB
-VmallocUsed:           0 kB
+VmallocUsed:       56340 kB
  VmallocChunk:          0 kB
-Percpu:             4256 kB
+Percpu:             8800 kB
  HardwareCorrupted:     0 kB
-AnonHugePages:    806912 kB
+AnonHugePages:         0 kB
  ShmemHugePages:        0 kB
  ShmemPmdMapped:        0 kB
+FileHugePages:         0 kB
+FilePmdMapped:         0 kB
  CmaTotal:              0 kB
  CmaFree:               0 kB
  HugePages_Total:       0
@@ -301,14 +197,16 @@ HugePages_Rsvd:        0
  HugePages_Surp:        0
  Hugepagesize:       2048 kB
  Hugetlb:               0 kB
-DirectMap4k:      282088 kB
-DirectMap2M:     7968768 kB
-DirectMap1G:     9437184 kB
+DirectMap4k:      325096 kB
+DirectMap2M:     8974336 kB
+DirectMap1G:     8388608 kB
  Inter-|   Receive                                                |  Transmit
   face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed
- vnet0: 1155867    4102    0    0    0     0          0         0   958956   10286    0    0    0     0       0          0
-wlp3s0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-virbr0: 1098439    4102    0    0    0     0          0         0   735824    6022    0    0    0     0       0          0
-    lo: 7421470   45918    0    0    0     0          0         0  7421470   45918    0    0    0     0       0          0
+    lo:  756253    7241    0    0    0     0          0         0   756253    7241    0    0    0     0       0          0
+enp0s31f6:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+wlp3s0: 128921388  122329    0    0    0     0          0         0 19207529  102298    0    0    0     0       0          0
+virbr2:  442398    6834    0    0    0     0          0        16 17312033   12683    0    0    0     0       0          0
+virbr2-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+virbr0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
  virbr0-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-enp0s31f6: 39251323   34779    0    0    0     0          0         0  5044761   25668    0    0    0     0       0          0
+tun_wiz: 76294239   78312    0    0    0     0          0         0  7292752   68009    0    0    0     0       0          0
diff --git a/test/aux-fixed/exim-ca/example.org/CA/pkcs11.txt b/test/aux-fixed/exim-ca/example.org/CA/pkcs11.txt

new file mode 100644 (file)

index 0000000..4a30b48
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/CA/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='CA' 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})
+
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 dd4b26270282c193d1ab288544c4c3ac58dbcab2..fde8b84403a32f0e3fe624e8c870e1d1de06586f 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.org/CN=clica Signing Cert rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica Signing Cert rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
-DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+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
-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
+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
-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
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.org/CN=clica CA rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica CA rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-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
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQ1N1oX
+DTM4MDEwMTEyMzQ1N1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7Z
+0JJrUhfkdnD1fyhfBhG1u+2TFTHPkTwPh0/ktT7R4M+B3nJyWRjSBAgUgGN5QsCd
+FQIS/6yCp9HPhieHhnSeB8WkG7HKezv47PNys908KbMh6EZ16GgPQnFbbEb6laQg
+5V5mcRF3p8z5vaIwaHIjW6kvs692ne/gUCh5Xu0dVk/EUmdTeMQSQBRfZHDb17gQ
+aOXluwVhPL2YJbjrQNjKTAhDyEleYNNSnITwq4thFbspJ48G+S+n4/Xi89TRj8jB
+OJAP9PuRbnXevfMeLvqo3N/UNJRmUO3O/dU6RFQw9ib0L3tsWznud8Y0EtN40tBC
+qrHCp2kEEnkOoq8ry/ECAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAvLWPfh92+Dqk69bWz6qYkJ
+kNR3y9mWjrzIMPVwKV2RPoITmpUE7bW9S8OfaoZr4Ouv7V/IxcyHf8ub1m/obe6j
+V4zWHMFNFH1StEysZ3G7vVMc+uNy4NulCNspl2dSORYYlOL7ZqwMoKGwMfVb9zhN
+qPPROP5j/LWv2caKjjUCxZaQM155CFfEuZCKfvpLpDXqwIPqNj7+JJ9+XMm3xu/5
+Y+zINWXdz8BetjxWwhfdR5xrrYncPNkHNBZFBceVkW+X/WMC3zplOWn7EsGceS6S
++fyQTXSaOJjTm2a/N6No1y6L/Hb33VP3Gole1MHfbiihlHcFy+cUzSInWWKzy0o=
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.db

new file mode 100644 (file)

index 0000000..6fc358a

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.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 2517779413e17261adcab92e2eac1503e641887f..89e163706a97452ff771e560ef0746c49823887b 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: expired1.example.org
-    localKeyID: 94 15 DB 8E 03 54 E1 54 D1 ED F2 D2 11 37 0C 18 DC 2E 3A 80 
-subject=/CN=expired1.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 95 8A 66 56 36 5B E8 5B AD AD 56 E0 7A 9C 79 EB 73 28 DA 53 
+subject=CN = expired1.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQwNDFaFw0xMjEyMDExMjQwNDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3V6fGZt
-Cte/MtenrBWVY0P7bvIHtQd1IdV5i4zMzQQRNvfxquyfPQ6j9eB7z8ZjIT59n5Kp
-Awcc5Japm4M7ug5qv2tjRTwLm+iCJkmjsw8LW7EtFV8EpG7qjpsJmieKjzEb2Ann
-o2cZ28h4XAc/8t6RURPw5vwfL+bEhLnvqIeow/e8jiI9jg4g2Yb8VYJmIQzGpW/5
-UbUl54ApjsAnSMK49Ie/TEOBNKLlODgb9mO/R5l5W6f7fH3Uf/zL5qZzjC8W19bZ
-trgcAE7+qnmHt/uaeLuxMlDHbRaiMwNvxshW6EzWk9qexA2FlMlHpgZZUn1rScws
-zZP1YTo4Lt9fVwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1MTZaFw0xMjEyMDExMjM1MTZaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6omY6T5E
+jSRk3U6243r11jm1b5pn5Ll6o5IBHeJ+9Iff00tKCA7Ljwg3xIrqoKWUzvBwr7Yp
+MJ8dh1U9dNteY+V8vDACQ5BGADoEapNEchkOLsE2Qu3PLLqOnXJmxZYg8lwewqc8
+IPuXu8ssHpmd9oIOBh/JX/MXY5hug0KXnlWtga9THVL63888tsLSHNMlhrMyCCH2
+moSF9tIz3x+IMVuY0e0We4s2xqu5EAR53Y2QxQzNs8SCbKEFxcW4Uh7xmSYqwKvM
+yYO/mPogxzVfJmvCDl6tRrLWnRatEDbP6xCyOjfuu/iOIPIBpNl4+dct/RslOsBZ
+1ZzX8XX9JtqBuwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQCfNdixAikrewya
-LgT7Yc3nsOvZ7QRQaI3e1IRvjDnGqNhMmKcEf+q6vqKBTfBnEScphkZuBX8rI1Fw
-/EpbtmsI74bZc+koYWx/JeHuD/yOW18LNu5KosLhUT/hVtGd10IrUF7Re2wgQ9K3
-xx4Vl98h/4DKZ7PqOtdoxoVI0W6xi8vX2F0oKOCHxMpT5MkeZjNIXESTFlHR1j5v
-N037HQ9s3sCSLzfGGIt3s2D6ZX0HInE1EivFr45Eh+X94epPfuU06ywe2ZGwgjhu
-qqbPHrxtAyfB8LxwKRFdB9nuleo7rMnO2M4ASPm/P8FDDkhCb1ELQ48cs6wjOfqr
-C1NJBtzb
+cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBNfVcQzpbGeWp4
+ePOiLY9uQLiP/e1f78+bIJiPrBbQyK5xgOZqmZH9B/jvPHGZv9napo6PaIO2RwrB
+pIM/jEQLpfXbky4p5FBixUtIW6mpRwrZcVqEcS/RYD7V0WDNDv0VeuoE52Pu5qW7
+Y0DQAytiQLbeY4KycTMbpgK/EVy5jCnW3CMIOrhfsyUFgxE0lRqIj1HPsUWdxkmB
+1bB/iryA+ky0sbJY8gKw3pgEMyMQjcqDyDuhxyg2TkZk/Dzju9phaZ9ZYRMXt/d/
+wlJRl9Yv+72cWQqrZFx2cUCsgvdqCw9U2q1OTIRkXTyzOmjCflIkeU68CokwPAL9
+9Fo7Tj60
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 e0677f6c8f2853c873a54218e6275e8d974c333b..5f94002bf843488d5a2a05897b4a60ae624159a9 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: expired1.example.org
-    localKeyID: 94 15 DB 8E 03 54 E1 54 D1 ED F2 D2 11 37 0C 18 DC 2E 3A 80 
+    localKeyID: 95 8A 66 56 36 5B E8 5B AD AD 56 E0 7A 9C 79 EB 73 28 DA 53 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsGeNmikEOicCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDY2X1eV1aLyBIIEyE1GkyeULy/1
-/UiCnBhf9vYX1iOSFVkY2Y4PNXdEZ6wqWWYVCZRhLsHEF63uMmNdNk86ctyHx5O2
-KjJscjYVCcSYF7H9CSgJwp9siwUaMlUbTnTGs8F6PLTrXHShYinlrOrhT2+het67
-4lK1V+oUFXqgBLicTJRtOMnB+v8gZCLGs83sV6ol6neHf0KGmNx2KoLbxhElLCVT
-9EncRv9/3iunLY5e8sJ6TNVKx7mM38EVShbQ7LN7aaxeejSFCfX9SoExNnHdMECX
-EWLf/8Cbai/+wkFZU1XpBGV6o6Xk+6MXTGDL2OWkhwxNqVUFkyJvGuC+4Q0USTX9
-isT2qS3r7bpLsCixcqhx0yeHeALjzMyQ1vjmogTusRo5cV1yRZr59oNhWFjXJlxz
-Mk2MI3kEgWSVU6BaFwg/xuVJEBCfyqwiZJZhPJD9KsIy3kE7L2Lpojt0FO1g7cv1
-fUMm42bPIyTbeFVDD36c1wZVFc1oNMsL4zRCnZn2PAxeMOVqRZS2qCCybf/LjLk5
-j96EpIJboe5QiBOjbCh/3843dabFifUxd3zQBUtuNeWUo6vzh/1W+VWJT9YzAv3C
-UDrn4YAtAtjpT15wmLyk183bTphFunm0y0eKejn8rKdCXEix/Gv9VsxZoyTGo77V
-bOwITlo8LK4nAq+BY0C7c80NCb5+Oba3x48HvctT5dOkOVS2pNPIkv++zW0TvBzn
-dfFnPT4PVaSFZ7U1aCw+PbcpMf/w0nG3uPsr5pOCcaI3dfs33UvKo/bCQOY/h92U
-bdKn4uCMKnmSby6wB0Jwo3y3P6j+hsR7HPl9XZ3+4jZSM+/RE2Yq3oXrTo672Buf
-Si7neoFT9F8vy9Mj3EM9mHe/Fl896o+XZOWDFwdy74OBCBBYJlElDoPRlq8UarRq
-GZ6sJoREUiPGIpKVhppPPf/1r5d9277QL4ys8TAOiNuFtH2UYU8k5qj1kwGmsdd2
-Avy2t9QF27k4HJbhgbga8whetUm8v3m6/M9H7DnmIpLF9IlKZMlY4pj19Tq61ktv
-oI4MGlWL/PAYExGv8GMxHluPRIEvv0sm4CNB7jwyTtlzAxZORuM9XFEWz5ys0x/o
-sVfNHfUr+Lsj43tDqu6qzFuWOOy84mLuRWh7JT0y4xLjnAAOChyU9EYZO2pU/DnA
-3St0HArEC8QZBdLGVD4lcCSOkrINsSbCIwMq6UjqhnG4PQ2ex3xTmwHV/Rq/OCcb
-eShsU5GExZ7XawO8E1NtkTRC//qJNh+Oef/qm6oEikC3NF6TubN5NsRphrCpCcCS
-tWwjjOmdWrB4rnedrGS1kAVD4JqglBe15Jw8xdFcPwsvgLc9GWKREu0Pe1no8qUz
-2cHEC943K1ezYZQoOOfZlGHjPOPEs8JsRCeQhjRmKxRvd0nHvUJHxA9Oy7NpvjCm
-bBc17A/0U4kAE1lK2ow910yJHvuvuA/CLUx/eDNm848dpSxSbVbyoYcG7NcNQMrq
-+BjOuqYiNP8t8F5ga/aRhRA5XAJZgL/y/Y7JUDA52y6vUKaEl4tmvHsmt4SeS0M0
-5IHP0BPQ3nX2RZbufskvSOVU+nHGwUwRB4feULhLzIaXnHkyLfohNx6L4KNdz50T
-EEaRJh2SXQ3Cc7clCyvDbQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIT5xvPmocKpoCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECM0aqy2y+KxqBIIEyFaVxC5kvw+R
+sVkYb1s/5B2khNtZqh6wRn+alJNecUspCUrwUkY6O8ffViz5APv/ltMJ7UGHD8aF
+fwXN56uAeeZdarDJoNCdGu6/KYNtPdaHtZnWxkJCaLvSetNbTlyf7jyS4iXydGGc
+Nss1NzpoPlsA1fbDJkhwzu5uHZV6r45/LWu9KrOLOXRAIeT2nxfswpfcDcuFaSZm
++1akFJbTyOlOhSVs+bn8Vf1wOw8NVjk98v9vbdSyTVTfqa9OEId0ICryouCvvJsI
+YsIt87rjutd49Xc7rERBiaaX1Guvz0DWPYcV5yN0Lkowhgak82M3cyucLMmxz7mK
+dh/UIXRAbo2z9Ybt9WNjkSyKTko/UKLVkjfzVKhiKW35B2JY4u6dtHQ1sm2WYSKI
+fKNsyI5Uk2qMihCGfzwz2Bf57VQwBrNy2gSJbQoCPO/2mN+w4g1Vdw3VNbdh15sH
+BnqRJS0bZYYJ7v9sB6vrGVw4U8CZDrZFTjsfSo5e5G1Z5HueXGQIoQncAFFbK9ev
+t9UbnvMJoBnURvbV19D3V+h009V9Xao5QbFtq8Mj3m/k8ui6PaQQQpAwokK13FSF
+H4ThlFxOQdHmhEp0l3KwSqpIhy9WFShr7feQcgk9zkHGd/Oj9ZSPMaF6yVwp3JBY
+U7NVTcO4MDkxT+TLV/rItnU2LVWvFUsa2VWDxmPFlNcWcJFEn1I54uJ8n/aPADh8
+GsIu7bPLvXnMrHfYLzAXIc9y+2s8U2dSYDerWqI2anpO/wvZqlPZ/0Yhyd793b0k
+yUqdBVrV9luwxCx2mohm7XxEQ/c2+YNOlpVnIZZmDL/B40y9VrlXWhO3U84y5bkU
+jwJo9uIY3lgjUwpkNzqarbjhJBR5NeofBg8kl8JnMhogRTWJQzXkr76SkJy6oEp3
+Y1l7ig8Cc0RR9XbYN1EnL3KN10hn647EQL2MGEj06SSKdXleLXvoBMrXf9ZRkbIF
+/dOWlpLmzmv1OkOi0iAFcoI8JLphTAnzl8woBs1buADv47kjac448S0sOqiwifZq
+/ySd1OkAX2T2HwPDcE2rJKbHhhlcXxeeYqGVv+iyLXkxidcZSoJZeskQQs5AjHXn
++RmZNL9B+DQRPzG5iyRLq/rJztXajDFg9IpgX/b3OZjDQvegnGOLBLyDtHtDxRm0
+a9BHoiFQJ/gUEZv4CoDdUx76nCS6XKDlo66p1bt5CFsrKdWB7napW4pOLpCjMVZ4
+d5t+Skvk6YlnoGOMIwQ2IJ7ALWWaPh97PjGDV9D9MEqKMFQoECIx0a/f6dXJvPZ/
+7PhjZ+zU5tXvzjDge7gYk9RPFbAVOLRChr22OrTU+dwHbpJpKu6tZY3kdipPE7+C
+jWdy0JGSZFyujZfmX7RfAMQZBz065RLeLjL4FXxCTmbpIytCdxFO1o6w8Y/Theei
+8icYgfFZlvMOIumABgi3+wT55firwo1YWNHEWnXhil6RD2e71Ki7ICj6Vljxw7r9
+w+wLnRWpaHjEFInWIwS5ejZ+HaoJUROAamhBrilqBrSb5YdCKMAjceBhZ6IismM+
+h1FwrM9fodx08psM5mvn0Tnq0Ls+of93aAb3zaPFmarYB0G9wpxF3F9DdYjRfKvF
+TZb5z89De8dztHdyjuqpgg==
  -----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 5a219d38e4a80e4287692bf3952c41cbea8e2f49..55661dcf04d1223666be896aa5304682d7008755 100644 (file)

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 77051733673854b67b01070fe30835cde4f5564a..70d12e6bb324961f30ab94355f1a54a58b17dd22 100644 (file)

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 f05610586a65cb95c4afe10ae70d4b310b1b01be..fceeb9c171702d8b61f11573cc1dd88701fb23e3 100644 (file)

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 28a4ce9676ccb515a70eb5b538b3c9311c191d4c..5959228bc01c33a0aa11bebbeae0194734fbb2bc 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp

index 2ca2f68f199897b0461c943563e6e14d22217ac4..08e7ceee4201b591d74baf5be8f03ab9b810bb1f 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp

index 33eb8f9ae1ad2ed4d374f078f1031992201a725a..d68db734ae7d7c05b9fc882fbef96d0c943e4fec 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp

index 0f33545deec29aae6f3eca4febec3ace55b15f9a..e3f67c704efb241eb2d35e4287e5c1862e4c468f 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp

index 4efe89e8ad7d9409d76ebfd1f8b8e37699d007af..26245b26dec261248c28687349725ef77ac0d723 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp

index ba0b2bf2c76f2ffd11053704847e77428d1ab984..2bfe488bdea7b4e669acd0c3c9a6ab539a8fe46d 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp

index 6c39e8606f9cddd688ca00e82ec8d9bccd538823..496727519044eeec09a03a99d09d03e2a046b5d8 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.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 c01c5f62fbffa93597bba583bd4db0b9a0d77f3f..d7fb38a544b6916f38068adfa1343c7bf4714ec9 100644 (file)

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 dd432c3f766e0273b8a2ea2ebe208a29be07a0ae..c452110685fbba8a09d4053f7760fb8c80456afa 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: expired1.example.org
-    localKeyID: 94 15 DB 8E 03 54 E1 54 D1 ED F2 D2 11 37 0C 18 DC 2E 3A 80 
-subject=/CN=expired1.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 95 8A 66 56 36 5B E8 5B AD AD 56 E0 7A 9C 79 EB 73 28 DA 53 
+subject=CN = expired1.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQwNDFaFw0xMjEyMDExMjQwNDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3V6fGZt
-Cte/MtenrBWVY0P7bvIHtQd1IdV5i4zMzQQRNvfxquyfPQ6j9eB7z8ZjIT59n5Kp
-Awcc5Japm4M7ug5qv2tjRTwLm+iCJkmjsw8LW7EtFV8EpG7qjpsJmieKjzEb2Ann
-o2cZ28h4XAc/8t6RURPw5vwfL+bEhLnvqIeow/e8jiI9jg4g2Yb8VYJmIQzGpW/5
-UbUl54ApjsAnSMK49Ie/TEOBNKLlODgb9mO/R5l5W6f7fH3Uf/zL5qZzjC8W19bZ
-trgcAE7+qnmHt/uaeLuxMlDHbRaiMwNvxshW6EzWk9qexA2FlMlHpgZZUn1rScws
-zZP1YTo4Lt9fVwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1MTZaFw0xMjEyMDExMjM1MTZaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6omY6T5E
+jSRk3U6243r11jm1b5pn5Ll6o5IBHeJ+9Iff00tKCA7Ljwg3xIrqoKWUzvBwr7Yp
+MJ8dh1U9dNteY+V8vDACQ5BGADoEapNEchkOLsE2Qu3PLLqOnXJmxZYg8lwewqc8
+IPuXu8ssHpmd9oIOBh/JX/MXY5hug0KXnlWtga9THVL63888tsLSHNMlhrMyCCH2
+moSF9tIz3x+IMVuY0e0We4s2xqu5EAR53Y2QxQzNs8SCbKEFxcW4Uh7xmSYqwKvM
+yYO/mPogxzVfJmvCDl6tRrLWnRatEDbP6xCyOjfuu/iOIPIBpNl4+dct/RslOsBZ
+1ZzX8XX9JtqBuwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQCfNdixAikrewya
-LgT7Yc3nsOvZ7QRQaI3e1IRvjDnGqNhMmKcEf+q6vqKBTfBnEScphkZuBX8rI1Fw
-/EpbtmsI74bZc+koYWx/JeHuD/yOW18LNu5KosLhUT/hVtGd10IrUF7Re2wgQ9K3
-xx4Vl98h/4DKZ7PqOtdoxoVI0W6xi8vX2F0oKOCHxMpT5MkeZjNIXESTFlHR1j5v
-N037HQ9s3sCSLzfGGIt3s2D6ZX0HInE1EivFr45Eh+X94epPfuU06ywe2ZGwgjhu
-qqbPHrxtAyfB8LxwKRFdB9nuleo7rMnO2M4ASPm/P8FDDkhCb1ELQ48cs6wjOfqr
-C1NJBtzb
+cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBNfVcQzpbGeWp4
+ePOiLY9uQLiP/e1f78+bIJiPrBbQyK5xgOZqmZH9B/jvPHGZv9napo6PaIO2RwrB
+pIM/jEQLpfXbky4p5FBixUtIW6mpRwrZcVqEcS/RYD7V0WDNDv0VeuoE52Pu5qW7
+Y0DQAytiQLbeY4KycTMbpgK/EVy5jCnW3CMIOrhfsyUFgxE0lRqIj1HPsUWdxkmB
+1bB/iryA+ky0sbJY8gKw3pgEMyMQjcqDyDuhxyg2TkZk/Dzju9phaZ9ZYRMXt/d/
+wlJRl9Yv+72cWQqrZFx2cUCsgvdqCw9U2q1OTIRkXTyzOmjCflIkeU68CokwPAL9
+9Fo7Tj60
  -----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 55aad4627eae0ef74dabe94dfd726aa676cc8664..ac912d24a1d03439b6a5929b19f82ac72d803255 100644 (file)
--- 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,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.org/expired1.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db

new file mode 100644 (file)

index 0000000..ede790e

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/pkcs11.txt b/test/aux-fixed/exim-ca/example.org/expired1.example.org/pkcs11.txt

new file mode 100644 (file)

index 0000000..3ebd973
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='expired1.example.org' 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})
+
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 dd4b26270282c193d1ab288544c4c3ac58dbcab2..fde8b84403a32f0e3fe624e8c870e1d1de06586f 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.org/CN=clica Signing Cert rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica Signing Cert rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQ1OVoX
+DTM4MDEwMTEyMzQ1OVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
  FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+ggEKAoIBAQDWnBT4P/2nkS55UmKN1d5JFOyNDjNqSa6k5nkbaZ4jle8VDI2GKxDb
+ojY6g31ZzmZD+yjFFSN3q7mKQgZdjuPLkuRGAzpCsOGk9u0tqEuQFD7FOoHPzi7d
+tpGdaSbkXYL91yfhwP09Er03g7raHx0sxAmgZul6rkxNZDTCTbPdXxgsb7sv+rNr
+y9pAkpO4cubV+AsFqtvPXGVCOjyUmBwir05ifQhHmMNvsARH4YnCGVOswLtnzD81
+bHuuVYdfiJtCSZWOJFE4fQAUi9GV4pfei3Uw4+fZiY1FL/lu2NOA3048Yxa1j7WS
+R0rnx88xphxUhrLZXjMrfhyny/GHMf4ZAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
  BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.org/CN=clica CA rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica CA rsa
+
+issuer=O = example.org, 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.org/expired2.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.db

new file mode 100644 (file)

index 0000000..5090764

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.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 29187bf7d6a8ced8fa3b99cd6e31a8eae7575099..a14a1a159d38cfaa751dd9b34142e2705f8447cf 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: expired2.example.org
-    localKeyID: 35 2D FE B3 39 C0 48 0D 38 09 21 5B 3D 85 22 E9 5B AD DD D7 
-subject=/CN=expired2.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 5E 0D A4 8A 7A B3 32 7B 67 E8 48 43 FD 1D 4C 7E 1D DA 20 3A 
+subject=CN = expired2.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDU1WhcNMTIxMjAxMTI0MDU1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOnIrMvi
-C7D5x/cms6bm57pkKtQYwIaG2d6wVZJ5B5gNsKbfbyjUkPzrsHDGR8b8z7zp4CWM
-7e/oyXqoDFC48Ollp/iZAcwn/Jaan6+Q8qlasfIPK5TV4ZSaHdFPdkwyBj2SQfhS
-QWiU+dEblCkH6nfSwb5mwU2XaJXs54AU3BSxw4/zXAq0lQO1pUY8kwI/xaQMptS4
-CQjukoc/DRUhPvdJB8D4S/dDiI/4bw3yRgrbLhB+80OezHrir4BBmcgH9dIvKTyb
-skH4O3fYD5ZiSYHqqebFGfKwf4GaaHtfcJ6zDXv4yMM8y/iorr8IHqFCZp5Y0EpH
-FaxzTI11wbIy06MCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNTM3WhcNMTIxMjAxMTIzNTM3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7WA8L3
+Io9uXvTeTr5NDRVIjx9/holJ4CPd1v9t6ci/Lg0pD72zWdXZ+E7m9/j4idcCzybb
+i8LtqbDq1boucCqVMVjlCda0BC4Kh7zE6LyYhXehQnl2bXrZfW69NkB1WJEZNl++
+BzG8WYLeuUOK0IvCdJMVvEjyIYltgnZzrhHWS85lpjVgu7jqkhBzV+5AmnejNjjp
+u/9ccWnusaP8O8qa1rCO+bl3QdQapY5fUvdMwptVjmSqU3BiqZszMY/aqt5L3npK
+9jJvEVQuUsgkY0xswmAcIO0lhazZdYaWnF2TLo4B76+DM3mocysr5HYR0zrxzx0F
+1idD32kqyxP2UT8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAdc6tdUEMnBup
-dXrIpdh99Ia92lV2/brxUrMIy2ak6/hZdDqgoavUprzut//QASurU9bEmoR+koDr
-T03/gPvcjDGQc1wJeQnMqF93/2VGRj4HhaulXsgPHUfiX07gkwz1vAyOLm1VBlLA
-Vpdyp2IgF46rRFuiI7tTcaq+1rh1/JDAThkRMSsTjDAJJojwlpxgQHrrcNOC+O0F
-dM7j/hG4yRibxuz+J3x66NcpCUd/iR38+y9xRSpNFJPeFpM4Y8dTsKqf36NF/ciV
-m+Xxn6vzxnYAWfq/dXEbIy7QEeI/7Cf5fWyrkPM9OIFgbPAC/e+96nby0z/KEmqZ
-fJKD922TiQ==
+eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAU94mx7anOL09
+DgqdcLjgbLdAO1e5obDnJwyvIgqpaMVEJ9crp+uDytIIBl4EQXrH6J1etBeflgVd
+w2VKBc7PTpgyoN1xfJE/8lF2e//sNWJuHBFzOmi7+OuBIhS0N9G5CL7tG6TkmlYx
+B2JWly3e0o/Z3nH8XFwsZ90sJFSwbrMQTNkN689tVezdV2/H4ESWYjsf+NAP7EdL
+1C+aOnEQXta5yW/aMSOQ2oe5wTlE3SeO6WFuQGK73/hY68WMSsm+MCJGQI1Hv/n6
+RGLfy8RV2Cpr+0yuV87yjKwxq9m1fqbPKUt1oFhBRtwG650HDtaB/E8vYVr4OGUu
+Nt5NtFVPkA==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt\r
-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\r
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQ1OVoX\r
+DTM4MDEwMTEyMzQ1OVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT\r
  FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw\r
-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\r
+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\r
-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
+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
  -----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 9fee09caa34265292513c107db5ec0d28d44f9cd..b2b76561e85b6fcf509619f18615b422f30b8b52 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: expired2.example.org
-    localKeyID: 35 2D FE B3 39 C0 48 0D 38 09 21 5B 3D 85 22 E9 5B AD DD D7 
+    localKeyID: 5E 0D A4 8A 7A B3 32 7B 67 E8 48 43 FD 1D 4C 7E 1D DA 20 3A 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIOL2kB79KgFgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLuEpzYRV6P9BIIEyB0wWjlSuFHH
-lDjIg/cb5Q0cc1NoIs9ixNLrLuI9gAQZVqcAiL11ogqLZ9gLwc1HNaOkHy6qR5eA
-xwwjAjNHugxAJ8oeSqF1PIE2CkxYKmIeUpyHn6odPhoWye9rUMTHAGM7xG/wpFCD
-6ihCjpmg8mfbP9gL6HQLNHL/7CkUGVTf6kNidLTrdHUf/V5vO3AW6YNloULxzApX
-r5F8ogK8IdWkWMN+r8CRwCCoa9dR8D8VWuGUTzk1Up4H9QO/4oggbqf2rWzMHGas
-BfXj6N/4bH33c/ImYLb9+qb4IyKwHB/EqyO7Y+MtbyrjURiqFpuxGS08d/tmeslL
-NUZWZWFKOD7o9GMygY3fpWuT04GNmG3teFZnQhwhdVyDc0ufRomJQqDHSoRWBjZ5
-15XQ50r76wnws0crM4KMHPxbXvZCJAakSI4UxYv/c/yCCiumuuGdfirV3pItGwbq
-kPv/0rhS07U41bWPZl/8o/AKLGmDf26RQMBVbEaSBbA3whsCwahzTqfRSdHXwtd9
-i81v+v69jfWXnrlAxZZt4orqrF843/pixwJR0Yd1m02omTeo0HXU7TAbN5SAY9Ei
-skdnIoC3ykWZsdud27lJTv+8mu1aSR3yjy9nQK9JzvT3BYDbnge/IUQ9MGuKGIj2
-kTyRaWhcd0S9re4rG55Waq/ck58CTYcfiMBi+1fjI0qGDAWY8bUQakZDqtSV1iBV
-rPwuZJl4oiBPVZ6k9uLh/Kx2VNlxcXSvttM2VEFR0zy7zwht2j6ijBH4vvMMzjQj
-60dZh/TsYRmaNrfL+rw17Aat/xs3DTBEU5XnmdPzDnKWnob6niAkre5pLUHFEbNX
-boYx+sme1mf8wy8TRXSRzaAgPpp8QmbqK+S6Dp6PWNdE2k+rVciln1evIcv9OpkX
-nw+SQauuMfWtrvHfK4P2TVzjJ4NCjjVid+sHdR6h1gssuJL2zq0/LC27klTtvhqj
-TNUu2KcVcN0cP+lPpPFI9b4ZqY6FVGTZBxyUDl0D/LPkeGVEDEKUJhlBYDyPvrfc
-tNCm1nIv7INpt7LLzeufrwO/MguOAwihI1kkjPoiJgwpioXHjRzTNryXZwpuhyQ7
-IpaQ3077d5cRMl2vZsmCD6aWrNdg3IuJmrTgA8KHb3j++9nPj9AAvwNnxIo7NUke
-wpeLQ/kPHNYdWjfFyLjKQr2MzkBTLvVWYSe0ismf2rAX0FFg6e5ZaZSGUbA4ri7I
-Ql20IP4naFnb5Bqs5IHba6WupUWKB53HQUkD49PK6thfe3Be9Vz1qlLut8bnBOYH
-IkWBL9MBtmELc2AdCQ4q3Q34efnWAKCT7W5EPQgGxdB0ijq7xVoDa8NGon50eBC3
-e7xMnixkfKt5F6hp0HE5M6N73y5XPKlBlSRoO5li0gKUeV3qVVD4RNxipCX702nd
-pAYOKNkjNexnTF0RLy0bXqkUbErIAPnOCKLe2xR2i954Ail86TnKcahXvnrSa8cE
-zZbTkMJxSKtsIFaPA/ibbzexFegmSI9iy7zgUPW7NKsZTOWjVtFR4txnpvfBp6M2
-1Z/xDLBAKzMyCsCEdDGe4ArBoUZy101Z7rrEOxtiQTQ7o+By+U16VUDmM8FmJU5d
-33VHW75/jdF4bILlHMn1sw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIvY1tMKm0wYMCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPtnBBM5FyScBIIEyBr9qAgCEAK3
+BFu19YYqK4S0wRQmlKobotifQ3U5f5DAMNyTzthH5BKBEApwXQ/84uQYC7NaiGUf
+TjjPr2x+uUvzfLtHj+I8la/YDTZQbPEK5q+8GahrSpghviR1MuS1g+smB6AV/k8O
+l3NKX3RbjuEix3t3EulTjs98nrQXJaY8eQcwCwNYki/DVJr2dgL+75CJXq/oVZQ2
+I5B1RQ6SBrLZwng9gEcGtx6EJA7sV7SpiFGVonFlfr4Tdt0uuozH329aWkpr0NYp
+s+CIBcaOv6cXzN5yYf/FsAOHpqvWCV5R01fHQgdphEf2XBqiG8f24bDkIKHOwM5o
++kqvVltKAECIAe7tNQcrilEkJJsU6YbuGzMm2Lf8vsDrGJALR6CKBic8nRB9BChU
+ELbgoKhQpo6hewvgghA+K4OKP9ZUjEY8WrsCXkx5Aski2zS4ox6P/qiYCY1vrenD
+aTFTXE/fdDIMZCQGM4GwMaS8s1Q3OR9SCdveOO0wJVJ7Opzjy21HhBoCec9fr1m8
+KEZFcplnx5QjGvLn/ibI8Lb5DAFphwzUxVqyAotxsYvBzoqa9AwcXb6BLpL+SmVW
++zTPdOG0iFSP1YIVt99F0+14wGifkutL+WewhWVX4WjmwU8cTlGVMBI/AGTd4hOo
+7H07Gwgk3FVPkNyDWiwzENsOkyPN/HQTwtVIAImaNcEyMgK5OYUhbK8mVDQpSs4j
+sAd/6nGJvcXnajixdx+jynk+cvdbVkm+om1pdaAbpx6rsw6LZp4PGdiAxtdaRsdx
+Vqqej638t019rH+OZa+m7rjgLSkiS2+t0Yd0vJxx75xcxHDw3ClfCb1/Kvzy+gxs
+ZM0h6JHRo9GJ65W8EVFlfV+qG4mmMzLOZWeOyvkeQbO5sHSzFpO63860ufRVCO/Q
+jN20Z9aCgRj7V0u9wY4ag0gPlp3UtZ+OpaqUxZQC033QYVmNJOgbbwvmsfJX/k/o
+72mcEN6WZ5QGWXCyXUX1vnI8ZCx5MVw/xFamOglf8NZ3JGKuGKaojdd7jjz2XUB3
+8PE4Y9tRFjCMS8X+D1oxI75Teis3InE4dvRE9d6S/mWvn9+IDgki8YD4kFxL9ymG
+KG+GFjijkaGeZm+Ue/grzhVKbHaE++ZEzeEzIvPkw+KG5GSXkWQa3n4DoE9RRu42
+0PwIXQYyu6/aQMeEW4M+o5e18SO31+hw9jQQG7/gfnZL2PH179mwSVIoSR/EVHN6
+OHNyspTFVy9DaVLoa3HQeP36jEcL1s027i7MVJ+HZTQnvVScrHsIK/9KqDfgIkXR
+VESlJ5n/NTu6I7nwoJGojXKCMDJZXllzg0lmixan7yoG2FYzx/he73jB4ghc3yvJ
+zhWAJcAOcAPiuaHCMmARMIPDggl/owRbqF7uxrblC4tB9QluoVFVf+F02ieNWuvN
+fpTcdO7NotTfJKAk4DmJUCrPiJI3j/+rLjjBcT8HgJ4SG1WeQlEgt8vLF8Pbu3RY
+NcGcpnnqfBSmJof9s5tczv25GnQEhhsrJ+VPC/QIMsE3Tjgjl7h9RIkZMsxB+sIF
+BbBFl9XmC3ILsUXZw0MBViTShW0etVq75x9wm9pxeXWiOFo5tHGiRqEK31uFpYpK
+vBV2VnXvD96xGatTbDXGAQ==
  -----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 0fa7573263946f2d9e58cfba1389fc7c1a5c52f0..97c99e3c26a45c76d92b66d81b764ed923e8b857 100644 (file)

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 d5f15992d9705f7bdb96f02bafd0654c1ad9b3fc..292737f3efd7f0ec81e7d85bfc64075ec8da0694 100644 (file)

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 efc46e0262c134ca41f8760cdba0c0ae9bce3cb8..0495d77ffe48c1cf49d07a07e75e4b1b72767d87 100644 (file)

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 d5f15992d9705f7bdb96f02bafd0654c1ad9b3fc..292737f3efd7f0ec81e7d85bfc64075ec8da0694 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp

index 09b2e8dc13e2876c5684f4da1dca52e2f5c859f3..5610d1e520d786324bc0f4928f2738a693864d60 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp

index 481d922ff0abeec0bbd399f19719bc8cef4e07db..8477fbac89c2d3d14d5e86079ef87de123b3900e 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp

index 481d922ff0abeec0bbd399f19719bc8cef4e07db..8477fbac89c2d3d14d5e86079ef87de123b3900e 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp

index 238920067ca26146e4de8eb35286efd9556f10b7..a99ca0d04197177ae03e32d2c06186fbf967b5b3 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp

index dfcd968d7792af41061be388685dad65356746b0..c0c65654d02204de2aead7abce7c2186888568f6 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp

index dfcd968d7792af41061be388685dad65356746b0..c0c65654d02204de2aead7abce7c2186888568f6 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.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 105bdb9d4c918e27e1af71b5e675f679bcc90c36..f0a6f06c5262129e998c8c4756daaa3940892dbe 100644 (file)

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 339566fb2b2af69d80ce08dcfab5a7ce2fa38a6c..8d694e0d1caef1f609ac1f116106f2290af37978 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: expired2.example.org
-    localKeyID: 35 2D FE B3 39 C0 48 0D 38 09 21 5B 3D 85 22 E9 5B AD DD D7 
-subject=/CN=expired2.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 5E 0D A4 8A 7A B3 32 7B 67 E8 48 43 FD 1D 4C 7E 1D DA 20 3A 
+subject=CN = expired2.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDU1WhcNMTIxMjAxMTI0MDU1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOnIrMvi
-C7D5x/cms6bm57pkKtQYwIaG2d6wVZJ5B5gNsKbfbyjUkPzrsHDGR8b8z7zp4CWM
-7e/oyXqoDFC48Ollp/iZAcwn/Jaan6+Q8qlasfIPK5TV4ZSaHdFPdkwyBj2SQfhS
-QWiU+dEblCkH6nfSwb5mwU2XaJXs54AU3BSxw4/zXAq0lQO1pUY8kwI/xaQMptS4
-CQjukoc/DRUhPvdJB8D4S/dDiI/4bw3yRgrbLhB+80OezHrir4BBmcgH9dIvKTyb
-skH4O3fYD5ZiSYHqqebFGfKwf4GaaHtfcJ6zDXv4yMM8y/iorr8IHqFCZp5Y0EpH
-FaxzTI11wbIy06MCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNTM3WhcNMTIxMjAxMTIzNTM3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7WA8L3
+Io9uXvTeTr5NDRVIjx9/holJ4CPd1v9t6ci/Lg0pD72zWdXZ+E7m9/j4idcCzybb
+i8LtqbDq1boucCqVMVjlCda0BC4Kh7zE6LyYhXehQnl2bXrZfW69NkB1WJEZNl++
+BzG8WYLeuUOK0IvCdJMVvEjyIYltgnZzrhHWS85lpjVgu7jqkhBzV+5AmnejNjjp
+u/9ccWnusaP8O8qa1rCO+bl3QdQapY5fUvdMwptVjmSqU3BiqZszMY/aqt5L3npK
+9jJvEVQuUsgkY0xswmAcIO0lhazZdYaWnF2TLo4B76+DM3mocysr5HYR0zrxzx0F
+1idD32kqyxP2UT8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAdc6tdUEMnBup
-dXrIpdh99Ia92lV2/brxUrMIy2ak6/hZdDqgoavUprzut//QASurU9bEmoR+koDr
-T03/gPvcjDGQc1wJeQnMqF93/2VGRj4HhaulXsgPHUfiX07gkwz1vAyOLm1VBlLA
-Vpdyp2IgF46rRFuiI7tTcaq+1rh1/JDAThkRMSsTjDAJJojwlpxgQHrrcNOC+O0F
-dM7j/hG4yRibxuz+J3x66NcpCUd/iR38+y9xRSpNFJPeFpM4Y8dTsKqf36NF/ciV
-m+Xxn6vzxnYAWfq/dXEbIy7QEeI/7Cf5fWyrkPM9OIFgbPAC/e+96nby0z/KEmqZ
-fJKD922TiQ==
+eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAU94mx7anOL09
+DgqdcLjgbLdAO1e5obDnJwyvIgqpaMVEJ9crp+uDytIIBl4EQXrH6J1etBeflgVd
+w2VKBc7PTpgyoN1xfJE/8lF2e//sNWJuHBFzOmi7+OuBIhS0N9G5CL7tG6TkmlYx
+B2JWly3e0o/Z3nH8XFwsZ90sJFSwbrMQTNkN689tVezdV2/H4ESWYjsf+NAP7EdL
+1C+aOnEQXta5yW/aMSOQ2oe5wTlE3SeO6WFuQGK73/hY68WMSsm+MCJGQI1Hv/n6
+RGLfy8RV2Cpr+0yuV87yjKwxq9m1fqbPKUt1oFhBRtwG650HDtaB/E8vYVr4OGUu
+Nt5NtFVPkA==
  -----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 c4d60c62b20df62c90d717fd5fddabf8aa07ae7b..4940c24aed7b7f4b3f31b9f51024773648586582 100644 (file)
--- 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,27 +1,27 @@
  -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpAIBAAKCAQEAvtYDwvcij25e9N5Ovk0NFUiPH3+GiUngI93W/23pyL8uDSkP
+vbNZ1dn4Tub3+PiJ1wLPJtuLwu2psOrVui5wKpUxWOUJ1rQELgqHvMTovJiFd6FC
+eXZtetl9br02QHVYkRk2X74HMbxZgt65Q4rQi8J0kxW8SPIhiW2CdnOuEdZLzmWm
+NWC7uOqSEHNX7kCad6M2OOm7/1xxae6xo/w7yprWsI75uXdB1Bqljl9S90zCm1WO
+ZKpTcGKpmzMxj9qq3kveekr2Mm8RVC5SyCRjTGzCYBwg7SWFrNl1hpacXZMujgHv
+r4MzeahzKyvkdhHTOvHPHQXWJ0PfaSrLE/ZRPwIDAQABAoIBAAg4Ii6s2OmMkL0Y
+hhO0MIgQzqPwqNQTlnp0/ORA0Pzlybn6DBouNgRRQFya82XfGTC63OkziNrQbv/r
+srYzdylJBmMUb6QLr30RfwnRAU/TfIwhKe0eqKsjNZUmGRwVnHGYwGVx7dAP6LBg
+9LcarM4YMKUqc9LrJX6hyiiykCC8eFhmSNiThSyqae0ND6jRw32yb6cx/qnMZt0K
+cg9xF60yz0Sg7Cv+eQ3ZbCBfE0BgP/vW3eXxrYJlaJT5KaxnGvCbCUHxU/FBErcz
+VggwDQr1oFh0Anbr4MLYW4TzXW1WHDwR/+nn1W5wKsWWDhdZTJ0nQ6wcdv7azBdj
+yyZiqMECgYEA7aXZTrYxCywYqyELAd7tWYnet8/HPkdIjA744lf1T5p35uGw3ony
+xouF4LGcjpC4+QbExGTzD1LCVt80WRenUenr1c1DGwVBfdWzLBso+Nto9ZbbPzIE
+W3mkKVquV+gJAq4uoglqXdgJC9WKT+ly2n59DzsCvvOhf/lwWyuzFncCgYEAzZK5
+dIBcwdNbZs1l+WGL8I/gEDhfgtESv1/rnNIW9vwIp02zlrBONjSlRw7GjNMXzknR
+Fb7wJppmIS47rE9/thf9bmgcPhn6yj+nyCenYbQg4psmA3H/snpz9uvL/znYJaFY
+kKZ7kfLcXIi1MxOhJtQMMdoEvmIHMxmjtu9apXkCgYEAoC6f0MxBNnSclAyLrNEk
+Tqv9cQweEj5eCfm1jGsZMHS/yOHrI7T77RPyQ0e0bOvjogcL7gzVQEjaMU/1qu+k
+mjQAAHaAeuAKCtVWFa6g6UyK7K6oTWpbQYU2P6Gdzibam/HoANQz29lYD5/5wG9s
+ORX1GaT+7tKs0uPA9dL4vXUCgYBCbH5wHmnaVyjZdtTUV6iX+mUz2INECbo9DAld
+iqTQ+W7yYDD/J8idyzT8WNHe/vZaOY/Nrvx5/LmzTvUJIEbr16ST4CAAEPTwFNFp
+4yY6c7GMhwUpZ9RvHxIJXvdzaIVm41NyqdiTuB1r6OBjuJwBp9Ko6QFPYu1gnZBA
+s+ZeQQKBgQC2Ma9Oyt7lJRSxJ2UrZQHgC7V5KHrWMm5BaU2Xuk17vrOOkKY6IH0C
+cD6DQOu9Waxl1SA8n6hOdIO9FhFr1CWSBa9/G5CIFzdP8Mltx3l5UQSDs27bSafh
+fjAU1twD+hK3xtbdtLuIV25TqeBY76XTC+EN4l4+Rtgl67EYaxCQ6w==
  -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db

new file mode 100644 (file)

index 0000000..ea4bd0a

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/pkcs11.txt b/test/aux-fixed/exim-ca/example.org/expired2.example.org/pkcs11.txt

new file mode 100644 (file)

index 0000000..6552796
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='expired2.example.org' 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})
+
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 dd4b26270282c193d1ab288544c4c3ac58dbcab2..fde8b84403a32f0e3fe624e8c870e1d1de06586f 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.org/CN=clica Signing Cert rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica Signing Cert rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-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
+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
-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
+ggEKAoIBAQDWnBT4P/2nkS55UmKN1d5JFOyNDjNqSa6k5nkbaZ4jle8VDI2GKxDb
+ojY6g31ZzmZD+yjFFSN3q7mKQgZdjuPLkuRGAzpCsOGk9u0tqEuQFD7FOoHPzi7d
+tpGdaSbkXYL91yfhwP09Er03g7raHx0sxAmgZul6rkxNZDTCTbPdXxgsb7sv+rNr
+y9pAkpO4cubV+AsFqtvPXGVCOjyUmBwir05ifQhHmMNvsARH4YnCGVOswLtnzD81
+bHuuVYdfiJtCSZWOJFE4fQAUi9GV4pfei3Uw4+fZiY1FL/lu2NOA3048Yxa1j7WS
+R0rnx88xphxUhrLZXjMrfhyny/GHMf4ZAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
  BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.org/CN=clica CA rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica CA rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert9.db

new file mode 100644 (file)

index 0000000..86cc46e

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key4.db

new file mode 100644 (file)

index 0000000..2c00cda

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/pkcs11.txt b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/pkcs11.txt

new file mode 100644 (file)

index 0000000..0395da1
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='revoked1.example.org' 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})
+
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 502881e0688dbef15b0a349df9c5841cae24e964..f2119e0ad1c3f71814fb4077378e105771e135e0 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: revoked1.example.org
-    localKeyID: AB B7 FF D4 FF 40 8D EF 71 FA FC EB 4B BC 6F 3D 7E 3E 7A E3 
-subject=/CN=revoked1.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 3D 1A 8C 8B 81 37 16 EA C0 9C C5 62 DC D2 28 A0 EC 68 26 17 
+subject=CN = revoked1.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQwMzZaFw0zNzEyMDExMjQwMzZaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVOlgKCr
-2xnu1qTG/iKjpYss9Fhlfrcn2x/Jeazm7U6Z7uR+OpdkAGLDt6nJqt4htlymkC44
-i7VJbnsEP9FaUDFGl+YOFDnQRIMWxk66/grr5nXimGyUqXSkMkfOE0IQrwk7+oXu
-SxDgD+5+F6TstppbxDRDJVYO4fTZ2iKjcYDHKQ1IIPT6knvvBmWL0Q3o5APYd5Ps
-m4bfjdUTnVk1AvPSfe5QLOGg/mN9NfJTGlnVxB8HuO3qAnpyCHALliVB+Z40xPF6
-7kInFkUUtqTNc/NYuRrIZ1VMHlrQDcOydG3S9yciyjlViYvle8X0QbU5eEBczIxL
-hRw04Hdx8Tx9NQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1MTBaFw0zNzEyMDExMjM1MTBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0FYwqoJV
+0RDL0zepdY+lhgYGMEm2bQ9GJ2Z9wANHQlfZnSKXHel8nN/Myb1WBqLgEgWV/dy8
+xwtSr/cLG7Nk8NDLYnistTSJzTnUt3SmNINu7vXQPh8MGX3RmMergTtJud5L/YSi
+crNGblkXD30AJX7ji91tcvLes0YFNp3Ye2Xd5pVH15TB0jbPBlNcwQ8c5e5dSOL3
+qUh0j0Wmwt80a9y6LJqCXA88RcahKIiLePiN7gx3AH2RbNkyQYMraRm15yLKPGFG
+Bn4zgwgd1lUkiqTDVAFV6oNfC7DrnDzpFUrpcQu16DlyT+5tTgR1XB2bKkI5BXql
+hHm2c6X2AxQZhQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAPWhZMf55HKhFm
-075rhJQrpc4gMFLK7XGcXInoDvC4vtFYQw63PPs/tAa4DJCCZVK4ujtL5Ddjlh7K
-GTAj726pHAy+qcRlhX93rREGbSZnJ9BSJAZYXEeZqrqkIyzvfvuhh4oXDoHKP64r
-wOj0eBGZZhHKDVHIzf6y2Uap66GFPqBVhtvrHS6a1fyoA8g3eEnNf+RKP97ooBvv
-Vp9w4zSn414VwJK9lW66gW3TldUmV7Ly65nQQl/AvjE44YreuBe7b4nciQVL98z8
-aGWvcR+vharubKrXfsCMzUDz45N/wsLs4UJiZBqzfW4p0SoDafOOz2iY0SIqgCnM
-Sf+q7rPd
+dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBqVy5iDQCoOoIj
+88Ckt5CrI4dDGhTBdLA7SVBJPAxPCCcV3TwHfJuew+4zJNGhtaE5Bhy3FhRlb6ek
+qTZ1F30KwTV9jIqVFGtegSyW47MKKVpSm383IGiQq+r1A31IEwxhtGfqsvpxXlgT
+2m2KD0iFuc3SwVKSyYFPuwOCW7quJtgovgij2wN2Yarqj4KPEmR9w0dh9jhfsekp
+/Ji4aBnoM610dI5n6qHZVErAZ7S0btDEee77dazpMxXCEtIHmaJRTLAWGAMLPZnI
+4XFR3EzDKEKX67vGE9aGfJIOmLGvj7aWRoBjk+b+47zNfPHePkxjvRmJ5rbebySf
+0WGKO/2i
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 c60a0398d25432aa9e85c429ed90ed1b9bb39b70..54b08c129bca977a05fffa7d78fa16c9c3d8ee1c 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: revoked1.example.org
-    localKeyID: AB B7 FF D4 FF 40 8D EF 71 FA FC EB 4B BC 6F 3D 7E 3E 7A E3 
+    localKeyID: 3D 1A 8C 8B 81 37 16 EA C0 9C C5 62 DC D2 28 A0 EC 68 26 17 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIuTUtx9HjgugCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGDXYKIS5vH5BIIEyHtlfl0iKqhp
-k8MZ0a935LjrzL6dEYNHWabhSOddNAQOB0EXcgeAbsng9fd+offJxtqfYi68u9jH
-AShh1AiXfwUgjTbMqBCyAxiqzNw+uuBe8VK8xqgZNctGroca/AbjjsUoXyS6ux4B
-SB17Ee/qszq4jJBpg6k2ixyYLZHZP0Z1I4w7yVCxnvfxh5RYoohWMpQ9N41+lxDk
-9Y8l5beIqTIQHKJBfHp1FyhqTLdUL1qpJNJ+9U8DjGai1ejgUXz/dSZiFat/Z9xH
-D7KvabYSCqfybOGU0nORg0+xFJ7L0w0S7NalTEWa/hyYFt5wYxW5Ack1zRqv9jU6
-FT5s6ug+EyM833TfN6QfPUoMniFd/P2hH+NgzIQkSHU3OYqHR+XVLLa3pWc+qsrX
-XhK90N/YpEtiZ9nY50PVSDChyZjH6Y+eEgESLIDR7Uhx91bwHNMyl2R4LyyYzjd4
-W1Gyq6oLgYNI9vcb/gDdzCHakOJjkcyt0gwm1VlOZeIUsi0u34AjL0bkaqey+12p
-YRmNBm8iRTetpLW36zSole/te1BqTLxhMyOSfXagSgQ7+UyDNqa00p1IkNY/658G
-mVoYkz4V3uoy0oCA8hZ2HsmXEwOI/ZuxyUx+OYZ6IFEuN/x494lMeBiTSHyt+LIM
-elNcmsg78igdqbTPAZLYk8X2rnMYODqzDedr0c6nGSGqK/T1m2Jv5a0FOaSXd4x8
-PTlwNYCG7iTuK0as04gqA74BLWL0udHRVY1CSm1vSLTr0BJpjjzVZwqkCsdYOM47
-f1LcS8iTJS9AxufzKeL0FO0bV2rrfJLMEqC7AiRMMOr4RWl3GSJOMaZCo1tnDTmk
-BADtHxJwsVzMKi75qd9D33Lt9dndipzTr17Z7OUbhbAjbAQWtKZM4oT8XNIzF/hl
-zIu+yONbKV7bjLz1U0LEABkR+B1vWuEstfH9WU+Csag9BV12twoysxeXAGEaEP5x
-4+lcl8lM29Y+qfGYMvzdkgVHvk9JRTl5qMnzgXKLUdxtWCHcYArORz8g20vmH/Aa
-xzkFTwntl+nvw4mNh4N6AllcQuzP84zpWdETsuK1WHzzu5wtsRXUOFH8MA1Xj1ZM
-vSkuj8qaOnZEWDs0YiIMz6tQCAgqwD7p0hHXxXD7MFgAg/ZLJ0qJofUYckM2VB7d
-T2HeysRxEvOfquotKTOZUGaViY7AQR8xdpeWJoXbWUxAm7ZjVtf67/1RHzJrnDhv
-cBytQLgBhEDN83+1HJAKbDaR0kQ/d1cVvF5YE13qClw8S6lg8/3ccWBJn6UQvrpl
-c7EWctwhcVUB17BZndIPE0BfWePl9MvhjI1LSW0EsdHRjaRLXKp3BKwV5jp5RknJ
-FSSMRn+Mz6rKbAbl19GfbPYcjVlNYfcSqu1Ovcre6f2hT8IRAKwhHV5Ph0aimxTZ
-e/Ptuj+D5k46KBmIvmoEmpn/IOSJzS5dCTi12AMWt8K8afXXQjUjSxrHyORaOo/w
-+/KmCI7vYvOEdKauIR7CcShE4iaj6lPmVxEc39ku8/A5vRw8el/3cZgn93bDX4EI
-rLEt45wQVh0Zfc68vEYZW/nvUf7O5GKi4RJB6wXKUAJg+ZuEstT7Y6FQz83lTo3v
-hisfNSaTLW77Snct+HY7LA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIRjYXKbq7CKQCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLuKJMcGHdluBIIEyExvjR1Q7z+q
+u/B/ff+MkpCT+kAP3Cl8hSwGJFx7izH0M6Lky6WG5u383bsxtOF5VXvmREUS/F3a
+/GP++FBBiX+z0zWKrkVQ7hZX9CkITO3Sd2n8n/cqhaUB9kJX4STW9I4OHawdaJYR
+qba9V7XwlFwC5sRxRYLYRji3INotTUghr48AbJtP2EzFrvVFiL/navNxiYh22EUJ
+XNoLWj6QUvrGBf2f5Uo6GUi0BpnQpHgPvVzFiYb3yvMFwo4Y78p7BMHrc0E+cXCf
+e5aqKKBV06wDXPax3/QYhv/i/Rw2jfe9xXxGq/hmrwfnLd1lsC+LDUZyI8u4tnhB
+AxAzjsuNNugSGm3o4fQY4YKZNXW44CUMY0Q7cWV3BcLRtOlfomJ/DDdUgKf0j4c6
+5gnx/CHAt2ebtxTCAWm0q09k4GU+dD2/a9o4E0vz+TBP5FbQwbhOCrl+eCMj/dZG
+yG+yA01IG+5ngBsXNEnmSjBZq0lEwG5/X1mg1mMhJf/bp1z4snevUcXUvsBObp9U
+yaHwFPV60dTEP4wg94hXBhCIlPskCmaEh+HuDIFzThmUhEhEtLtFCvGooLPU+eVy
+kSnrYK++iSQFjj5zUXaHRgrrRxf7OuUu0vAFp9vz1idhM6BMeYQ3jxgtXAk4cdri
+y953DcL0Cur/34i9ref8bSYsv6VrOFJmD3wLnrFxEFrLpLbwwYbTkVkiJXnLh/PV
+MWTMM1d6tNEWkSE7NKk8Tulf9qxPShVulU1ZppYwsUnkLKh2aY5fOo9pt+gvknqy
+ftp3/Q/8lLgdqEkgJnouYC9dIUl+ddUC9ogE+7TxXnY8ViMg4BPP6Xw4hft5zx5n
+GMO9DCh6lUTq5dTCuQqa0KlQzqXPWTv4xqMPsfcvtnQ8pc6bJQxG1gXLGhr2p+TL
+1zMHBeMuoLz2Ezagax+vaWtpt21+yasKP8lzvxCvQQJ4w07NMuBXl2QOGgLiyGnj
+PoEMxKbYOjkMyDzAalS5ASuzH3VmilUcKILRJjA5FoGtsnF+yPs52+P2kduedCis
+iS7g51v4USqqJwsK7LPY29PCtvmvdjhHHs46qlcY0S7BwoZrKRxPBK4gvrcVe2hV
+Yx7VaqQDL5TSA2gmLFaWX7pp3WKzWYbsr7dK/M8QfB6mHM+EEGfJkls/2OCq7oss
+KU1Q5oMjituNxORwvyz2UmkjBBamnqFT9gsH6c3yg974Qu2wbeA5xlEmpsXNkLxE
+A5ORarEjvXrI/oV2tqPAQwFTC3qeIV9llhX9nJVXWhGKWSkFKnRW5um12Nl0urqG
+8o4ZULKuMCTM0Wbx7rf0vd67myI234AvPhDxBBX/CRsREwFEzHV0CD//yiHRs7md
+PCpbLeV2Q1TNO3V3Wwz6Pa/VqmsFG04b9wMlr+0FVMxVjrGMVBfSBjiHkARa3wmD
+taklRo8g3r6foXXWBVoYlvQyCD52g/iO+Ig9FjVNj8jFhvfgdlXyA40tO2hQaDag
+mq9rbcDDe1Eo/CS7KrT/DWn+JTFPVTOEK1b64AV5YQtDSwsS4yyRNv+eDcNxcjPp
+52SsIoOleFmUFM7Bf41paO/ZCeoOSnysnX81sPzyD+L4tBXtg41ip/Cq6E7HimC+
+sXRliPYDqAvKt79QGAWZtw==
  -----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 aef8cd9892d1fa94f18f8e2990f9eba9e51d49c5..6743eda56e2dedb697b86544de06012fa0765d31 100644 (file)

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 ef9901385d7eacad1f65ca93edab98dbc9550a4f..b1f7110b76652d401b063dfe810b44857ec98057 100644 (file)

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 e373eb4d473ab9aef89853b882ae8da65b96c3cd..f09847b05ccbd57b642785180294170cf0351feb 100644 (file)

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 0304427976c73abbf0782174ea55805cb2d272e6..703904f2c045319456a2e13290ab0383215b403b 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp

index c4858139846bf9be4af84709cbbc674ee286555d..5e97b886b3697547a53e300022fafd876bda3d34 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp

index 374c6e27acec43a9e762b617269bac85e99dfa64..b57131ad4fc79f5fbb44b01ce64deceb015b686b 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp

index badf2e1b0dd053657587c344dc54b9c92e0a583d..fd24a59bd532f2b7b2aebafee6b94e39dc6c7b5c 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp

index eab0c002b03a88751c39edb8872c0ba88abdf6ef..c97dc85dd597d56e29f746562558a51d1aaee783 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp

index 499c009408e7cba35a335d0744442336a17604b1..f4473a33ced8d0fd6c98ed083e1c9f435e074c93 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp

index 7c440714e11adeb3bce55a5093d7a03f14d0ad10..e4a4545aa2782d3b265e706e73985d70b6757617 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.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 d70701f133566a795915cc7a83a3cbcf1dcb181b..f3033501a5547e3e04c2f48f19f38e4cfe545d68 100644 (file)

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 12cbb8e62a3becff09755aac4a73044cf9215cfa..fcd5d795b1d316e88c88fac45642411423bcce8c 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: revoked1.example.org
-    localKeyID: AB B7 FF D4 FF 40 8D EF 71 FA FC EB 4B BC 6F 3D 7E 3E 7A E3 
-subject=/CN=revoked1.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 3D 1A 8C 8B 81 37 16 EA C0 9C C5 62 DC D2 28 A0 EC 68 26 17 
+subject=CN = revoked1.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQwMzZaFw0zNzEyMDExMjQwMzZaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVOlgKCr
-2xnu1qTG/iKjpYss9Fhlfrcn2x/Jeazm7U6Z7uR+OpdkAGLDt6nJqt4htlymkC44
-i7VJbnsEP9FaUDFGl+YOFDnQRIMWxk66/grr5nXimGyUqXSkMkfOE0IQrwk7+oXu
-SxDgD+5+F6TstppbxDRDJVYO4fTZ2iKjcYDHKQ1IIPT6knvvBmWL0Q3o5APYd5Ps
-m4bfjdUTnVk1AvPSfe5QLOGg/mN9NfJTGlnVxB8HuO3qAnpyCHALliVB+Z40xPF6
-7kInFkUUtqTNc/NYuRrIZ1VMHlrQDcOydG3S9yciyjlViYvle8X0QbU5eEBczIxL
-hRw04Hdx8Tx9NQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1MTBaFw0zNzEyMDExMjM1MTBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0FYwqoJV
+0RDL0zepdY+lhgYGMEm2bQ9GJ2Z9wANHQlfZnSKXHel8nN/Myb1WBqLgEgWV/dy8
+xwtSr/cLG7Nk8NDLYnistTSJzTnUt3SmNINu7vXQPh8MGX3RmMergTtJud5L/YSi
+crNGblkXD30AJX7ji91tcvLes0YFNp3Ye2Xd5pVH15TB0jbPBlNcwQ8c5e5dSOL3
+qUh0j0Wmwt80a9y6LJqCXA88RcahKIiLePiN7gx3AH2RbNkyQYMraRm15yLKPGFG
+Bn4zgwgd1lUkiqTDVAFV6oNfC7DrnDzpFUrpcQu16DlyT+5tTgR1XB2bKkI5BXql
+hHm2c6X2AxQZhQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
  L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
  BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAPWhZMf55HKhFm
-075rhJQrpc4gMFLK7XGcXInoDvC4vtFYQw63PPs/tAa4DJCCZVK4ujtL5Ddjlh7K
-GTAj726pHAy+qcRlhX93rREGbSZnJ9BSJAZYXEeZqrqkIyzvfvuhh4oXDoHKP64r
-wOj0eBGZZhHKDVHIzf6y2Uap66GFPqBVhtvrHS6a1fyoA8g3eEnNf+RKP97ooBvv
-Vp9w4zSn414VwJK9lW66gW3TldUmV7Ly65nQQl/AvjE44YreuBe7b4nciQVL98z8
-aGWvcR+vharubKrXfsCMzUDz45N/wsLs4UJiZBqzfW4p0SoDafOOz2iY0SIqgCnM
-Sf+q7rPd
+dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBqVy5iDQCoOoIj
+88Ckt5CrI4dDGhTBdLA7SVBJPAxPCCcV3TwHfJuew+4zJNGhtaE5Bhy3FhRlb6ek
+qTZ1F30KwTV9jIqVFGtegSyW47MKKVpSm383IGiQq+r1A31IEwxhtGfqsvpxXlgT
+2m2KD0iFuc3SwVKSyYFPuwOCW7quJtgovgij2wN2Yarqj4KPEmR9w0dh9jhfsekp
+/Ji4aBnoM610dI5n6qHZVErAZ7S0btDEee77dazpMxXCEtIHmaJRTLAWGAMLPZnI
+4XFR3EzDKEKX67vGE9aGfJIOmLGvj7aWRoBjk+b+47zNfPHePkxjvRmJ5rbebySf
+0WGKO/2i
  -----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 0790596d7327bb2336e5d78e3dc4ee0b7b9a0c40..4c7a77503a62390739149a804a4943d4e68a92cf 100644 (file)
--- 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,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.org/revoked2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem

index dd4b26270282c193d1ab288544c4c3ac58dbcab2..fde8b84403a32f0e3fe624e8c870e1d1de06586f 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.org/CN=clica Signing Cert rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica Signing Cert rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
-DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+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
-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
+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
-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
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.org/CN=clica CA rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica CA rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert9.db

new file mode 100644 (file)

index 0000000..c8f409f

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key4.db

new file mode 100644 (file)

index 0000000..bd1569b

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/pkcs11.txt b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/pkcs11.txt

new file mode 100644 (file)

index 0000000..163508f
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='revoked2.example.org' 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})
+
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 e548963b7c23caf29bb7ffe7a151f0209831bdea..ed91f73a13a2f6de84d06bbc16a86ff6bafbb038 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: revoked2.example.org
-    localKeyID: 57 CA DE 55 5C 33 5E D8 CF 37 98 46 3C 41 11 2D 55 7A ED 59 
-subject=/CN=revoked2.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 6F FD 84 51 7D 29 58 BE 22 42 46 0E 0A 49 75 73 93 1F E8 23 
+subject=CN = revoked2.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDUxWhcNMzcxMjAxMTI0MDUxWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiTKHqH
-0Sn/I/dG/dktGck3eddMukOMgWFniulbSl3gI2KLF385j+6jiCjqyrqJcxTRr+wr
-XdXbl1gJzEG6zoFt7Wdgsw/oC03/lxqi1tfiJzhKy+zapHOi1KHoT+gHu/LkDFu9
-WINjJ0W+WkBs1zRm2ykkwTcgZzoqa7cZ432v1nw4p0fR1IZvbgL7aac65G3SqpRS
-L3Fho8UWOHwy2zKXdpbHcAGITUWG8c10JbHEkDNKqKaDXprsPOkiMLfe1d8dfGlM
-kpjw8bFD1W9GTcyZVli7PQBGV056AVNzV+zZtxw/LyzME0D7g65g86O7qDqQCvCM
-BLePj7peGA7xKtMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNTMwWhcNMzcxMjAxMTIzNTMwWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbT/zci
+X1lIZsG0kjXlJqALemDAYGQw5i87psjgQ8ax90OtxfvpyZ66xuloz5U78P8440n3
+e7hUMhQzqYrASXKpGe9YMClTW0AIrZG/3dNhvR68H/t8gMFqP8uXRGQMy7kPsqy6
+ahAabvrI0L26Vg23v0LKfVX8LqbCza77UsyZOb3UUpiCQPXQXQ94Wb2V4IjBTLz2
+LX0ssslIHYPkW++sU+eUmTTI1G9VXMcQQ4VXbELPZ+nBKg3hh/I3zQQTh4Cv8435
+ua0fO1ZG3o4IU/U2NFbvIjder8wfo/9BzK5sai8ng/nsB7OyFzxh8hSrOgx+o796
+SdVCdci7wmHb9XMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAEMjEukLe8FVD
-Hk3k4aG/pc9ilCm6zkko9tFeHIK21EE5xrDbOGkABJx3v+2TguANV3RhNx9JuD5v
-GuBPFzgmC6DY3cE4SnV4CeECpilbLJsIB/xAzgaLVGvVq3HZWi4ASJgksRhqd961
-U9y0Ih27zhZWtYSSyMCe20s7sKkniWGcnV9w3sUccY+RESph+afsaUYH14TUByJt
-uTamJ8SAUQz8b95TLDesDudwUkH+qmp72lri/l11Nj9lFnlzUlP9npX2jc5BFa98
-IOUZ2gkVFGIvv6eJxlEI4nizkDXFMv6OpiGL8O6uKFs3K/Xt8QpwONO+4AcdqZi9
-HTvZbeULpA==
+ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAIB8z0c8pDKS6
+7JbeT/1dpL00BFOHtgEevnq0sakZBKIBDVuOei0JLIwpftsKAAQWxrXkmuLbAdEW
+/KzrSj43eAGOjoNfpvqW96KblvztUbN2iucOHilPDMpXpJrMUslk9na7rhmdyL0R
+N8J3ls35PCJ44DwIF59njnSA9H+et5luph202w7AotbUcj30xItTh7beugcuMuKn
+SwN9MNkOMfQibGXJGWdE/8LR/FG9THclDFnkrl38ds9dXw6ZFY8vYJAiZzpyrBWj
+N97yJCa8M48kxWbNnG/a3dFKkuwIzJ/LWg+hsJnymjkvUGa3ozqVbGjLUJGH8qUX
+QgpxwFa+gQ==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 044224b6e6ba9397b537dd081ab5f7bfce2f7f71..c1e71dbd54f39e7c5f542a353dc0a88f4aca9452 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: revoked2.example.org
-    localKeyID: 57 CA DE 55 5C 33 5E D8 CF 37 98 46 3C 41 11 2D 55 7A ED 59 
+    localKeyID: 6F FD 84 51 7D 29 58 BE 22 42 46 0E 0A 49 75 73 93 1F E8 23 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyqia+VIob7UCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJQrhikxhYiPBIIEyD18tAODQt0v
-fHvB0KTDr6/vy+vy+yTnLUgefbqi/yEAm81StZ+o8e82lQewbxTa4Db397OIwbZG
-6hcIqrQTsMIS4E4/7Qg7AO0o32EaQ1OmycN8+/WzVfUYzPfqBTuYw3oyyPtpbDOa
-88Pxm0lkomMZuYrXva/zvgHdO/nwkSv1QrdnsAsx/iw2oNZw+fB4kAfTpT1h13P/
-QcEfdsrHv1TgMcbthoMeZ4Re4V+tcBWwnwmVdOZh8wzlAE1urA+GRcWTA20Mk09r
-FEhtarLszmzBNkHyieE7VtPvOlwRPjCOLqEALCse06pZE5wR/3xp5osRmAfbEOW0
-PVNiIRNV37f/8yJRk86jnXgFBcuXMgZ2U9GEu0AWcQ13zqxnyeL7sKdHHmd7Q4Xy
-nhzhqr8Fp0AfU/3DVix3jYsJAMnXqeoyADXSAv8SoJHWkAUf6W/exnA1PLav3yO4
-tZ7vJJf4Qf0rsgjBLYgOYhD1Hq+ItLjHI+Va/Oyp6HJfsZsOxIdqD2rLYXRr2Q+z
-uDASbOP6H7zt1Co5MfX8abHohRstTPIgV3FI05KoiSqSNevizS8YHUrXcrtwW55M
-9a5PypSfBCaidACBmPEevdxjdCgIJbzg9TWrGa7T+U7Ze1R7XsmWdR5goMcU2ekY
-J5uRLmpHeDYCxCuN8GfQ1MhmtcANwUQy/PAsKSVAqWcUMeMUWg9Y+wIDTyw4CF9u
-R9RspDxam4qz4No3zhmS5iNCS8ZSoL8j5RbrV9HdvZsc4j3fL8LMDhz/llD3S2wZ
-9qsibWyuYUqas/N9MrY9ST8ODsmORGKq/qkCV44MZa2eakAWJMGJSTmVQz/AK39h
-wbQmOX+ZqLQcEoUXFVICYAmDL4inDKhQRU4fp2ABJdktfBN+klMPwoGQc0/if9ST
-woZVIPGH7UnvKtW3jcZxTndIhnXiE/v665+kY0p3w4xwaZSqupbmjFt6VwbpzWem
-trGvJ/5Z+tGJdCBdkZd3v9RUD19U8FL3/O7IEfbcpax56EWPlbpOFXcHTR+7n1bo
-F5AZEGPlP+lyz9KEQmHaFcWHZDLJlNTSiNSlzvugFYnbLhWzzkR2ig/oAUZ9PRU7
-3ZnbeUz11g0Z7TS8JfCeKF04fCewURwK4p9mtcUKWN92wVXW8P59pvZAMyPCXqpl
-uGw8C/zeSff8ScqLk8O3ThAE8Tji52dyUeI1YdNkHuDDAK4ly9L5K/6xiaGOCS8H
-Gx/S8Z9QbCW1ocfk12WmYJO82/GOqvsdSh3dvmwlcN61wRFuMpj7jcbXQXdXfim8
-VBMotE8ffEmKOx5ArxgDVOjAmPwKLXdeEvCTQaUog4DHVVEGEG+xbKV8sgFLHHHK
-QQnLMukDOZso0R5JcCTMrhQLzMYRQyADfd4i0agmzvsF0bs0OBI3rh44whn4rFdA
-RhQMHi2E3C1ldkgDw2PNQlrK12B5359fRlgvgfJB5kw1QP73US7o90dr1c+VV5Ud
-PkAQVcxo6BGbxdjnllKcAo+Go89tdbBjgwfIQ51xQY2KrGre4Jdh7+JTfp0sp5Kq
-0pty6TBJd6GpSl0o7RIelC0Pu+/RmFOfLkNnIyzEBxRChEnp+sfroVvjjK9kNF4z
-wuKsWbo7cGSGZYRr8vLsSQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQII7waJw8w0qECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPDtDHymMHR1BIIEyFusB3a1OxmR
+YQCWJw9S2D/PtICUTqdAFCuM9OEQnkJhWiMJGX0zJhbvisIH1dVvlYXnal9rbdvW
+KBnV/zFPEGWhL24Dmd4oUVEx5N8Z0ER81t+9Bli3lmIt1RsdKIXu/t0TqHS6GctB
+NxZDgGyGkZqvsHu4pDQky3hZKYqvq07rztrYp08msZTfc3iBPbhI9K9bJV5Sgntk
+ts/IiZeb+2eqy43mrG2FZovtDSqgS2lBZG02xfp8uCQ729ERlE0249JpL+V7Eu3y
+/F5UYccCcK0bw0EAtMxMh5WUaoUWqjG0q/np1CTwP8B/ElS1///G07Rmrgulqol+
+7khNgcRgZWqskRZajktUhT3F2P02n1bqlU2KlX1eLNngZQwiHN5XqK23N9Gl2jVx
+I0UpjX5/Jb4LrvWthxlPDvcQAysi8UEhSr8LtTzKRQPbtZtQHaq++orTkeh4QTz5
+T1Ptt9F5zRAAFT5nY21l115ydi7g8luIREFJPbehq5U5saplj8By5Y5p29uemmp/
+XvnpoL7263koUNxz+Wo2vIwBl3GTw6ZLFBrmogzrRtfDXO7FY/uxFreGcyl1mZiM
+mPteFBC7eHPCXrFCSSlmovgsHG+4wHHWgGSNup1DYDbXg9NbNsbRbVH+hdoC4Fh4
+2BgepvTa/TyrKM7/MaoGmO8Poz/g2KYeHNJzcdMSxV3wg/gQeb+9lMV+7ujNuMvH
+Aw1heUkcG2u6HNk6x1WYLBk+oUG83mKfearnTuWgFZywwrmjJxOHweH6iwqcSpyo
+l0qX1E4RIDYsQPyITcg+fjDr7rNDAMq+effM8CzVp5ZkkaRqRqIfOXNpPwiFTvV9
+kbTNCSMFwfY7tjXu0f3ttyP3k1ZrLBWbowm6oISEhcsoQTCY4dPEQv5Vy4UpH+E8
+RWslrdE7lkMj3zdsuyi6DeYGXZ4OSdrMltaoa6v0syacv8EjoNXjEGL9sPJmHni7
+Jt6clkXpycpD8AZjtKswjjSVgu0aCPN9W651e58ufUCzP7UZlkD1bNqw90Qy8/PG
+Kpqx+YmcDlVNXChAC5reMqFEHiRwW6W/j88qf7V7TF9j+LjdJZLCtjTatJx1bxnm
+PI5RgkxcvGCbgM4aYgWMQZwInm5+luu0KzSuxGhbrGH1viiQu1zhgshrSoeW2b6k
+Zvhyc/fFCukQ52K/OpX6msiX42yDSTAGJfkKi38Nm8DImU/R5FYHYilGpBQPmKYW
+tGztF9rfYgm0oRZPly8HXvPQeyO0VMz+/Z9+l67mqAdy8nX6eU74NclhAYT8slKk
++hegV3YOOC8RJyjIP+SlQKF0hbtEy2wWxnEYXuu5CAknvaSa9XbxnswCIdwUm7mH
+j9fl/AfFxZuUxLRCMOJxvTclIEHFO2rxgL4CmACA+FxDJlB64JwyTEL13Cv0rQij
+iwPxQUoAHuFTSzkcqseOEnMABRvYKqsCbmcDFhcgiTATbxxiW32NM6fY1KpAAlBY
+qU7v6KrhYKCGmZDn1PUqiw/flNGWHW+KgkNn3ixRL3Y/V3iVR+zX/RMEHRcQPD7F
+8Tjmm6BhHxqKIqhGQ0M1L/xR3FZIjVhOYlO0jCwYviU1xY66CEieaNoGOYtIlS8p
+ohKoeYGRMyg5Jw2fPffRXg==
  -----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 7d2698cf89c1490f847b2e13f9c2bb9428cb14e0..bc66ba5c576c4c3192f10df1c326f98f0afeb595 100644 (file)

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 fa497dcfc08abf6dc4473c67b2fdfbb1ca23a5d9..9500b05bf1256744c3f3f038ad92840a091a8fdb 100644 (file)

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 8e227f0127969e4d7cfd0129f10ab21252070681..9f9a349d42170c13d6ebb90fc437e4e6f13d2f82 100644 (file)

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 fa497dcfc08abf6dc4473c67b2fdfbb1ca23a5d9..9500b05bf1256744c3f3f038ad92840a091a8fdb 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp

index 4e522e630298c6e6cddb237d98a00da39e1af28a..71f7de3ee4d7f28b55086b5190f3c0889e93ffd3 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp

index c348d386135f87a46ecbf1757a4c27614a05cacd..dd2b545c4d0fdcd1aefa10350adb28911e50de27 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp

index c348d386135f87a46ecbf1757a4c27614a05cacd..dd2b545c4d0fdcd1aefa10350adb28911e50de27 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp

index 1cf57f2df00dcd9021c59b23ea6fea3a13461c69..5ac16260c44e51c776286a7ee687bb16c264a3ed 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp

index f0d1f2452bb114d5837f6c10b827998b8186ea26..3311e87a176a019d853b05dced09b62c16697bdc 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp

index f0d1f2452bb114d5837f6c10b827998b8186ea26..3311e87a176a019d853b05dced09b62c16697bdc 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.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 91f13cfde9f0bfb6488d7336cde59227b2fb6c28..78badeb8476f581944ad669de4b1abaa86f66836 100644 (file)

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 bd775359842baab624e150a7c933bc0c95b0c252..3e65aefd922a840813979f0edbc68b31524b1e69 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: revoked2.example.org
-    localKeyID: 57 CA DE 55 5C 33 5E D8 CF 37 98 46 3C 41 11 2D 55 7A ED 59 
-subject=/CN=revoked2.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 6F FD 84 51 7D 29 58 BE 22 42 46 0E 0A 49 75 73 93 1F E8 23 
+subject=CN = revoked2.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDUxWhcNMzcxMjAxMTI0MDUxWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiTKHqH
-0Sn/I/dG/dktGck3eddMukOMgWFniulbSl3gI2KLF385j+6jiCjqyrqJcxTRr+wr
-XdXbl1gJzEG6zoFt7Wdgsw/oC03/lxqi1tfiJzhKy+zapHOi1KHoT+gHu/LkDFu9
-WINjJ0W+WkBs1zRm2ykkwTcgZzoqa7cZ432v1nw4p0fR1IZvbgL7aac65G3SqpRS
-L3Fho8UWOHwy2zKXdpbHcAGITUWG8c10JbHEkDNKqKaDXprsPOkiMLfe1d8dfGlM
-kpjw8bFD1W9GTcyZVli7PQBGV056AVNzV+zZtxw/LyzME0D7g65g86O7qDqQCvCM
-BLePj7peGA7xKtMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNTMwWhcNMzcxMjAxMTIzNTMwWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbT/zci
+X1lIZsG0kjXlJqALemDAYGQw5i87psjgQ8ax90OtxfvpyZ66xuloz5U78P8440n3
+e7hUMhQzqYrASXKpGe9YMClTW0AIrZG/3dNhvR68H/t8gMFqP8uXRGQMy7kPsqy6
+ahAabvrI0L26Vg23v0LKfVX8LqbCza77UsyZOb3UUpiCQPXQXQ94Wb2V4IjBTLz2
+LX0ssslIHYPkW++sU+eUmTTI1G9VXMcQQ4VXbELPZ+nBKg3hh/I3zQQTh4Cv8435
+ua0fO1ZG3o4IU/U2NFbvIjder8wfo/9BzK5sai8ng/nsB7OyFzxh8hSrOgx+o796
+SdVCdci7wmHb9XMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
  KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAEMjEukLe8FVD
-Hk3k4aG/pc9ilCm6zkko9tFeHIK21EE5xrDbOGkABJx3v+2TguANV3RhNx9JuD5v
-GuBPFzgmC6DY3cE4SnV4CeECpilbLJsIB/xAzgaLVGvVq3HZWi4ASJgksRhqd961
-U9y0Ih27zhZWtYSSyMCe20s7sKkniWGcnV9w3sUccY+RESph+afsaUYH14TUByJt
-uTamJ8SAUQz8b95TLDesDudwUkH+qmp72lri/l11Nj9lFnlzUlP9npX2jc5BFa98
-IOUZ2gkVFGIvv6eJxlEI4nizkDXFMv6OpiGL8O6uKFs3K/Xt8QpwONO+4AcdqZi9
-HTvZbeULpA==
+ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAIB8z0c8pDKS6
+7JbeT/1dpL00BFOHtgEevnq0sakZBKIBDVuOei0JLIwpftsKAAQWxrXkmuLbAdEW
+/KzrSj43eAGOjoNfpvqW96KblvztUbN2iucOHilPDMpXpJrMUslk9na7rhmdyL0R
+N8J3ls35PCJ44DwIF59njnSA9H+et5luph202w7AotbUcj30xItTh7beugcuMuKn
+SwN9MNkOMfQibGXJGWdE/8LR/FG9THclDFnkrl38ds9dXw6ZFY8vYJAiZzpyrBWj
+N97yJCa8M48kxWbNnG/a3dFKkuwIzJ/LWg+hsJnymjkvUGa3ozqVbGjLUJGH8qUX
+QgpxwFa+gQ==
  -----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 a273b3913a26599e1862b94bd5db6f9af2ad3f0e..2cc8e4b602d80bd5177c790f200eff68d5ade3b8 100644 (file)
--- 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,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.org/server1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem

index dd4b26270282c193d1ab288544c4c3ac58dbcab2..fde8b84403a32f0e3fe624e8c870e1d1de06586f 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.org/CN=clica Signing Cert rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica Signing Cert rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-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
+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
-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
+ggEKAoIBAQDWnBT4P/2nkS55UmKN1d5JFOyNDjNqSa6k5nkbaZ4jle8VDI2GKxDb
+ojY6g31ZzmZD+yjFFSN3q7mKQgZdjuPLkuRGAzpCsOGk9u0tqEuQFD7FOoHPzi7d
+tpGdaSbkXYL91yfhwP09Er03g7raHx0sxAmgZul6rkxNZDTCTbPdXxgsb7sv+rNr
+y9pAkpO4cubV+AsFqtvPXGVCOjyUmBwir05ifQhHmMNvsARH4YnCGVOswLtnzD81
+bHuuVYdfiJtCSZWOJFE4fQAUi9GV4pfei3Uw4+fZiY1FL/lu2NOA3048Yxa1j7WS
+R0rnx88xphxUhrLZXjMrfhyny/GHMf4ZAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
  BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.org/CN=clica CA rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica CA rsa
+
+issuer=O = example.org, 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.org/server1.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/cert9.db

new file mode 100644 (file)

index 0000000..5fcb6c3

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/server1.example.org/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.req b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.req

new file mode 100644 (file)

index 0000000..a7cfb8f

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp

new file mode 100644 (file)

index 0000000..d2fbe08

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp.pem

new file mode 100644 (file)

index 0000000..170c149
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp.pem
@@ -0,0 +1,52 @@
+OCSP Response Information:
+       Response Status: Successful
+       Response Type: Basic OCSP Response
+       Version: 1
+       Responder ID: CN=clica CA rsa,O=example.org
+       Produced At: Thu Nov 01 12:35:49 UTC 2012
+       Responses:
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 31bede3e179c33c80b8b72b7e1e0adc35c54333b3a482c086f90d61b87a95ddd
+                       Issuer Key Hash: 9a9f7f9db321c4c3386c9000c796195b802e050003d64d7ad8de89168e73ac99
+                       Serial Number: 65
+               Certificate Status: good
+               This Update: Thu Nov 01 12:35:49 UTC 2012
+               Next Update: Tue Nov 01 12:35:49 UTC 2022
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 6f5e8a1d1ee7f7b156e14e5f256318f0f2ef31c7440c12d789b0b3cc9f1224da
+                       Issuer Key Hash: 0c8b9b6aa3fcb4ad014f1d4ee22cfb498e6958fb2c33505ece667721a41633ba
+                       Serial Number: 42
+               Certificate Status: good
+               This Update: Thu Nov 01 12:35:49 UTC 2012
+               Next Update: Tue Nov 01 12:35:49 UTC 2022
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 6f5e8a1d1ee7f7b156e14e5f256318f0f2ef31c7440c12d789b0b3cc9f1224da
+                       Issuer Key Hash: 0c8b9b6aa3fcb4ad014f1d4ee22cfb498e6958fb2c33505ece667721a41633ba
+                       Serial Number: 41
+               Certificate Status: good
+               This Update: Thu Nov 01 12:35:49 UTC 2012
+               Next Update: Tue Nov 01 12:35:49 UTC 2022
+       Extensions:
+       Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIIC/AoBAKCCAvUwggLxBgkrBgEFBQcwAQEEggLiMIIC3jCCAcahLzAtMRQwEgYD
+VQQKEwtleGFtcGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhGA8yMDEyMTEw
+MTEyMzU0OVowggGAMH4wVjANBglghkgBZQMEAgEFAAQgMb7ePhecM8gLi3K34eCt
+w1xUMzs6SCwIb5DWG4epXd0EIJqff52zIcTDOGyQAMeWGVuALgUAA9ZNetjeiRaO
+c6yZAgFlgAAYDzIwMTIxMTAxMTIzNTQ5WqARGA8yMDIyMTEwMTEyMzU0OVowfjBW
+MA0GCWCGSAFlAwQCAQUABCBvXoodHuf3sVbhTl8lYxjw8u8xx0QMEteJsLPMnxIk
+2gQgDIubaqP8tK0BTx1O4iz7SY5pWPssM1BezmZ3IaQWM7oCAUKAABgPMjAxMjEx
+MDExMjM1NDlaoBEYDzIwMjIxMTAxMTIzNTQ5WjB+MFYwDQYJYIZIAWUDBAIBBQAE
+IG9eih0e5/exVuFOXyVjGPDy7zHHRAwS14mws8yfEiTaBCAMi5tqo/y0rQFPHU7i
+LPtJjmlY+ywzUF7OZnchpBYzugIBQYAAGA8yMDEyMTEwMTEyMzU0OVqgERgPMjAy
+MjExMDExMjM1NDlaMA0GCSqGSIb3DQEBCwUAA4IBAQARki1XnNn4yxzJVhaOy7rt
+7ByNnxidKCshz2AWBEYpDZcduhsEiWOc1EEB+wcmbOCzHwmFggrCpbYV09MRYePV
+ryoZEB6UFzRS80bbXWAfvHJpPT5V9+h1mr3xHapZ0S1zH4iq6xWLu3UFraWaWyfY
+7Z+7SNaqeVoGedP/vseG9v0x8FJhnj30y8qWBsTXU5b6DwrKfQzsZ2l5maBMvE5P
+WKpQizHNu3xNCskiLbsB3ZvlaC7MxmPhunGuM1pmsn0wkloQgKVlVjCT8G91vv7J
+c7BTjSgegx4GH4rn16ohbArl14v/71S/jnVOF0iG7qMj3rwYT4xUy92k9sUMxtHV
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem

index d3ea16bd22a63c1f9154f5b82454298a9a2c6015..bfcec5b59ba302b95efa95cc14c9fc8bbc79f4ee 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem
@@ -1,73 +1,79 @@
  Bag Attributes
      friendlyName: server1.example.org
-    localKeyID: AA 67 16 A4 F2 AF E2 1E A7 AE 32 5C 81 C6 6A 11 21 A7 B3 77 
-subject=/CN=server1.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 17 DE 2D 83 75 29 F8 BF 3B 92 BC C1 59 CE 1A A7 EC 6B 08 03 
+subject=CN = server1.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQwMzBaFw0zNzEyMDExMjQwMzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ4VCSLeZK
-uIieeuAEGz+CB9nyP2c1+nDAexENpSmCXpJUZrN+bwuBp097Q4YR0saKLu8NT4pN
-Lst0UsePLMn4l5idvAkljkidUEdn39qEmEjrLy4jRB/Ht5GnTnP1YwdALrlbU9Xf
-lNCBipTNgbB+ComH3NV8ihBaAJd+r3HAdvTn82dnFED8H2Jzb/W4ewWgMghBvW02
-590vEaSjodm3+lHf2hlJQC5vDEs59B2ct4ADf/gQHbwDENrUnRkd8KR6OVojqqfe
-m/vJetKedD+cCqqZSTQMoojqWAePNhGlbdjwDw1IiQ2B0GGtnYBpIMKD+js2bGGZ
-73XYD80+vQqvAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM1MDNaFw0zNzEyMDExMjM1MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8uLIjw/6d
+iMymfkCovKppiILH7ompGq7fEo47EUG5mbuJROpMXrotnMlV3ymSO6YqQ1tZW28/
+HINAG5GVpavZy4d1lOEpwWjVOpXCMZh01kU4twOQ2WJTLYAqg66QgJuiqloFC3yA
+5Ccy4f5NjcydYEMwpUTTuBkcr6SkaBJ9ysK3sLbw6VeK2cOSdA/atG+azqTuCZmn
+eZZ9P6fOAfW4lcUP7EZTotXrAWffhcfPC7eqpdRE9E2JbFfLPiwjOwcf/kNREMe8
+Kfc4XnHiU2t0BYsBtTmLA0C+AflfiOEtQqJw4Mk3buYk3Mr1cbLSd91ocMguTQAW
+n9+f/5gVs9THAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBngiJh
-bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUub3JngiFhbHRlcm5hdGVuYW1l
-LnNlcnZlcjEuZXhhbXBsZS5vcmeCE3NlcnZlcjEuZXhhbXBsZS5vcmeCCSoudGVz
-dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAOXC+rNyOwjF1OZp4gxOeNQXzx62bXFJA
-EHzxSeMW6rRH4LQZF+YDTwvnHied2S6lWj0+Od6IfVElT/uww1GfN3fZm7pKFwcX
-I14lKRdLAte3BnaRaFke0thP7p+/Nc3VYv5iMBUqT3JRPofGU2DJO1TzLVhr/jG0
-zom00hCzA0SXZT10wHFmz2EpLCUJpEqmtdAC5DdS+sSM+4YI3V37QKrGftVZM7OY
-yMXk+kxTLRcRPWVmXXfYHTyIb6rWWyJYIP52cZCPAVVaWF0xR9mqT1NvEzFl0uYg
-IuHSZmY3gyKna6TcfstrC3eU/6ujL2HjIFajKiX6UXMidHEDeBoi3A==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBnggkq
+LnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5vcmeCIWFs
+dGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm9yZ4ITc2VydmVyMS5leGFtcGxl
+Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAmUKosKL6KrRcmosIz9V+i8AOFN1oTZB/
+hEL16Us/uNmvLrJvUo3oxxhSFU+r6Qaqu0a2V6xArQFBW0VY6FdCH/dGRFhTYKY4
+ll2aL02QWsTQZsgn0HnXimUY7lAdvc0+Ow5VVd5hEq8OR/rlyFQhlg5RiS1Y2OC0
+MbERmo3P2uaQ7wCTp8sggRrxhdztli1d5uoEkL1gRRpjIFEisY1VQeG+4CxH0Pey
+wctLtBwb56Blng+CCqU6sn9s85pCBbXoQTeydyx8ypf9itzwfiGKYkyoyuVJBT9c
+LlgWjnKITc2f+2HttLysbfQ6id6p1fdEg/v8Li/CcTTPUiUv8+tWsw==
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.org/CN=clica Signing Cert rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica Signing Cert rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
-DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQ1OVoX
+DTM4MDEwMTEyMzQ1OVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
  FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.org/CN=clica CA rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica CA rsa
+
+issuer=O = example.org, 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.org/server1.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/key4.db

new file mode 100644 (file)

index 0000000..1715735

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/server1.example.org/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/pkcs11.txt b/test/aux-fixed/exim-ca/example.org/server1.example.org/pkcs11.txt

new file mode 100644 (file)

index 0000000..4d0015d
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='server1.example.org' 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})
+
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 dc4ebdcf9825025a459b48d05b157ecf36343b7d..5b0dca611e0b44694b6cf95bc0e3c7e2c5d77ae2 100644 (file)
--- 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,47 +1,49 @@
  Bag Attributes
      friendlyName: server1.example.org
-    localKeyID: AA 67 16 A4 F2 AF E2 1E A7 AE 32 5C 81 C6 6A 11 21 A7 B3 77 
-subject=/CN=server1.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 17 DE 2D 83 75 29 F8 BF 3B 92 BC C1 59 CE 1A A7 EC 6B 08 03 
+subject=CN = server1.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQwMzBaFw0zNzEyMDExMjQwMzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ4VCSLeZK
-uIieeuAEGz+CB9nyP2c1+nDAexENpSmCXpJUZrN+bwuBp097Q4YR0saKLu8NT4pN
-Lst0UsePLMn4l5idvAkljkidUEdn39qEmEjrLy4jRB/Ht5GnTnP1YwdALrlbU9Xf
-lNCBipTNgbB+ComH3NV8ihBaAJd+r3HAdvTn82dnFED8H2Jzb/W4ewWgMghBvW02
-590vEaSjodm3+lHf2hlJQC5vDEs59B2ct4ADf/gQHbwDENrUnRkd8KR6OVojqqfe
-m/vJetKedD+cCqqZSTQMoojqWAePNhGlbdjwDw1IiQ2B0GGtnYBpIMKD+js2bGGZ
-73XYD80+vQqvAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM1MDNaFw0zNzEyMDExMjM1MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8uLIjw/6d
+iMymfkCovKppiILH7ompGq7fEo47EUG5mbuJROpMXrotnMlV3ymSO6YqQ1tZW28/
+HINAG5GVpavZy4d1lOEpwWjVOpXCMZh01kU4twOQ2WJTLYAqg66QgJuiqloFC3yA
+5Ccy4f5NjcydYEMwpUTTuBkcr6SkaBJ9ysK3sLbw6VeK2cOSdA/atG+azqTuCZmn
+eZZ9P6fOAfW4lcUP7EZTotXrAWffhcfPC7eqpdRE9E2JbFfLPiwjOwcf/kNREMe8
+Kfc4XnHiU2t0BYsBtTmLA0C+AflfiOEtQqJw4Mk3buYk3Mr1cbLSd91ocMguTQAW
+n9+f/5gVs9THAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBngiJh
-bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUub3JngiFhbHRlcm5hdGVuYW1l
-LnNlcnZlcjEuZXhhbXBsZS5vcmeCE3NlcnZlcjEuZXhhbXBsZS5vcmeCCSoudGVz
-dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAOXC+rNyOwjF1OZp4gxOeNQXzx62bXFJA
-EHzxSeMW6rRH4LQZF+YDTwvnHied2S6lWj0+Od6IfVElT/uww1GfN3fZm7pKFwcX
-I14lKRdLAte3BnaRaFke0thP7p+/Nc3VYv5iMBUqT3JRPofGU2DJO1TzLVhr/jG0
-zom00hCzA0SXZT10wHFmz2EpLCUJpEqmtdAC5DdS+sSM+4YI3V37QKrGftVZM7OY
-yMXk+kxTLRcRPWVmXXfYHTyIb6rWWyJYIP52cZCPAVVaWF0xR9mqT1NvEzFl0uYg
-IuHSZmY3gyKna6TcfstrC3eU/6ujL2HjIFajKiX6UXMidHEDeBoi3A==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBnggkq
+LnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5vcmeCIWFs
+dGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm9yZ4ITc2VydmVyMS5leGFtcGxl
+Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAmUKosKL6KrRcmosIz9V+i8AOFN1oTZB/
+hEL16Us/uNmvLrJvUo3oxxhSFU+r6Qaqu0a2V6xArQFBW0VY6FdCH/dGRFhTYKY4
+ll2aL02QWsTQZsgn0HnXimUY7lAdvc0+Ow5VVd5hEq8OR/rlyFQhlg5RiS1Y2OC0
+MbERmo3P2uaQ7wCTp8sggRrxhdztli1d5uoEkL1gRRpjIFEisY1VQeG+4CxH0Pey
+wctLtBwb56Blng+CCqU6sn9s85pCBbXoQTeydyx8ypf9itzwfiGKYkyoyuVJBT9c
+LlgWjnKITc2f+2HttLysbfQ6id6p1fdEg/v8Li/CcTTPUiUv8+tWsw==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-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\r
+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\r
-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
+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
  -----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 989e75afb529be1b849b826416e53d7368b6b00c..841e3ff12ff1a2e622b3589dbeb5fe133efeab3e 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: server1.example.org
-    localKeyID: AA 67 16 A4 F2 AF E2 1E A7 AE 32 5C 81 C6 6A 11 21 A7 B3 77 
+    localKeyID: 17 DE 2D 83 75 29 F8 BF 3B 92 BC C1 59 CE 1A A7 EC 6B 08 03 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIVUraPLS6TKYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDnt3FqESXqIBIIEyM4jReKmUZ9p
-if2qorkrlM3Na1NTeh82QD/JYHd3ThSTS7OcxUxzx/d+EIRuJf4WUvS/9aoFi/nK
-1c2sP0nGKgX0hRx2oioP4CrgbuVKD+XROBEdqIYGahS64exkKXXzhly6nbkD46iQ
-1hLEwoGRWxLOs/Kc3Tchczb2zsg91Wac3wdwTqJ+wJ5WED2PB3s7a/LeroGHrhMT
-sVPSj64WQcGmGo+/pPnLf3ByqqDKVCwl2yPRHqvNAEaej6vQ9gS82BkG63/6w9oI
-mWt8r4Yy1aIIa6lGnAj/L/rxphinjodG1uMMFnABkCtp/9/HAAUV/zmC8SYEhjyq
-qfMPsTLGusOfHFbqrdj05deVdKmJEgeWSADq5mG5flKc2WRZMCzYDS6XZceQ9LDo
-3fB3xUlnOo6vWR7Wp3TwSJIlY6YV/7R6GBsVZ4lrXKdZLMifVLYfAVdoqHqdr0J6
-JWUcc5N00xYzu4e643lo/wfxueqNdxCFClyFLfLILVOaMQYW/n5vScUq0HmVgryK
-2PiOHL5tQGIKr4HUzLJzNGMzk/zU6CAAPc+BxQkresfX9SQiKuRaasmSKsSWefE6
-v1qJp18oOtk7A/a84tUJv9KNsVpG61TSvsgPEck2gijkXJYW+/A/oMaIDfLA+OKD
-/tUQhsLfCvy07XeYNX+aT5i+552o51VbuLYcSvRPNajM21dA5fr+4WTHTKwob/wv
-h5U/DiI/x6xQ9gVriaV1Dhm6mCC+KQFWRFrr7RVg96B4cZ+rV7kX1m53DTY7MQpG
-PVloIjRE+ptoP24WaFOZlbSBjzofRs5reqndoAiZB3E0nqCCZDMyJDXrL9yetRCJ
-k/cZu67Qyj+oK7vWmuVOTgEyiP5wORxi02eEiD6APZqN72OD44U6OcnPLhOnZxym
-uKyNeBSvUtKdKzDkoEF9p42qjcHkzzAx/DN1vG2gDV46TsJygYP4LkyD0PPQ90xp
-NMS9lcY3RukJJMT8vtyG83JayQQHINqmIrz+hlOh1eI8//Ar/1qlj1t6pdepCJba
-/gdVofxQpMrWtGdgQnqK4ylGEUgtph+3LM1nieVNTSdCdFdgxtn04dHBAC4/xCEe
-WwVb2O2laKS5L3MLmMmmlIQRAxlIj1Rw17ZWZZB8pnWgw5FvrrtuVYoslb5UdnG8
-sJWxuzv3lmkSPYd1et6Df4ySz1gjZbjTXr/zRPMEPE3R+VGMrb4cLnomQvHNIZ0+
-jtgkejVLnNgilkIJ8i8+XQr7yDIgkOwqNJmD5B/q0etuM6vDTFIzUBbrAkmMSZCm
-RJI1inOP38xRBCyUDg7XApWBFzePTWHsZPAqB6xB3HEj2lrw+s2yXPTiVL9naxhO
-RrXgM56CeQdTvEA5PXygLzGto4AXHIQSwsZ5TFH55wUFOqbbJWd4I0m6qZWxvhEA
-RokJcRtWf7lHRR1IVc3CxK66EA4sFKvNavP3D1ST9/nAmrRbJg6wp+A4iU1JMeKD
-qQip1S8kTYpSlOCsidd7zX5Wy1T+2O1B2mKNFEDbMlHpeWiQOM69iGWd16uJ8QCc
-BTGuTaBSvX6aVXGLpMHYVEJcCmUZIu03ZJFx8myJ4RKWbuR5mP16R17rd9XNUpDO
-VwfmIBTXUiL7WPXRum9XJQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIody+2ImNnT4CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPYO75R1ACZRBIIEyBLmNfhSiGil
+ECD2/GOV3jmdlMN1B4GbQaYtMnp5C5NwLYCzKoV3K5ZI7wXjSvJzsS6yA0F+WeVl
+6DZaGSzFOts3FauhipteiskZPvbsRecG0b1DRXEAmQM+P8RexwjhHqPdfSsXRWZV
+9L2+RKEpdh1U8uDtSSoGh4tqiKJutX/XDicpIfbBP0hScqZbFwairsko0K+y3rta
+RyIhWfZCWfp636zVn9isJHz67Bn813RIyL8XQJ/G9NGX7VyyHX3pQypClKmCqwdd
+yq4KWbvev2y16k3fcXM76RVy9U1pjnTrQJGQiDF73fzJpOIl+EtVTvOetmBZ1kJt
+9qKeBTwycNkcthDq/u568TTkVHp6UjKkuIoFQuToIFYco1ak1Ts4LetYC/gRYIeU
+zc+q55NVm/G9jjloXgPUi8f12RoQmSATW2CvUIbwixRGTLF6Ddpp7lD/OgqtYA25
+cA1Eml2Hty95emHGRE4VBZtIrVvEnctN0kEFmyOTEOVzHPJx3ohMqib0/FMp6JFP
+LZRFQph8hllsiS4jAIWSNoxTe/lecsfnAyQBuBI+Vlpc1pTsvHVtBhh9uLmjgSHR
+Mvq5hALY2TiM0SAcd4pHOiLwU1jeQYjpU9yMp8LKHQZdrD03INoJTMZs28t/TZwi
+oNsBd/k4T3f9e0NryIen7Tas0ox6Km0/k+5IMGZhBoIV62JFzH0oMpu6FfHTs+Hw
+SIHbuKcT2irVBb5ELOZv+cBcPGgLdV7NNWx8XzUlm9ZogeBDwEUuXKiRoTbcQaOA
+FlAn5n0ZHkTBvOVlPMY6MwIjByB2danTi1HNWrijjJ3n7l9LZgSmyGOLGvQIJNsr
+jCZZ8b96Y0rWhunnZCvfJ64A+i25REwGZoo0AhSoqPjCEQtX2Jt3fe6bAOP52N+r
+UYexDr+AZlI2BfWzxc8WRHDaJHp5ylx2NQQFLhnUjw2K4sujhDQCkQuNqE5c9Bf6
+KmhpZvpf9FlQ1InDhLjzDxtpQ9CZeDaefeELK5yFYL4CDHCPllMxYNcEaQeGgaew
+NXGECylTgSWoKPPVpRtVlwc5eUIVil+7ofzLfj7Q1LqgnpRvUtzoCPQi6kkzjeN7
+7lbPqhU3vgJmznjAIfRW5t9+HK4TQA7sH8XGVYuUHtZkc4uNcCUfVpUD7KMbEAgZ
+qH8efaXgfsCdcEyx9fThp905mh0uXu4+q2B5HOv2yPLgUdrjyLw3ZWSetsXJYGsQ
+l67DhPIqZiC1QgHV2Q3ewJR3im8GTRDrdgk7h4TyqVADYQs3heI2sncIXrkTcBrm
+dM+lvkO9U/vJWnI5oK/5SmRY2rdAcCzrDQ7bdz5YMA/dkRafIHDMOofVn9AjthXo
+8T37fQPHf+O2ljSrGYx1TuSKz/lJ7+iM8idyr53SwuVR2NPMBtI5BAUgnJnb1kuT
+iheaVR89ZZdZLGJaUEXD3DQ/wZhpZjzPmJWeCYeQk8uhBd4BvOI6Plh0bx8ZY5uq
+klUksVrilH4Mf4sm9bRj1PgJDDDQMFelhl3lFs73mcX2W3d000nwlTCQw8bZXCiX
+No3pETdVHck87dS74IqYxU5pXZYyCp8PBK2AnhxjszxSwxEGqnF3rEZnHlR4U67E
+CoFDER0aLIw8M7otOw3EOw==
  -----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 1551b2622cd465863763b7a16e4f921137d896c8..953800adb3460f715a8e1dd05f6997b723662fdc 100644 (file)

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 2353fe55ef6437bd2e0d8b24aa2d5c35b1924f5f..c552c580f6cb6775d2d839ec7cb1cdecc7ec3624 100644 (file)

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 fe29c1acbc5b90495a4be7b596f8549a6cce9fb3..7cf8a4e9edec9c29710cbd01c2858b80d739fff8 100644 (file)

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 cf3405a298c867f2f8867215d4edca8fc59416d5..8afbc22c17598c1cd56273c554f56c51b4bedd43 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp

index e8bcc07072e8a86f1a89970d442c5b2f9f96713e..3d3378e9850994d8b687c78f8c3f91b83c5cac2e 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp

index ff179285fdb2c42368c8baef210ce43acf9ef590..087b6ea214fa621e361c79a4a143db4f92243b4e 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp

index f56bad77ba14ee10009305a9aba731e68ecbd6b4..a989fdf648ce3578cdd03d08906e313abcffa45b 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp

index 560da6e1ee4d4c75875e20412c1fb5c03ea8f5fb..76f57212e68d1a0a9cd3cde7f2f28e8c695f3868 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp

index ac9da6065d26df0e0868c456f3bca347ebdfd195..1611cd7fc22c8a36018fbfe414f9f5bf75d6b60c 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp.pem

new file mode 100644 (file)

index 0000000..4885d96
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp.pem
@@ -0,0 +1,31 @@
+OCSP Response Information:
+       Response Status: Successful
+       Response Type: Basic OCSP Response
+       Version: 1
+       Responder ID: CN=clica Signing Cert rsa,O=example.org
+       Produced At: Thu Nov 01 12:35:49 UTC 2012
+       Responses:
+               Certificate ID:
+                       Hash Algorithm: SHA256
+                       Issuer Name Hash: 31bede3e179c33c80b8b72b7e1e0adc35c54333b3a482c086f90d61b87a95ddd
+                       Issuer Key Hash: 9a9f7f9db321c4c3386c9000c796195b802e050003d64d7ad8de89168e73ac99
+                       Serial Number: 65
+               Certificate Status: good
+               This Update: Thu Nov 01 12:35:49 UTC 2012
+               Next Update: Tue Nov 01 12:35:49 UTC 2022
+       Extensions:
+       Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIICBAoBAKCCAf0wggH5BgkrBgEFBQcwAQEEggHqMIIB5jCBz6E5MDcxFDASBgNV
+BAoTC2V4YW1wbGUub3JnMR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNh
+GA8yMDEyMTEwMTEyMzU0OVowgYAwfjBWMA0GCWCGSAFlAwQCAQUABCAxvt4+F5wz
+yAuLcrfh4K3DXFQzOzpILAhvkNYbh6ld3QQgmp9/nbMhxMM4bJAAx5YZW4AuBQAD
+1k162N6JFo5zrJkCAWWAABgPMjAxMjExMDExMjM1NDlaoBEYDzIwMjIxMTAxMTIz
+NTQ5WjANBgkqhkiG9w0BAQsFAAOCAQEAW4fJ5Sf1n+huaEmCVH9DjYhwBZ44aPiv
+XSUqAYKsGuzSt0vGqdmBRBLqpTZ7tY3togs8DTY0P6bdls+ijarfHETrIMHPbwDX
+QiYy7WM5KZztOFcbWCq9w2bUZo4LcUU1mtqEnqmnYpyEbGWTinjBidYapPEazGyV
+Yt0PbQoqvt9PAQU6ppEgsuyVMIZmn/zXS6rQUBrwZbgoytiWsHQ8IbQwO9DBdniK
+mHfhzUjXkAiLfT7CB6kMmH54f2R7BmZPlMhSPKKdUgRMCuFaeVqgVTQtIAbA58c8
+Yc1ECe/7PvyNqpj1WNbTBdzvxoc57eEIEC8WbBXXnlPHgUrPsE3vUg==
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp

index ca670977e004e90d30130e380c647e6db5076730..a7f02790f6d29b16d041516eda790a47ec4fa0de 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.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 6910e47b207d75242c3c2f07a708af6d1e59155e..01b655eee448794751db006dc0b28f69e0e588ee 100644 (file)

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 e9e31faca826cbdef030843c7f5415d32f84e543..6634cfe7744d6c8b23e4aeb09f12d8d6a8efc755 100644 (file)
--- 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,28 +1,30 @@
  Bag Attributes
      friendlyName: server1.example.org
-    localKeyID: AA 67 16 A4 F2 AF E2 1E A7 AE 32 5C 81 C6 6A 11 21 A7 B3 77 
-subject=/CN=server1.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 17 DE 2D 83 75 29 F8 BF 3B 92 BC C1 59 CE 1A A7 EC 6B 08 03 
+subject=CN = server1.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
  cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQwMzBaFw0zNzEyMDExMjQwMzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ4VCSLeZK
-uIieeuAEGz+CB9nyP2c1+nDAexENpSmCXpJUZrN+bwuBp097Q4YR0saKLu8NT4pN
-Lst0UsePLMn4l5idvAkljkidUEdn39qEmEjrLy4jRB/Ht5GnTnP1YwdALrlbU9Xf
-lNCBipTNgbB+ComH3NV8ihBaAJd+r3HAdvTn82dnFED8H2Jzb/W4ewWgMghBvW02
-590vEaSjodm3+lHf2hlJQC5vDEs59B2ct4ADf/gQHbwDENrUnRkd8KR6OVojqqfe
-m/vJetKedD+cCqqZSTQMoojqWAePNhGlbdjwDw1IiQ2B0GGtnYBpIMKD+js2bGGZ
-73XYD80+vQqvAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM1MDNaFw0zNzEyMDExMjM1MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8uLIjw/6d
+iMymfkCovKppiILH7ompGq7fEo47EUG5mbuJROpMXrotnMlV3ymSO6YqQ1tZW28/
+HINAG5GVpavZy4d1lOEpwWjVOpXCMZh01kU4twOQ2WJTLYAqg66QgJuiqloFC3yA
+5Ccy4f5NjcydYEMwpUTTuBkcr6SkaBJ9ysK3sLbw6VeK2cOSdA/atG+azqTuCZmn
+eZZ9P6fOAfW4lcUP7EZTotXrAWffhcfPC7eqpdRE9E2JbFfLPiwjOwcf/kNREMe8
+Kfc4XnHiU2t0BYsBtTmLA0C+AflfiOEtQqJw4Mk3buYk3Mr1cbLSd91ocMguTQAW
+n9+f/5gVs9THAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
  Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBngiJh
-bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUub3JngiFhbHRlcm5hdGVuYW1l
-LnNlcnZlcjEuZXhhbXBsZS5vcmeCE3NlcnZlcjEuZXhhbXBsZS5vcmeCCSoudGVz
-dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAOXC+rNyOwjF1OZp4gxOeNQXzx62bXFJA
-EHzxSeMW6rRH4LQZF+YDTwvnHied2S6lWj0+Od6IfVElT/uww1GfN3fZm7pKFwcX
-I14lKRdLAte3BnaRaFke0thP7p+/Nc3VYv5iMBUqT3JRPofGU2DJO1TzLVhr/jG0
-zom00hCzA0SXZT10wHFmz2EpLCUJpEqmtdAC5DdS+sSM+4YI3V37QKrGftVZM7OY
-yMXk+kxTLRcRPWVmXXfYHTyIb6rWWyJYIP52cZCPAVVaWF0xR9mqT1NvEzFl0uYg
-IuHSZmY3gyKna6TcfstrC3eU/6ujL2HjIFajKiX6UXMidHEDeBoi3A==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBnggkq
+LnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5vcmeCIWFs
+dGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm9yZ4ITc2VydmVyMS5leGFtcGxl
+Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAmUKosKL6KrRcmosIz9V+i8AOFN1oTZB/
+hEL16Us/uNmvLrJvUo3oxxhSFU+r6Qaqu0a2V6xArQFBW0VY6FdCH/dGRFhTYKY4
+ll2aL02QWsTQZsgn0HnXimUY7lAdvc0+Ow5VVd5hEq8OR/rlyFQhlg5RiS1Y2OC0
+MbERmo3P2uaQ7wCTp8sggRrxhdztli1d5uoEkL1gRRpjIFEisY1VQeG+4CxH0Pey
+wctLtBwb56Blng+CCqU6sn9s85pCBbXoQTeydyx8ypf9itzwfiGKYkyoyuVJBT9c
+LlgWjnKITc2f+2HttLysbfQ6id6p1fdEg/v8Li/CcTTPUiUv8+tWsw==
  -----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 eba8107ef439be67639bd0604e71ad15f7e23e8b..7dc4924fb90ead6a6a962f331f369bd8fd84bc55 100644 (file)
--- 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,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.org/server2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem

index dd4b26270282c193d1ab288544c4c3ac58dbcab2..fde8b84403a32f0e3fe624e8c870e1d1de06586f 100644 (file)
--- 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
@@ -1,45 +1,49 @@
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.org/CN=clica Signing Cert rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica Signing Cert rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-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
+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
-ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
-AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
-oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
-8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
-UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
-BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+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
-CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
-q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
-jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
-f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
-d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
-KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.org/CN=clica CA rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica CA rsa
+
+issuer=O = example.org, 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.org/server2.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert9.db

new file mode 100644 (file)

index 0000000..23f43a0

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem

index f2da6a25afd0edf108828ae5a50c998eb393ecec..350816e5f486e24ca7e34a9fd11a3aab47e6ed0d 100644 (file)
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
@@ -1,72 +1,78 @@
  Bag Attributes
      friendlyName: server2.example.org
-    localKeyID: 16 09 2F F5 E9 1D A9 61 59 C1 26 78 41 9A 8D 57 2D A7 07 B2 
-subject=/CN=server2.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 76 9C 33 9A 08 88 6E 90 9B C5 73 81 14 15 B0 78 67 30 2A 80 
+subject=CN = server2.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDQ2WhcNMzcxMjAxMTI0MDQ2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoqNsFYd
-wEUPKC1Y14NetR8APh/ZU1Sg7LfHGffibiV4Ofwsvgtl9k4tb4a4EsUDGSfPdDMz
-33QaPb3Q4Z1AbZd2I9G44Vga9OevuCxw/2/F2E4lIgRfA/kMhixmjFlAdXDpxdMy
-nCVhXGy2q/c0Z1pdIGvls+pEhbokUW//Kzb1b9yM+cal761nYECYD8Gmj4sGemSl
-+cEbYY7j77AGuytW4wxXXCV+aJ7CTfIEt3TFy6J3/1lOlTduMeeEx/vh9X5wSRJf
-prAWAG1m1jHTjCZA7npMbeYJ6PbCTLe9qPQf6ygZCTr5Dhvam7z2qgzwQQ8Uex7N
-+Dc/4WDHs46sTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNTIzWhcNMzcxMjAxMTIzNTIzWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4COyeJMH
+osPMPoRm98H0RwtfstOTnN+Cmjg2ONNC8DsuI9faJf93NXcRS0ohfCULJhIOVM5P
+R4+SjscsdUltDr6mgPU4izDHTOhXo22F40B7OG2NXbhgj7B+42nfUfBCERltnCa5
+DzJoaxKqlayUz6GMXmR+0MkzumhlxXT13YWXatj8j3sNQBjsBvcDqYPOJ95TfH8h
+SNGg2N9AR3xFT+SPyHQh77fbviYPeK9B11H0OFrarUcMI8W1Vfm6etJ2IzdSt9SU
+m+ysmonTSwoqWGPYr4O8i1pW5qGvVd0fY6huJAHnhkk4MreQFbzVid0uAjGi9Oia
+t00MOVaOcpjT9wIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
-UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMTDGNsaWNhIENB
  IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
  LmV4YW1wbGUub3JnLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUub3Jnggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALWZSoyPvTMkyTFZudkvqgCfXv1X
-nti4C9oRi03DotRo3Vbgl+D7y0QLKGMPZFTWp8jStwmzoQTWrpMIk+boMJNHncTU
-4Aw9GeaKr93s226W74p9kEo4MJ2H7w2mozJvOGz1ZUU5u5+1kfgZbkH27HxPvyCJ
-mbT1lssbZdbyXlpa0hJAnMuClrNtpe4Tdz6vFScH7vpcT0UZL3c9GDN78144uP8T
-VJWbNYLkfeTkStqcwvUDwQsrvN0wrj+fj5+u7e8o0Om9nERe/huW3HhZb8Zq0spI
-SVsXg2sGevkVEcgZC8o4OQ3fYwSFVl6cUSXzu2lgOZBMIrB5dcFAwgnWbVg=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAFA/CN192s5flZm75Sq81vZQMwZ+
+OXfOAHTznzwdHulBHQp+3Ifx9IrVrOCTl1QCwGD52oTX4xSsC0xrFCooOjlgq07T
+/EggGdUU5QU0vjuxSOEHHApoxk9vPbGiCPZpE4KdAXAQgCDCqb0HDhaMTHh3gwgX
+2nr2RzUIsyZnBsXxPsysXuYROP2pRUNuPsLUC7ZbxVE4N5pXH1y4Y0e3d9AlYNJW
+Bp1F9vHHcJT9k0WxGka7WZEkm6zFc7sWGwOElTsrmb1Tp1VKYMH2vR9HIhD6ajrY
+hIXNKM58oZJR4husQCz2Xw5CrBiXTHwQGdRFXyCvMZ3ZtmCozOewDPEADyc=
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Signing Cert rsa
-subject=/O=example.org/CN=clica Signing Cert rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica Signing Cert rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQ1OVoX
+DTM4MDEwMTEyMzQ1OVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
  FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+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
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority rsa
-subject=/O=example.org/CN=clica CA rsa
-issuer=/O=example.org/CN=clica CA rsa
+subject=O = example.org, CN = clica CA rsa
+
+issuer=O = example.org, CN = clica CA rsa
+
  -----BEGIN CERTIFICATE-----
  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
-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
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQ1N1oX
+DTM4MDEwMTEyMzQ1N1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7Z
+0JJrUhfkdnD1fyhfBhG1u+2TFTHPkTwPh0/ktT7R4M+B3nJyWRjSBAgUgGN5QsCd
+FQIS/6yCp9HPhieHhnSeB8WkG7HKezv47PNys908KbMh6EZ16GgPQnFbbEb6laQg
+5V5mcRF3p8z5vaIwaHIjW6kvs692ne/gUCh5Xu0dVk/EUmdTeMQSQBRfZHDb17gQ
+aOXluwVhPL2YJbjrQNjKTAhDyEleYNNSnITwq4thFbspJ48G+S+n4/Xi89TRj8jB
+OJAP9PuRbnXevfMeLvqo3N/UNJRmUO3O/dU6RFQw9ib0L3tsWznud8Y0EtN40tBC
+qrHCp2kEEnkOoq8ry/ECAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAvLWPfh92+Dqk69bWz6qYkJ
+kNR3y9mWjrzIMPVwKV2RPoITmpUE7bW9S8OfaoZr4Ouv7V/IxcyHf8ub1m/obe6j
+V4zWHMFNFH1StEysZ3G7vVMc+uNy4NulCNspl2dSORYYlOL7ZqwMoKGwMfVb9zhN
+qPPROP5j/LWv2caKjjUCxZaQM155CFfEuZCKfvpLpDXqwIPqNj7+JJ9+XMm3xu/5
+Y+zINWXdz8BetjxWwhfdR5xrrYncPNkHNBZFBceVkW+X/WMC3zplOWn7EsGceS6S
++fyQTXSaOJjTm2a/N6No1y6L/Hb33VP3Gole1MHfbiihlHcFy+cUzSInWWKzy0o=
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/key4.db

new file mode 100644 (file)

index 0000000..d0a9bbf

Binary files /dev/null and b/test/aux-fixed/exim-ca/example.org/server2.example.org/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/pkcs11.txt b/test/aux-fixed/exim-ca/example.org/server2.example.org/pkcs11.txt

new file mode 100644 (file)

index 0000000..0ef0ca2
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='server2.example.org' 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})
+
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 e2613add4473fff7d6d005f2151dd8186cd7ff51..446e8d20fd77528ce804f4625ccc32c91c8c3db2 100644 (file)
--- 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,46 +1,48 @@
  Bag Attributes
      friendlyName: server2.example.org
-    localKeyID: 16 09 2F F5 E9 1D A9 61 59 C1 26 78 41 9A 8D 57 2D A7 07 B2 
-subject=/CN=server2.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 76 9C 33 9A 08 88 6E 90 9B C5 73 81 14 15 B0 78 67 30 2A 80 
+subject=CN = server2.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDQ2WhcNMzcxMjAxMTI0MDQ2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoqNsFYd
-wEUPKC1Y14NetR8APh/ZU1Sg7LfHGffibiV4Ofwsvgtl9k4tb4a4EsUDGSfPdDMz
-33QaPb3Q4Z1AbZd2I9G44Vga9OevuCxw/2/F2E4lIgRfA/kMhixmjFlAdXDpxdMy
-nCVhXGy2q/c0Z1pdIGvls+pEhbokUW//Kzb1b9yM+cal761nYECYD8Gmj4sGemSl
-+cEbYY7j77AGuytW4wxXXCV+aJ7CTfIEt3TFy6J3/1lOlTduMeeEx/vh9X5wSRJf
-prAWAG1m1jHTjCZA7npMbeYJ6PbCTLe9qPQf6ygZCTr5Dhvam7z2qgzwQQ8Uex7N
-+Dc/4WDHs46sTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNTIzWhcNMzcxMjAxMTIzNTIzWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4COyeJMH
+osPMPoRm98H0RwtfstOTnN+Cmjg2ONNC8DsuI9faJf93NXcRS0ohfCULJhIOVM5P
+R4+SjscsdUltDr6mgPU4izDHTOhXo22F40B7OG2NXbhgj7B+42nfUfBCERltnCa5
+DzJoaxKqlayUz6GMXmR+0MkzumhlxXT13YWXatj8j3sNQBjsBvcDqYPOJ95TfH8h
+SNGg2N9AR3xFT+SPyHQh77fbviYPeK9B11H0OFrarUcMI8W1Vfm6etJ2IzdSt9SU
+m+ysmonTSwoqWGPYr4O8i1pW5qGvVd0fY6huJAHnhkk4MreQFbzVid0uAjGi9Oia
+t00MOVaOcpjT9wIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
-UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMTDGNsaWNhIENB
  IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
  LmV4YW1wbGUub3JnLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUub3Jnggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALWZSoyPvTMkyTFZudkvqgCfXv1X
-nti4C9oRi03DotRo3Vbgl+D7y0QLKGMPZFTWp8jStwmzoQTWrpMIk+boMJNHncTU
-4Aw9GeaKr93s226W74p9kEo4MJ2H7w2mozJvOGz1ZUU5u5+1kfgZbkH27HxPvyCJ
-mbT1lssbZdbyXlpa0hJAnMuClrNtpe4Tdz6vFScH7vpcT0UZL3c9GDN78144uP8T
-VJWbNYLkfeTkStqcwvUDwQsrvN0wrj+fj5+u7e8o0Om9nERe/huW3HhZb8Zq0spI
-SVsXg2sGevkVEcgZC8o4OQ3fYwSFVl6cUSXzu2lgOZBMIrB5dcFAwgnWbVg=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAFA/CN192s5flZm75Sq81vZQMwZ+
+OXfOAHTznzwdHulBHQp+3Ifx9IrVrOCTl1QCwGD52oTX4xSsC0xrFCooOjlgq07T
+/EggGdUU5QU0vjuxSOEHHApoxk9vPbGiCPZpE4KdAXAQgCDCqb0HDhaMTHh3gwgX
+2nr2RzUIsyZnBsXxPsysXuYROP2pRUNuPsLUC7ZbxVE4N5pXH1y4Y0e3d9AlYNJW
+Bp1F9vHHcJT9k0WxGka7WZEkm6zFc7sWGwOElTsrmb1Tp1VKYMH2vR9HIhD6ajrY
+hIXNKM58oZJR4husQCz2Xw5CrBiXTHwQGdRFXyCvMZ3ZtmCozOewDPEADyc=
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  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\r
-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\r
+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\r
-ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K\r
-AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3\r
-oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ\r
-8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W\r
-UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n\r
-BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB\r
+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\r
-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
+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
  -----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 bc320c98690e12b8af078442b5e91034f356a4f4..683da19972c48cc4500f495f8f239b8893dfa849 100644 (file)
--- 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,34 +1,34 @@
  Bag Attributes
      friendlyName: server2.example.org
-    localKeyID: 16 09 2F F5 E9 1D A9 61 59 C1 26 78 41 9A 8D 57 2D A7 07 B2 
+    localKeyID: 76 9C 33 9A 08 88 6E 90 9B C5 73 81 14 15 B0 78 67 30 2A 80 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI58WO+KpH9e0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECA7LYIB/AG+uBIIEyDCzuAftHS9A
-Ez1wGhDFtGZvZUAKc2CeDQE2TM0hZe3VFgCho9HlePTHoWIeo2drHBHevjcs1aK2
-6nCHhKjc8DUpCYi8Gz/nvxp/s9/NvmkF+9Ds9vB8XtijtyM8rTP98p/8VhPD6UMt
-DxPLcM2CDMhVwRpi0JcKiFG9Hieio8wYwMx/TPcvNLmAKyXhdsqGBsAOA2QCjBkx
-ONBwctfaJrE6Ap/WCCTcVeC0zJiUd1a+76mJZoJs5qir7uwWaMoJIRQEp1afjh0U
-aF1jgdgxZK/T1NpoUzXK2rYiLjSeFdJqduoVkmfThyJbVnBeiI7OHDnP8geMh5rw
-qLEImNwSFI3UcOxWuOODrJ7Nf2GjO51/1URCficvHtFRjAB/b1mbwpXlnjrQtfs8
-iXA+t1ahbLdTj8ynFA2IjSFZTf3NpakFUy19TL/adA/3FdqPVIWJgxf4oXwQ7X+T
-+VHyEO9TfrD2eFwTG3j2fbSMA5UX85ZDjxaEt2Jcm8VK9TNTciipSlmY+MCCqyFw
-tiEM0ZNxD5e24lAWC8+QtaMVIBJLzwjuVsLs46r8d9a8IcH+NN/ALdQ9KAYw0Iu2
-kSzMc3vhJAzId9e8nsfG4kNtJA/vI/TlcQhhzQqHcd67BwrOdElLGuvqPtMpb6Ow
-m3KPFny9iS0zXY1X6bHwRA14xhb9vDlPl6TOiVIUV1laE6NoAeEVc3Y5uWve4yBL
-1y6lSTnlT5paVwChmc6TwdkUyUBcooUQBJx2Sz1n0eE1y/76z23QsiOpQFE6qIDP
-mECduvBqHpulYwqroAScGQTXPCy3uRPmtUM/KYie6q/7x6lY675+gPUOyypz8/NC
-gqj53s1lD4ABQmBfrOGIXTbqO5E5gswIXPVZYTMvMMxuTQYA9E7C8Zf1WupTQUd8
-Ly+9Yxk4hpnTE3XmPAKFFMuTwDPsjeOhMk944aCFDVydy4Rkc+Nt/u2BYY7wbPS0
-i5EEiVE2sHzFnRWaRnASG+bxvJhRy2Ie9jlrzlECXUWWbDBYz09rB6LSiYD6re0O
-OuWv9eHUe59UMjP9XmzjIsz95kJQ15fmTS62VK5hhkmfr8/RD3Ng/W0/baFbHdBa
-83M/OWEIWnxotwuoArLiHBRv9uyjFhfeEepD8QTNt3N8NfYFxXVkSbRR4WvLpAGe
-PBM7US0Le49TY5+h+cD96ZrrSvywEOJ271NUqcq9dzpyARwATwJn8otfXGnVrGMg
-gnMB6Tfc39WwsRkvPI7+IEBnhKzDOENXYeQoyITaB+1nGGu4nEM/LXINCDBj9+Xz
-UijPLCQFS4cKBc//89U6dxcBo24tCtF2Jn8/pldqt72OrMjqSlUTUcYDnqnM1Gdp
-1igP1y/mJ2PIB6hiUHGl5jU42zgdAXBAEXPeBBSwM8sZOcoamK81SDYbQOOCpudy
-j5OB9GI7sAIbBI9ei4HrgRMesZ32tVJaOkiY7coYBtmaY3OJcV+9mleT4XAHd8UZ
-olJ4dVzmbGM/mzFgsAgAAYaUMqWYVXcUDc9Xv1BGvraP8bk0bZD5Xk73ddk6WLCQ
-eoJygPXAEhqe+fz3FCDDK04tpgBT3fj2b4yLVy2Myn17AxmeYh27CEbCbU7GLhvL
-C+z80l9iGa0PLSZV2tT5+w==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI6AD4VcCdnswCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBSApTfnjyn7BIIEyAXT+2Lzdf+x
+Igo9UgtCyHH5Sun/rJB+pFsosMzWBqotdDy7RXVlTCglx2iHlUvbB475CpOuZdkM
+dfvKJf4W23865g3Uh+6oJxsRBxYJ6GxQ3nNCPm4M1f0SiFboByhaml/FHTLFaUNB
+3WuLJXz0aywW5XLXGt8T8yfiDCTobTfs+0a0a3oVRc0qF8Gc5Yp6katVfBvag2Uc
+XJTI8hYsTiq4lZfQ6Xt39cYOCzFh1x80QutFlvq4Zd+Yfrtnby6uyg+lSneHPSCZ
+7GnAz6BKVtsdhRSEsle3mLIrwPVYzFoBzCN6FgEgUMb5j3onPuezp80aPLxHbBvd
+ieVhDF99Q6LxwB86ai3ka4Hpc9NURTzdTSTqpIsYkHXzKJ3Y2bk8ayt5hI0SQJ+x
+OmhuNIf9ROurWC903MDpxfoHwRVvL4B1Q47g05nG37tZQHpwvD8+Tg29sMy2/t+I
+XJfcqwFYUyhUZxQ5uB89aLlJp+H9h5grj1/A0zEfqf9tgGsrZc1CcwG7x6MPeRXH
+pgDvUaQzveIwo3yol6QPBZXHJuJ7N808xpl6pkzxA9BM7UWdWnhj6kg3FnWL4dai
+wJ0PTsd0tR32zSnNMXUZ4sBvn0QvDA2Zc1EbPu6K5ShFwJ+FQKRJ4ymF9lzO3PDc
+1nmZRTRtQ4IsBIsul+dQUurIc7Zy9cl/UgBsyqqUdaKq4dxMgScyAaAVmTVrrGCc
+bahsjNcQsXIGjGUnF6JKK4aDbDQyZA/KPxNo0JzCJb4DJ1ZponYXi0d1/xaq4IKm
+GwQY05fj6l+MB/AGxQxJbsJGR8cE4LfhGHKKMm0yx44YkvFnMDtiXjLahJRIOyRP
+gJ9psw+JpNmceUwJ9iqokAK8FWW9uo5h1kZA+Frk4OVVujgolNAmTuN2OGmCQCvJ
+/vTxPJ5G3MxFYkbQyufHleL8SavTnnvUn8PXbxr3ldhKqgVm60jA6rI7bOzMN1Mu
+ppuMKDOwSY6U8z7Zwiw9/WXmOlDomwW3O+/ZIeOujq4jLmTSBZaFaifJ6rQvVVFk
+Xd9NolWqYElwly7DUm3nBIqw7WHS+nFtQnzC7XF6LkLdM0S8KNKHMdqm3XwGQkDV
+SClbeJoijPoynqOw5y86ebeZWiWOzThbGUn+qwjkmOvVzndf/QJve1KS8niFEGru
+TzbifCZbneunV2JYcw/dEFhtZukc9os/BcCt7XF2CSNgXdOy2FwX6mYeg8Pzv1Dc
+8wxl71pEGLvN6U672nerZrvG7yguEWXpz5K/A5FVY7bfonQbgDMhqvsyDQRHd+qr
+1DxzpE3GsCfIl/9mtXzPxdJw51uzEOj9KRVr6yyCmPufxp6QDyQuOb1E+VLBpDt0
+PimlnX6Qnejk4dyAoqfAH8HqaDOvi8Xe9UVJIx+hVcujwaXBPvgHv4TEoipRmXhc
+lWttlWqJ6wElNwQPYqbmMSJ15dt83xVN1N2/26sOAao5xc5xT+xcFf7LdlFCtJxm
+lSaxOH6IIKUDjPqSbem9luY3cLym0YJyq9vgZi6zY7RiA+ChQ58GsF11AFOTGxBt
+2QqWTYq2sneh3A1nrvjdhtAzJOQyYafhtsQEJ3JXHF0dj/KnAaSdPyhJOBWoc6DU
+LOWOv8gr/bjsBU+GDMbyCg==
  -----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 d6801a6c97a76df52a25283f9761b489a38092b0..4cdbc620be66baa3735b6a580611548a5f816d41 100644 (file)

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 82e98d075dabe7e9499ebcf350a8e8b5becb9ea3..829aba8cf44824d74a92a171fa998eef3493fbce 100644 (file)

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 2e151ae572be5d6a59406db3f42170936d11eced..23718855b34851913abbb26a96eb037408757b1e 100644 (file)

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 82e98d075dabe7e9499ebcf350a8e8b5becb9ea3..829aba8cf44824d74a92a171fa998eef3493fbce 100644 (file)

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.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp

index 64bd4251723e0a0d2ed786b421e4798b5cb0bf34..447d55c158ba82be4dea6bddbac379cda5f8d251 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp

index dc4abfeef9971ae57a12f096731a6e91b8705813..4a5283f05820d7bf57be2885c9569dab40a59d89 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp

index dc4abfeef9971ae57a12f096731a6e91b8705813..4a5283f05820d7bf57be2885c9569dab40a59d89 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp

index 126b0cb2e909f08ceb4cb00c36eeaf977d063881..938f38eb9604b364d36fd25f9564e8d52e710738 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp

index 45458b9c62fd46222bf8471b8a2b0923f8b3b675..a64ad6737cac29043487736591dfadddbc7ff528 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp

index 45458b9c62fd46222bf8471b8a2b0923f8b3b675..a64ad6737cac29043487736591dfadddbc7ff528 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp and b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.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 d0504925e6286d5c209ead3ffd3797a17dd7ce9c..9fb73fa3f66cc660fcf14b6a829bd15a851391be 100644 (file)

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 6ad0da08867f94201b38627aa3e43b50cbbaf2c7..2fc1c50bad11c781e44db84570548f56ead0cb09 100644 (file)
--- 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,27 +1,29 @@
  Bag Attributes
      friendlyName: server2.example.org
-    localKeyID: 16 09 2F F5 E9 1D A9 61 59 C1 26 78 41 9A 8D 57 2D A7 07 B2 
-subject=/CN=server2.example.org
-issuer=/O=example.org/CN=clica Signing Cert rsa
+    localKeyID: 76 9C 33 9A 08 88 6E 90 9B C5 73 81 14 15 B0 78 67 30 2A 80 
+subject=CN = server2.example.org
+
+issuer=O = example.org, CN = clica Signing Cert rsa
+
  -----BEGIN CERTIFICATE-----
  MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
  bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0MDQ2WhcNMzcxMjAxMTI0MDQ2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoqNsFYd
-wEUPKC1Y14NetR8APh/ZU1Sg7LfHGffibiV4Ofwsvgtl9k4tb4a4EsUDGSfPdDMz
-33QaPb3Q4Z1AbZd2I9G44Vga9OevuCxw/2/F2E4lIgRfA/kMhixmjFlAdXDpxdMy
-nCVhXGy2q/c0Z1pdIGvls+pEhbokUW//Kzb1b9yM+cal761nYECYD8Gmj4sGemSl
-+cEbYY7j77AGuytW4wxXXCV+aJ7CTfIEt3TFy6J3/1lOlTduMeeEx/vh9X5wSRJf
-prAWAG1m1jHTjCZA7npMbeYJ6PbCTLe9qPQf6ygZCTr5Dhvam7z2qgzwQQ8Uex7N
-+Dc/4WDHs46sTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNTIzWhcNMzcxMjAxMTIzNTIzWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4COyeJMH
+osPMPoRm98H0RwtfstOTnN+Cmjg2ONNC8DsuI9faJf93NXcRS0ohfCULJhIOVM5P
+R4+SjscsdUltDr6mgPU4izDHTOhXo22F40B7OG2NXbhgj7B+42nfUfBCERltnCa5
+DzJoaxKqlayUz6GMXmR+0MkzumhlxXT13YWXatj8j3sNQBjsBvcDqYPOJ95TfH8h
+SNGg2N9AR3xFT+SPyHQh77fbviYPeK9B11H0OFrarUcMI8W1Vfm6etJ2IzdSt9SU
+m+ysmonTSwoqWGPYr4O8i1pW5qGvVd0fY6huJAHnhkk4MreQFbzVid0uAjGi9Oia
+t00MOVaOcpjT9wIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
-UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMTDGNsaWNhIENB
  IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
  LmV4YW1wbGUub3JnLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUub3Jnggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALWZSoyPvTMkyTFZudkvqgCfXv1X
-nti4C9oRi03DotRo3Vbgl+D7y0QLKGMPZFTWp8jStwmzoQTWrpMIk+boMJNHncTU
-4Aw9GeaKr93s226W74p9kEo4MJ2H7w2mozJvOGz1ZUU5u5+1kfgZbkH27HxPvyCJ
-mbT1lssbZdbyXlpa0hJAnMuClrNtpe4Tdz6vFScH7vpcT0UZL3c9GDN78144uP8T
-VJWbNYLkfeTkStqcwvUDwQsrvN0wrj+fj5+u7e8o0Om9nERe/huW3HhZb8Zq0spI
-SVsXg2sGevkVEcgZC8o4OQ3fYwSFVl6cUSXzu2lgOZBMIrB5dcFAwgnWbVg=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAFA/CN192s5flZm75Sq81vZQMwZ+
+OXfOAHTznzwdHulBHQp+3Ifx9IrVrOCTl1QCwGD52oTX4xSsC0xrFCooOjlgq07T
+/EggGdUU5QU0vjuxSOEHHApoxk9vPbGiCPZpE4KdAXAQgCDCqb0HDhaMTHh3gwgX
+2nr2RzUIsyZnBsXxPsysXuYROP2pRUNuPsLUC7ZbxVE4N5pXH1y4Y0e3d9AlYNJW
+Bp1F9vHHcJT9k0WxGka7WZEkm6zFc7sWGwOElTsrmb1Tp1VKYMH2vR9HIhD6ajrY
+hIXNKM58oZJR4husQCz2Xw5CrBiXTHwQGdRFXyCvMZ3ZtmCozOewDPEADyc=
  -----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 dd3431f98e1e6e109029d6a42d6f7c6fbec22677..6fd758edeb38e40a7af6172be677872914465cad 100644 (file)
--- 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,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_ec.com/BLANK/CA.pem b/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem

index 9a525b50bb2e5640bc05ca4267b813c288b4cbbb..e8ab9a2d25a83df54ae137438b984665741e3855 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem
@@ -1,13 +1,13 @@
  -----BEGIN CERTIFICATE-----
-MIIB+TCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl\r
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN\r
-MzgwMTAxMTI0MTQ0WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE\r
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFDi8N5vtSw\r
-rsLcxFukUKE0DsbE7+VgzspymXGq1HBDmJd7vF0RgauqGxDRblOncvoQDv9vMlqS\r
-ZoRDFRh/mF5CmQC0gzFmTrmOpU5dlT9EaDZHy1d1i04IM/w9Ty/iwYuyd5SH8VMP\r
-/X+4xJlBEd0WT5FsgLpXd0XsXBXywoX0fwQmu6MmMCQwEgYDVR0TAQH/BAgwBgEB\r
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYoAMIGGAkFBGllQl88w\r
-HC8p3UBcGhFrMElDcTcq4hUx7kAbspXRllyjxMZmlOJItgmWDz5A6t93QqdYUV66\r
-/2fiPRVhF96rLQJBLpEI3T9rKt0KpOAcYHtHU14heltCPsrCAETwclVK0TeuNwV3\r
-mYNiwo/a4W81R2retIA44emhUzgTbyrkbz2TQvk=
+MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl\r
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNjQ5WhcN\r
+MzgwMTAxMTIzNjQ5WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE\r
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGlLa9Gbe4N\r
+MHbmu7o/3Ro5Q0ZBVRqPMMdLvgGILszqokTaw3s86wgIwtNkwts8b6K4982UhjJc\r
+K/QDPtzgsmPzogDQUK2/5i/vcyh1b0rBvEm76Ja2oehhCIBfKpa7zH7r1Vb6L0U2\r
+36i6/R5fwZP+6H3AhnAew4enGoJV7Jn/BCxRq6MmMCQwEgYDVR0TAQH/BAgwBgEB\r
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIBEuwwP+uS\r
+CmLd3ZFCDnEPFhfVKh05gElP4K+g859s7HG5Q96mPaA0s5eeSGlwTpkS/Zs7tZI3\r
+/8fkmgmJnWp5DwcCQgE/SXc1YgyGedskzqbXMh3lhJptzi1ZxHTltLlErc2On8Ek\r
+OR4dopqcyq5/nC53oSsJAUbJjQBBaF0+eE/ZKntkBw==
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem

index 5c43972e4064b1d0dd76915e51c354226e090947..ad82a20a593aa8883aad861b96612ed2d94a62ef 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem
@@ -1,14 +1,14 @@
  -----BEGIN CERTIFICATE-----
  MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl\r
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN\r
-MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE\r
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNjQ5WhcN\r
+MzgwMTAxMTIzNjQ5WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE\r
  AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG\r
-AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi\r
-J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV\r
-vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud\r
+AAQAE7s3Cm7dxjuiwSsaICPPP7mhzIMacudnUh3JMwScdTMpKg8KevBIOpzqDiFg\r
+iNdxFylXp4nTxwN+NN8J/VwlRocBbGuY44x95apAPF9ZvxfjOhkDHydeheA589iR\r
+V1Rz7U/fzofoJ9U5I+roCNDClvC3LtvyRaZTik1grAmDIViyATGjPjA8MA4GA1Ud\r
  DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4\r
-Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn\r
-OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB\r
-wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp\r
-MvHjwPdyBJcANrlU1kf+Lus=
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCAVXgoWlbaiq6h/Hx8Kmd9OyjNXEF\r
+5g8ZfwkV2q5+NLVvOOLvfd4BhvXr9AI0WiswIB2yJj9cBVQ2htcAekOb47O1AkIA\r
+lKMBtWo15QMP3+OL0L/kmF5Wk3DruPCKBEvYAXwvutx/swIbqpF9YoDjVg3/FigL\r
+obwW4eLGnuGrF0kNHIipsVA=
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert9.db b/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert9.db

new file mode 100644 (file)

index 0000000..69545ec

Binary files /dev/null and b/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/key4.db b/test/aux-fixed/exim-ca/example_ec.com/BLANK/key4.db

new file mode 100644 (file)

index 0000000..1a64586

Binary files /dev/null and b/test/aux-fixed/exim-ca/example_ec.com/BLANK/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/pkcs11.txt b/test/aux-fixed/exim-ca/example_ec.com/BLANK/pkcs11.txt

new file mode 100644 (file)

index 0000000..89eef7a
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='BLANK' 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})
+
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem b/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem

index 9a525b50bb2e5640bc05ca4267b813c288b4cbbb..e8ab9a2d25a83df54ae137438b984665741e3855 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem
@@ -1,13 +1,13 @@
  -----BEGIN CERTIFICATE-----
-MIIB+TCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl\r
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN\r
-MzgwMTAxMTI0MTQ0WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE\r
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFDi8N5vtSw\r
-rsLcxFukUKE0DsbE7+VgzspymXGq1HBDmJd7vF0RgauqGxDRblOncvoQDv9vMlqS\r
-ZoRDFRh/mF5CmQC0gzFmTrmOpU5dlT9EaDZHy1d1i04IM/w9Ty/iwYuyd5SH8VMP\r
-/X+4xJlBEd0WT5FsgLpXd0XsXBXywoX0fwQmu6MmMCQwEgYDVR0TAQH/BAgwBgEB\r
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYoAMIGGAkFBGllQl88w\r
-HC8p3UBcGhFrMElDcTcq4hUx7kAbspXRllyjxMZmlOJItgmWDz5A6t93QqdYUV66\r
-/2fiPRVhF96rLQJBLpEI3T9rKt0KpOAcYHtHU14heltCPsrCAETwclVK0TeuNwV3\r
-mYNiwo/a4W81R2retIA44emhUzgTbyrkbz2TQvk=
+MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl\r
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNjQ5WhcN\r
+MzgwMTAxMTIzNjQ5WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE\r
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGlLa9Gbe4N\r
+MHbmu7o/3Ro5Q0ZBVRqPMMdLvgGILszqokTaw3s86wgIwtNkwts8b6K4982UhjJc\r
+K/QDPtzgsmPzogDQUK2/5i/vcyh1b0rBvEm76Ja2oehhCIBfKpa7zH7r1Vb6L0U2\r
+36i6/R5fwZP+6H3AhnAew4enGoJV7Jn/BCxRq6MmMCQwEgYDVR0TAQH/BAgwBgEB\r
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIBEuwwP+uS\r
+CmLd3ZFCDnEPFhfVKh05gElP4K+g859s7HG5Q96mPaA0s5eeSGlwTpkS/Zs7tZI3\r
+/8fkmgmJnWp5DwcCQgE/SXc1YgyGedskzqbXMh3lhJptzi1ZxHTltLlErc2On8Ek\r
+OR4dopqcyq5/nC53oSsJAUbJjQBBaF0+eE/ZKntkBw==
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key

index 64131232052d244bf2ad13455fde621bf2f4de56..a1c77629188506e384c4b599e6df1607879b75a5 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key
@@ -1,12 +1,12 @@
  Bag Attributes
      friendlyName: OCSP Signer ec
-    localKeyID: 58 98 F6 0B D4 18 4B 9F 6F 78 69 F0 D5 56 12 E7 86 5A D8 19 
+    localKeyID: 06 1A C4 35 2B C1 DC F6 01 AB CD 80 BC 8D 26 CE 84 2E DE DC 
  Key Attributes: <No Attributes>
  -----BEGIN PRIVATE KEY-----
-MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBCVb0Lphosni8iTzX
-AhM69kIKCHLiyqqjvNDRKCbY9+qUDh5mhJgL69WsIsTXF93iLYUilOyui+xakbJg
-9wXuZ86hgYkDgYYABAAA/0l/3VvmG7DYoSzZKwsLvk/DtEk3kiNjcdbbmhacN5I0
-8ELigPSQZIqF646lVE3gEeoCGuoJhd7/J5PG2wfb6gFbHwBzmcs8ZVPfFOrXgEvN
-DaNcW4fk/2E74daf0NmpLJ86TPhyF1e/XVXNBZxVUiWzcOKnFpGKCuzhn5rD/usv
-8g==
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBnIi6B4Y2ryrPCscF
+ew3TixbTTYTeP5Sq2W5rykLX0w2eqCwGYqCTezzshS4HLrsIcCt2aFzhM98w0IQN
+/rmmxF+hgYkDgYYABAAxdhTgcQenxoNsz8LiYhSPJbFKf7k9gUqiks04r+s3UwCP
+75iduXJ/5UrWIkqUWDxSm3edHDD25EC45AW6s3Um1wAGoUMhliokAZ/WZ6hj2xpf
+JjXlc3roXeflLPnuW+qusMBNJqOy9SU52tX9fEdV7IYArG4fk5PokfmfU47U8LfB
+OA==
  -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12

index 23e6d55f95b01c65a182ba7b6024426476a39427..bc5034f1cf39322d6f63fecd79906fe708fb340d 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12 and b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12 differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem

index 27fa056813987a3008cdd381607ca2a3e3b6f2fa..b196b6240ee62b8ab15769670d70822332215020 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem
@@ -1,14 +1,14 @@
  -----BEGIN CERTIFICATE-----
-MIICETCCAXOgAwIBAgIBQzAKBggqhkjOPQQDAjA5MRcwFQYDVQQKDA5leGFtcGxl\r
+MIICEjCCAXOgAwIBAgIBQzAKBggqhkjOPQQDAjA5MRcwFQYDVQQKDA5leGFtcGxl\r
  X2VjLmNvbTEeMBwGA1UEAxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMB4XDTEyMTEw\r
-MTEyNDE0NVoXDTM4MDEwMTEyNDE0NVowODEXMBUGA1UECgwOZXhhbXBsZV9lYy5j\r
+MTEyMzY1MVoXDTM4MDEwMTEyMzY1MVowODEXMBUGA1UECgwOZXhhbXBsZV9lYy5j\r
  b20xHTAbBgNVBAMTFGNsaWNhIE9DU1AgU2lnbmVyIGVjMIGbMBAGByqGSM49AgEG\r
-BSuBBAAjA4GGAAQAAP9Jf91b5huw2KEs2SsLC75Pw7RJN5IjY3HW25oWnDeSNPBC\r
-4oD0kGSKheuOpVRN4BHqAhrqCYXe/yeTxtsH2+oBWx8Ac5nLPGVT3xTq14BLzQ2j\r
-XFuH5P9hO+HWn9DZqSyfOkz4chdXv11VzQWcVVIls3DipxaRigrs4Z+aw/7rL/Kj\r
+BSuBBAAjA4GGAAQAMXYU4HEHp8aDbM/C4mIUjyWxSn+5PYFKopLNOK/rN1MAj++Y\r
+nblyf+VK1iJKlFg8Upt3nRww9uRAuOQFurN1JtcABqFDIZYqJAGf1meoY9saXyY1\r
+5XN66F3n5Sz57lvqrrDATSajsvUlOdrV/XxHVeyGAKxuH5OT6JH5n1OO1PC3wTij\r
  KjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAKBggq\r
-hkjOPQQDAgOBiwAwgYcCQQG3B4qSOXlBkO+SPEzLsrokHuMa63nhJollaEkJCg3f\r
-V1zClus/Qz79hFDRUPm19XraNWKAlRBWIW+af5B7N62QAkIB8DJhBuT7QyDfrOpu\r
-robiUZTZZ9uh4PEWz4c2rqDhXqXC+Va26HrBsqyDOPZrJyQkETR3VgqygZRzTko0\r
-Sk2OjDQ=
+hkjOPQQDAgOBjAAwgYgCQgHuPsIXM9NQWdFW7asCxVNyHiokxyjd0DItOR928K+G\r
+5tX82TDdlMBMMhEXcFQJyFsvV0RPInIJoK3cYPuWnOPuIQJCAeXPq6rwiIrw4OqR\r
+r8jvgjF9rzvIzw1kuNxuLPwHSnq8PY1uZbf4dDRAGBt5ggP72LnhmW8Kjh7swRTG\r
+bRqdP9eq
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem b/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem

index 5c43972e4064b1d0dd76915e51c354226e090947..ad82a20a593aa8883aad861b96612ed2d94a62ef 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem
@@ -1,14 +1,14 @@
  -----BEGIN CERTIFICATE-----
  MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl\r
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN\r
-MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE\r
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNjQ5WhcN\r
+MzgwMTAxMTIzNjQ5WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE\r
  AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG\r
-AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi\r
-J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV\r
-vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud\r
+AAQAE7s3Cm7dxjuiwSsaICPPP7mhzIMacudnUh3JMwScdTMpKg8KevBIOpzqDiFg\r
+iNdxFylXp4nTxwN+NN8J/VwlRocBbGuY44x95apAPF9ZvxfjOhkDHydeheA589iR\r
+V1Rz7U/fzofoJ9U5I+roCNDClvC3LtvyRaZTik1grAmDIViyATGjPjA8MA4GA1Ud\r
  DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4\r
-Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn\r
-OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB\r
-wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp\r
-MvHjwPdyBJcANrlU1kf+Lus=
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCAVXgoWlbaiq6h/Hx8Kmd9OyjNXEF\r
+5g8ZfwkV2q5+NLVvOOLvfd4BhvXr9AI0WiswIB2yJj9cBVQ2htcAekOb47O1AkIA\r
+lKMBtWo15QMP3+OL0L/kmF5Wk3DruPCKBEvYAXwvutx/swIbqpF9YoDjVg3/FigL\r
+obwW4eLGnuGrF0kNHIipsVA=
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf b/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf

index 320148bb209748bcd1fc22a0523116ce82eb54f2..234c263cd9fe557caca8bf2db2fb5b2a7e5f56a7 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf
@@ -1,18 +1,18 @@
  ; Config::Simple 4.59
-; Thu Nov  1 12:41:44 2012
-
-[CA]
-org=example_ec.com
-subject=clica CA
-bits=2048
-name=Certificate Authority ec
+; Thu Nov  1 12:36:49 2012
  
  [CLICA]
-signer=Signing Cert ec
+crl_url=http://crl.example.com/latest.crl
+ocsp_url=http://oscp.example.com/
  ocsp_signer=OCSP Signer ec
  sighash=SHA256
  level=1
-crl_url=http://crl.example.com/latest.crl
-ocsp_url=http://oscp.example.com/
+signer=Signing Cert ec
+
+[CA]
+subject=clica CA
+org=example_ec.com
+name=Certificate Authority ec
+bits=2048
  
  
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/cert9.db b/test/aux-fixed/exim-ca/example_ec.com/CA/cert9.db

new file mode 100644 (file)

index 0000000..cd5901f

Binary files /dev/null and b/test/aux-fixed/exim-ca/example_ec.com/CA/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/key4.db b/test/aux-fixed/exim-ca/example_ec.com/CA/key4.db

new file mode 100644 (file)

index 0000000..81bf112

Binary files /dev/null and b/test/aux-fixed/exim-ca/example_ec.com/CA/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file b/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file

index a1f40247ace3c66520c8ec408e0bf83f697e4925..96a4d722cac8a2464d4b631607515466e199006d 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file
@@ -4,11 +4,11 @@ cpu family    : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 2428.058
+microcode      : 0xe2
+cpu MHz                : 2700.000
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 0
  cpu cores      : 4
  apicid         : 0
@@ -17,9 +17,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -31,11 +32,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1957.721
+microcode      : 0xe2
+cpu MHz                : 3312.884
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 1
  cpu cores      : 4
  apicid         : 2
@@ -44,9 +45,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -58,11 +60,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 2463.970
+microcode      : 0xe2
+cpu MHz                : 3288.418
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 2
  cpu cores      : 4
  apicid         : 4
@@ -71,9 +73,10 @@ fpu          : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
@@ -85,11 +88,11 @@ cpu family  : 6
  model          : 94
  model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
  stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1956.290
+microcode      : 0xe2
+cpu MHz                : 2700.000
  cache size     : 8192 KB
  physical id    : 0
-siblings       : 8
+siblings       : 4
  core id                : 3
  cpu cores      : 4
  apicid         : 6
@@ -98,201 +101,94 @@ fpu               : yes
  fpu_exception  : yes
  cpuid level    : 22
  wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
+flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
+vmx flags      : vnmi preemption_timer invvpid ept_x_only ept_ad ept_1gb flexpriority tsc_offset vtpr mtf vapic ept vpid unrestricted_guest ple shadow_vmcs pml
+bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit srbds
+bogomips       : 5399.81
  clflush size   : 64
  cache_alignment        : 64
  address sizes  : 39 bits physical, 48 bits virtual
  power management:
  
-processor      : 4
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 2515.935
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 0
-cpu cores      : 4
-apicid         : 1
-initial apicid : 1
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 5
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1678.780
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 1
-cpu cores      : 4
-apicid         : 3
-initial apicid : 3
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 6
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 2838.108
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 2
-cpu cores      : 4
-apicid         : 5
-initial apicid : 5
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-processor      : 7
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 94
-model name     : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
-stepping       : 3
-microcode      : 0xc6
-cpu MHz                : 1838.913
-cache size     : 8192 KB
-physical id    : 0
-siblings       : 8
-core id                : 3
-cpu cores      : 4
-apicid         : 7
-initial apicid : 7
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 22
-wp             : yes
-flags          : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
-bugs           : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
-bogomips       : 5424.00
-clflush size   : 64
-cache_alignment        : 64
-address sizes  : 39 bits physical, 48 bits virtual
-power management:
-
-            CPU0       CPU1       CPU2       CPU3       CPU4       CPU5       CPU6       CPU7       
-   0:         23          0          0          0          0          0          0          0  IR-IO-APIC    2-edge      timer
-   1:          0          0          0          0          0      20904          0          0  IR-IO-APIC    1-edge      i8042
-   8:          0          0          0          0          0          0          1          0  IR-IO-APIC    8-edge      rtc0
-   9:          0      17296          0          0          0          0          0          0  IR-IO-APIC    9-fasteoi   acpi
-  12:          0          0          0          0     975537          0          0          0  IR-IO-APIC   12-edge      i8042
-  16:          0          0          0          0          0          1          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
- 120:          0          0          0          0          0          0          0          0  DMAR-MSI    0-edge      dmar0
- 121:          0          0          0          0          0          0          0          0  DMAR-MSI    1-edge      dmar1
- 122:          0          0      30204     287255          0          0          0          0  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
- 123:          0          0          0         54          0          0          0          0  IR-PCI-MSI 327680-edge      xhci_hcd
- 124:          0          0          0          0          0          0          0        459  IR-PCI-MSI 2097152-edge      rtsx_pci
- 125:          0        168          0          0          0          0          0      60680  IR-PCI-MSI 520192-edge      enp0s31f6
- 126:          0          0       3771          0          0          0     457982          0  IR-PCI-MSI 32768-edge      i915
- 127:          0          0          0         18          0          0          0          0  IR-PCI-MSI 1048576-edge      nvkm
- 128:          0          0          0          0         52          0          0          0  IR-PCI-MSI 360448-edge      mei_me
- 129:          0          0          0          0          0          0         45          0  IR-PCI-MSI 1572864-edge      iwlwifi
- 130:          0          0          0          0          0          0          0        636  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
- NMI:         16         14         15         18         17         14         15         14   Non-maskable interrupts
- LOC:     912665     936139     939889     991828    1037068     902298     964644     945428   Local timer interrupts
- SPU:          0          0          0          0          0          0          0          0   Spurious interrupts
- PMI:         16         14         15         18         17         14         15         14   Performance monitoring interrupts
- IWI:          0          0          0          0          3          0          1          0   IRQ work interrupts
- RTR:          4          0          0          0          0          0          0          0   APIC ICR read retries
- RES:     244370      93436      40246      24369      17709      13149      11666      11188   Rescheduling interrupts
- CAL:      33878      31862      33707      32843      33596      33545      32153      32444   Function call interrupts
- TLB:      16415      15608      17440      17663      21127      17152      16593      16540   TLB shootdowns
- TRM:          0          0          0          0          0          0          0          0   Thermal event interrupts
- THR:          0          0          0          0          0          0          0          0   Threshold APIC interrupts
- DFR:          0          0          0          0          0          0          0          0   Deferred Error APIC interrupts
- MCE:          0          0          0          0          0          0          0          0   Machine check exceptions
- MCP:         29         30         30         30         30         30         30         30   Machine check polls
- HYP:          0          0          0          0          0          0          0          0   Hypervisor callback interrupts
- HRE:          0          0          0          0          0          0          0          0   Hyper-V reenlightenment interrupts
- HVS:          0          0          0          0          0          0          0          0   Hyper-V stimer0 interrupts
+            CPU0       CPU1       CPU2       CPU3       
+   0:         16          0          0          0  IR-IO-APIC    2-edge      timer
+   1:       6503          0          0        413  IR-IO-APIC    1-edge      i8042
+   8:          1          0          0          0  IR-IO-APIC    8-edge      rtc0
+   9:      10220       6724          0          0  IR-IO-APIC    9-fasteoi   acpi
+  12:    1604003          0     508743          0  IR-IO-APIC   12-edge      i8042
+  16:          1          3          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
+ 120:          0          0          0          0  DMAR-MSI    0-edge      dmar0
+ 121:          0          0          0          0  DMAR-MSI    1-edge      dmar1
+ 126:        930          0          0     333899  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
+ 127:          0          7          0         16  IR-PCI-MSI 327680-edge      xhci_hcd
+ 128:         38        174          0          0  IR-PCI-MSI 2097152-edge      rtsx_pci
+ 129:          0         39          0          0  IR-PCI-MSI 360448-edge      mei_me
+ 130:         28          0          0          5  IR-PCI-MSI 1048576-edge      nvkm
+ 131:    1354163          0     395394          0  IR-PCI-MSI 32768-edge      i915
+ 132:          0        104          0          0  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
+ 133:          0       2707          7          0  IR-PCI-MSI 520192-edge      enp0s31f6
+ 134:        995      71213          0     120299  IR-PCI-MSI 1572864-edge      iwlwifi
+ NMI:         98        112         98         89   Non-maskable interrupts
+ LOC:    4614634    3990000    3696827    3541048   Local timer interrupts
+ SPU:          0          0          0          0   Spurious interrupts
+ PMI:         98        112         98         89   Performance monitoring interrupts
+ IWI:     628923      44400     237682      44954   IRQ work interrupts
+ RTR:          0          0          0          0   APIC ICR read retries
+ RES:     197505     198702     185420     177833   Rescheduling interrupts
+ CAL:     484549     477475     459401     488610   Function call interrupts
+ TLB:     782290     815198     819110     831543   TLB shootdowns
+ TRM:          0          0          0          0   Thermal event interrupts
+ THR:          0          0          0          0   Threshold APIC interrupts
+ DFR:          0          0          0          0   Deferred Error APIC interrupts
+ MCE:          0          0          0          0   Machine check exceptions
+ MCP:         29         30         30         30   Machine check polls
   ERR:          0
   MIS:          0
- PIN:          0          0          0          0          0          0          0          0   Posted-interrupt notification event
- NPI:          0          0          0          0          0          0          0          0   Nested posted-interrupt event
- PIW:          0          0          0          0          0          0          0          0   Posted-interrupt wakeup event
-MemTotal:       16284452 kB
-MemFree:        10018316 kB
-MemAvailable:   13200712 kB
-Buffers:          265192 kB
-Cached:          3329440 kB
+ PIN:          0          0          0          0   Posted-interrupt notification event
+ NPI:          0          0          0          0   Nested posted-interrupt event
+ PIW:          0          0          0          0   Posted-interrupt wakeup event
+MemTotal:       16247944 kB
+MemFree:         5520292 kB
+MemAvailable:   12600020 kB
+Buffers:          538468 kB
+Cached:          7053864 kB
  SwapCached:            0 kB
-Active:          3262976 kB
-Inactive:        2458200 kB
-Active(anon):    2128304 kB
-Inactive(anon):   246368 kB
-Active(file):    1134672 kB
-Inactive(file):  2211832 kB
-Unevictable:          80 kB
-Mlocked:              80 kB
-SwapTotal:       8212476 kB
-SwapFree:        8212476 kB
-Dirty:               936 kB
-Writeback:           128 kB
-AnonPages:       2126892 kB
-Mapped:           481352 kB
-Shmem:            248104 kB
-Slab:             324588 kB
-SReclaimable:     173252 kB
-SUnreclaim:       151336 kB
-KernelStack:       10080 kB
-PageTables:        39644 kB
+Active:          3787764 kB
+Inactive:        6051048 kB
+Active(anon):       3088 kB
+Inactive(anon):  2760812 kB
+Active(file):    3784676 kB
+Inactive(file):  3290236 kB
+Unevictable:      283400 kB
+Mlocked:              48 kB
+SwapTotal:      12406776 kB
+SwapFree:       12406776 kB
+Dirty:               932 kB
+Writeback:           116 kB
+AnonPages:       2529884 kB
+Mapped:           863332 kB
+Shmem:            517420 kB
+KReclaimable:     342932 kB
+Slab:             449872 kB
+SReclaimable:     342932 kB
+SUnreclaim:       106940 kB
+KernelStack:       11584 kB
+PageTables:        30076 kB
  NFS_Unstable:          0 kB
  Bounce:                0 kB
  WritebackTmp:          0 kB
-CommitLimit:    16354700 kB
-Committed_AS:    6626684 kB
+CommitLimit:    20530748 kB
+Committed_AS:    6311044 kB
  VmallocTotal:   34359738367 kB
-VmallocUsed:           0 kB
+VmallocUsed:       56276 kB
  VmallocChunk:          0 kB
-Percpu:             4256 kB
+Percpu:             8800 kB
  HardwareCorrupted:     0 kB
-AnonHugePages:    806912 kB
+AnonHugePages:         0 kB
  ShmemHugePages:        0 kB
  ShmemPmdMapped:        0 kB
+FileHugePages:         0 kB
+FilePmdMapped:         0 kB
  CmaTotal:              0 kB
  CmaFree:               0 kB
  HugePages_Total:       0
@@ -301,14 +197,16 @@ HugePages_Rsvd:        0
  HugePages_Surp:        0
  Hugepagesize:       2048 kB
  Hugetlb:               0 kB
-DirectMap4k:      282088 kB
-DirectMap2M:     7968768 kB
-DirectMap1G:     9437184 kB
+DirectMap4k:      325096 kB
+DirectMap2M:     8974336 kB
+DirectMap1G:     8388608 kB
  Inter-|   Receive                                                |  Transmit
   face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed
- vnet0: 1155867    4102    0    0    0     0          0         0   960308   10312    0    0    0     0       0          0
-wlp3s0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-virbr0: 1098439    4102    0    0    0     0          0         0   735824    6022    0    0    0     0       0          0
-    lo: 7424702   45950    0    0    0     0          0         0  7424702   45950    0    0    0     0       0          0
+    lo:  757127    7251    0    0    0     0          0         0   757127    7251    0    0    0     0       0          0
+enp0s31f6:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+wlp3s0: 128941351  122409    0    0    0     0          0         0 19224228  102397    0    0    0     0       0          0
+virbr2:  442398    6834    0    0    0     0          0        16 17312033   12683    0    0    0     0       0          0
+virbr2-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+virbr0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
  virbr0-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-enp0s31f6: 39251323   34779    0    0    0     0          0         0  5044761   25668    0    0    0     0       0          0
+tun_wiz: 76309689   78390    0    0    0     0          0         0  7301146   68105    0    0    0     0       0          0
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/pkcs11.txt b/test/aux-fixed/exim-ca/example_ec.com/CA/pkcs11.txt

new file mode 100644 (file)

index 0000000..4a30b48
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='CA' 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})
+
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem

index 50457f2ef5d8704b9b422af625dbea2328eecb5e..28ca574ecd92f4241f90cc1548f5a3a9c8edb5e0 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem
@@ -1,35 +1,39 @@
  Bag Attributes
      friendlyName: Signing Cert ec
-subject=/O=example_ec.com/CN=clica Signing Cert ec
-issuer=/O=example_ec.com/CN=clica CA ec
+subject=O = example_ec.com, CN = clica Signing Cert ec
+
+issuer=O = example_ec.com, CN = clica CA ec
+
  -----BEGIN CERTIFICATE-----
  MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
-MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNjQ5WhcN
+MzgwMTAxMTIzNjQ5WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
  AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi
-J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV
-vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud
+AAQAE7s3Cm7dxjuiwSsaICPPP7mhzIMacudnUh3JMwScdTMpKg8KevBIOpzqDiFg
+iNdxFylXp4nTxwN+NN8J/VwlRocBbGuY44x95apAPF9ZvxfjOhkDHydeheA589iR
+V1Rz7U/fzofoJ9U5I+roCNDClvC3LtvyRaZTik1grAmDIViyATGjPjA8MA4GA1Ud
  DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn
-OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB
-wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp
-MvHjwPdyBJcANrlU1kf+Lus=
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCAVXgoWlbaiq6h/Hx8Kmd9OyjNXEF
+5g8ZfwkV2q5+NLVvOOLvfd4BhvXr9AI0WiswIB2yJj9cBVQ2htcAekOb47O1AkIA
+lKMBtWo15QMP3+OL0L/kmF5Wk3DruPCKBEvYAXwvutx/swIbqpF9YoDjVg3/FigL
+obwW4eLGnuGrF0kNHIipsVA=
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority ec
-subject=/O=example_ec.com/CN=clica CA ec
-issuer=/O=example_ec.com/CN=clica CA ec
+subject=O = example_ec.com, CN = clica CA ec
+
+issuer=O = example_ec.com, CN = clica CA ec
+
  -----BEGIN CERTIFICATE-----
-MIIB+TCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
-MzgwMTAxMTI0MTQ0WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFDi8N5vtSw
-rsLcxFukUKE0DsbE7+VgzspymXGq1HBDmJd7vF0RgauqGxDRblOncvoQDv9vMlqS
-ZoRDFRh/mF5CmQC0gzFmTrmOpU5dlT9EaDZHy1d1i04IM/w9Ty/iwYuyd5SH8VMP
-/X+4xJlBEd0WT5FsgLpXd0XsXBXywoX0fwQmu6MmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYoAMIGGAkFBGllQl88w
-HC8p3UBcGhFrMElDcTcq4hUx7kAbspXRllyjxMZmlOJItgmWDz5A6t93QqdYUV66
-/2fiPRVhF96rLQJBLpEI3T9rKt0KpOAcYHtHU14heltCPsrCAETwclVK0TeuNwV3
-mYNiwo/a4W81R2retIA44emhUzgTbyrkbz2TQvk=
+MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNjQ5WhcN
+MzgwMTAxMTIzNjQ5WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGlLa9Gbe4N
+MHbmu7o/3Ro5Q0ZBVRqPMMdLvgGILszqokTaw3s86wgIwtNkwts8b6K4982UhjJc
+K/QDPtzgsmPzogDQUK2/5i/vcyh1b0rBvEm76Ja2oehhCIBfKpa7zH7r1Vb6L0U2
+36i6/R5fwZP+6H3AhnAew4enGoJV7Jn/BCxRq6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIBEuwwP+uS
+CmLd3ZFCDnEPFhfVKh05gElP4K+g859s7HG5Q96mPaA0s5eeSGlwTpkS/Zs7tZI3
+/8fkmgmJnWp5DwcCQgE/SXc1YgyGedskzqbXMh3lhJptzi1ZxHTltLlErc2On8Ek
+OR4dopqcyq5/nC53oSsJAUbJjQBBaF0+eE/ZKntkBw==
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert9.db b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert9.db

new file mode 100644 (file)

index 0000000..12f0b0a

Binary files /dev/null and b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert9.db differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem

index 109d4e4747894d52d051b40b94b903f484ae0d3d..10fec9c8cc6f6c57c00ce16f550928fca1ada2df 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem
@@ -1,59 +1,65 @@
  Bag Attributes
      friendlyName: server1.example_ec.com
-    localKeyID: D6 46 1B EF 9D FA B1 F4 11 76 3E EA B9 87 4F E7 9A F4 01 FD 
-subject=/CN=server1.example_ec.com
-issuer=/O=example_ec.com/CN=clica Signing Cert ec
+    localKeyID: E7 01 2E 71 F0 32 7E 95 C2 1B 3A C2 6B 51 CC 8E 2E F5 EC CD 
+subject=CN = server1.example_ec.com
+
+issuer=O = example_ec.com, CN = clica Signing Cert ec
+
  -----BEGIN CERTIFICATE-----
-MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
+MIIDADCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
  ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xMjEx
-MDExMjQxNDZaFw0zNzEyMDExMjQxNDZaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAE9zdvyyhVXrrfD
-WSISI3makfsVDo9g202zPmn/MM3SdBqmM+rASyMhXYDtijSYuSNaS29jDSlAMC2C
-Pqq88PHWXwBH+U7D9QnenDlN2kEDokbJ/lgXSzF4+NOoIcwh+DIr20QuTM3hGfCJ
-tctRfVvdjRfa4Quj7hkG56ajsBz/Osi6i6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjM2NTNaFw0zNzEyMDExMjM2NTNaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAC0MTRua6/FR8lI
+E21W8isVdazmBPJQbN4ECvSxHQQrhnYTCZVa/rFvfinMaQVdMiwbLoE2gSqT3/99
+yGf/dNAZNgFDAQ9jzE0PRKIxe4bHFBwUa/zmMbzw1K5CLilSjbKsV8y7OSz1w6un
+EErf4bWlH00fHCcZavxRonxuvrhRmNiMPKOCASwwggEoMA4GA1UdDwEB/wQEAwIE
  8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
  oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
  BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4IWc2VydmVyMS5leGFtcGxlX2VjLmNvbYITc2VydmVyMS5leGFt
-cGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIJKi50
-ZXN0LmV4giFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkIBWndSdGp1lFxScamCi0sgysif3SPRt68d+cIKty3pUvEs
-kZspf26wooCAe2wELgg8UqAciEA8phO99sEaFsn3bjACQVCuUx8gyMvuqOf0tZMM
-UzhcceUCLOmde8yy5oUK/GQUqG2LdD65D4AlR+aXuOiSg17t4q/quILUcU+tSK/X
-wXvO
+BgNVHREEgYEwf4IiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIh
+YWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1wbGUuY29tghNzZXJ2ZXIxLmV4YW1w
+bGUuY29tggkqLnRlc3QuZXiCFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
+zj0EAwIDgYwAMIGIAkIA3Ptg+FHovpkCfCs8Z/HZ47HcRZb3FNF0KXUKQ43MnQsR
+6tgbO8k+saoU496dHDRrNtC+w7WwOZ7ka147QjlsxyoCQgHC5DCbyEIf8kwnj/Zp
+mrttmc2dfgiz9y3P/j+ZnjbLeABMWif4i0cmyzIaV9mhFqVcXAygSUcdRfO9lNOn
+/zgqAA==
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Signing Cert ec
-subject=/O=example_ec.com/CN=clica Signing Cert ec
-issuer=/O=example_ec.com/CN=clica CA ec
+subject=O = example_ec.com, CN = clica Signing Cert ec
+
+issuer=O = example_ec.com, CN = clica CA ec
+
  -----BEGIN CERTIFICATE-----
  MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
-MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNjQ5WhcN
+MzgwMTAxMTIzNjQ5WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
  AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi
-J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV
-vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud
+AAQAE7s3Cm7dxjuiwSsaICPPP7mhzIMacudnUh3JMwScdTMpKg8KevBIOpzqDiFg
+iNdxFylXp4nTxwN+NN8J/VwlRocBbGuY44x95apAPF9ZvxfjOhkDHydeheA589iR
+V1Rz7U/fzofoJ9U5I+roCNDClvC3LtvyRaZTik1grAmDIViyATGjPjA8MA4GA1Ud
  DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn
-OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB
-wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp
-MvHjwPdyBJcANrlU1kf+Lus=
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCAVXgoWlbaiq6h/Hx8Kmd9OyjNXEF
+5g8ZfwkV2q5+NLVvOOLvfd4BhvXr9AI0WiswIB2yJj9cBVQ2htcAekOb47O1AkIA
+lKMBtWo15QMP3+OL0L/kmF5Wk3DruPCKBEvYAXwvutx/swIbqpF9YoDjVg3/FigL
+obwW4eLGnuGrF0kNHIipsVA=
  -----END CERTIFICATE-----
  Bag Attributes
      friendlyName: Certificate Authority ec
-subject=/O=example_ec.com/CN=clica CA ec
-issuer=/O=example_ec.com/CN=clica CA ec
+subject=O = example_ec.com, CN = clica CA ec
+
+issuer=O = example_ec.com, CN = clica CA ec
+
  -----BEGIN CERTIFICATE-----
-MIIB+TCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
-MzgwMTAxMTI0MTQ0WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFDi8N5vtSw
-rsLcxFukUKE0DsbE7+VgzspymXGq1HBDmJd7vF0RgauqGxDRblOncvoQDv9vMlqS
-ZoRDFRh/mF5CmQC0gzFmTrmOpU5dlT9EaDZHy1d1i04IM/w9Ty/iwYuyd5SH8VMP
-/X+4xJlBEd0WT5FsgLpXd0XsXBXywoX0fwQmu6MmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYoAMIGGAkFBGllQl88w
-HC8p3UBcGhFrMElDcTcq4hUx7kAbspXRllyjxMZmlOJItgmWDz5A6t93QqdYUV66
-/2fiPRVhF96rLQJBLpEI3T9rKt0KpOAcYHtHU14heltCPsrCAETwclVK0TeuNwV3
-mYNiwo/a4W81R2retIA44emhUzgTbyrkbz2TQvk=
+MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNjQ5WhcN
+MzgwMTAxMTIzNjQ5WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGlLa9Gbe4N
+MHbmu7o/3Ro5Q0ZBVRqPMMdLvgGILszqokTaw3s86wgIwtNkwts8b6K4982UhjJc
+K/QDPtzgsmPzogDQUK2/5i/vcyh1b0rBvEm76Ja2oehhCIBfKpa7zH7r1Vb6L0U2
+36i6/R5fwZP+6H3AhnAew4enGoJV7Jn/BCxRq6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIBEuwwP+uS
+CmLd3ZFCDnEPFhfVKh05gElP4K+g859s7HG5Q96mPaA0s5eeSGlwTpkS/Zs7tZI3
+/8fkmgmJnWp5DwcCQgE/SXc1YgyGedskzqbXMh3lhJptzi1ZxHTltLlErc2On8Ek
+OR4dopqcyq5/nC53oSsJAUbJjQBBaF0+eE/ZKntkBw==
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key4.db b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key4.db

new file mode 100644 (file)

index 0000000..452ba3e

Binary files /dev/null and b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key4.db differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/pkcs11.txt b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/pkcs11.txt

new file mode 100644 (file)

index 0000000..89b4b1d
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='server1.example_ec.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})
+
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem

index 044b737b0d5402c2c0913d5fb5e5d80b746a4cf3..8a506ff462fe42db450dee0ef793473a5e80f8e6 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem
@@ -1,38 +1,40 @@
  Bag Attributes
      friendlyName: server1.example_ec.com
-    localKeyID: D6 46 1B EF 9D FA B1 F4 11 76 3E EA B9 87 4F E7 9A F4 01 FD 
-subject=/CN=server1.example_ec.com
-issuer=/O=example_ec.com/CN=clica Signing Cert ec
+    localKeyID: E7 01 2E 71 F0 32 7E 95 C2 1B 3A C2 6B 51 CC 8E 2E F5 EC CD 
+subject=CN = server1.example_ec.com
+
+issuer=O = example_ec.com, CN = clica Signing Cert ec
+
  -----BEGIN CERTIFICATE-----
-MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
+MIIDADCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
  ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xMjEx
-MDExMjQxNDZaFw0zNzEyMDExMjQxNDZaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAE9zdvyyhVXrrfD
-WSISI3makfsVDo9g202zPmn/MM3SdBqmM+rASyMhXYDtijSYuSNaS29jDSlAMC2C
-Pqq88PHWXwBH+U7D9QnenDlN2kEDokbJ/lgXSzF4+NOoIcwh+DIr20QuTM3hGfCJ
-tctRfVvdjRfa4Quj7hkG56ajsBz/Osi6i6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjM2NTNaFw0zNzEyMDExMjM2NTNaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAC0MTRua6/FR8lI
+E21W8isVdazmBPJQbN4ECvSxHQQrhnYTCZVa/rFvfinMaQVdMiwbLoE2gSqT3/99
+yGf/dNAZNgFDAQ9jzE0PRKIxe4bHFBwUa/zmMbzw1K5CLilSjbKsV8y7OSz1w6un
+EErf4bWlH00fHCcZavxRonxuvrhRmNiMPKOCASwwggEoMA4GA1UdDwEB/wQEAwIE
  8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
  oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
  BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4IWc2VydmVyMS5leGFtcGxlX2VjLmNvbYITc2VydmVyMS5leGFt
-cGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIJKi50
-ZXN0LmV4giFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkIBWndSdGp1lFxScamCi0sgysif3SPRt68d+cIKty3pUvEs
-kZspf26wooCAe2wELgg8UqAciEA8phO99sEaFsn3bjACQVCuUx8gyMvuqOf0tZMM
-UzhcceUCLOmde8yy5oUK/GQUqG2LdD65D4AlR+aXuOiSg17t4q/quILUcU+tSK/X
-wXvO
+BgNVHREEgYEwf4IiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIh
+YWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1wbGUuY29tghNzZXJ2ZXIxLmV4YW1w
+bGUuY29tggkqLnRlc3QuZXiCFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
+zj0EAwIDgYwAMIGIAkIA3Ptg+FHovpkCfCs8Z/HZ47HcRZb3FNF0KXUKQ43MnQsR
+6tgbO8k+saoU496dHDRrNtC+w7WwOZ7ka147QjlsxyoCQgHC5DCbyEIf8kwnj/Zp
+mrttmc2dfgiz9y3P/j+ZnjbLeABMWif4i0cmyzIaV9mhFqVcXAygSUcdRfO9lNOn
+/zgqAA==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
  MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl\r
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN\r
-MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE\r
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNjQ5WhcN\r
+MzgwMTAxMTIzNjQ5WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE\r
  AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG\r
-AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi\r
-J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV\r
-vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud\r
+AAQAE7s3Cm7dxjuiwSsaICPPP7mhzIMacudnUh3JMwScdTMpKg8KevBIOpzqDiFg\r
+iNdxFylXp4nTxwN+NN8J/VwlRocBbGuY44x95apAPF9ZvxfjOhkDHydeheA589iR\r
+V1Rz7U/fzofoJ9U5I+roCNDClvC3LtvyRaZTik1grAmDIViyATGjPjA8MA4GA1Ud\r
  DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4\r
-Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn\r
-OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB\r
-wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp\r
-MvHjwPdyBJcANrlU1kf+Lus=
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCAVXgoWlbaiq6h/Hx8Kmd9OyjNXEF\r
+5g8ZfwkV2q5+NLVvOOLvfd4BhvXr9AI0WiswIB2yJj9cBVQ2htcAekOb47O1AkIA\r
+lKMBtWo15QMP3+OL0L/kmF5Wk3DruPCKBEvYAXwvutx/swIbqpF9YoDjVg3/FigL\r
+obwW4eLGnuGrF0kNHIipsVA=
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key

index 0e70cf5bc8d5f20a68bed72e6abe3cca8bf9e403..032643da03f15e98bf458dc2da5174a6bc2bcbf9 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key
@@ -1,13 +1,13 @@
  Bag Attributes
      friendlyName: server1.example_ec.com
-    localKeyID: D6 46 1B EF 9D FA B1 F4 11 76 3E EA B9 87 4F E7 9A F4 01 FD 
+    localKeyID: E7 01 2E 71 F0 32 7E 95 C2 1B 3A C2 6B 51 CC 8E 2E F5 EC CD 
  Key Attributes: <No Attributes>
  -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyn+t6fno4A4CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHj42fAyK5q9BIH4VNdep8rufog4
-8ESh/v2V9cRmWnfq79g1YZB7szLp4vGsDsSnPhIsqTp9D5CmTN4xgZfUj/M7HVDf
-Hx0Hdu7zqfTszyS8hqwOfWaFbSzhtqUwNX95L+4QdzUY75u7G3FepEcyCZz1iXZ6
-ZC5KjtPxLAq9Rx8s/544cW9ELykKfsgLLeIVpoT2DZH85bO36L0uClXkLKBDeNq0
-BgozXR7IaIgXs5FDJrxLKHkoA3eFdH5GT5Fv3EBhisup72dfe0YQ6CMvf//dgN0O
-weBpJswOOP9xnTefuRNugKuJnWHYDSqysxCmJYgyqz5W3mHQo4kQtCCjDJgQrA4=
+MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIz3Yh24ohWXQCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKzWJkeDgILLBIH4H4JMiF4UeSoz
+dDd4+mY6qLX44ELqWbi26PSFwfKou7Ewx45my2x3DcBrPqkISTb9znj9w7Ur9A8O
+QiOIu7wWQRgs50jG1KyzoreDJhYWd5kJ3FMG/dDkPyB6VtyLcQ66lYnRb+fg8BdE
+340fkgxiVoxTKd7kRutBEk+cRvtFZ1oPkqW+8I5wWJ829UCFHpmofYPquNm3pzle
+YW4WjjeTWvTtyODvpXSlsuUI9YTwk2VwbMRJuwCVs66G8Fxutci3p6+Q64wtmD/V
+eoaHYoET9W3qvVHu9fE1NEusn9hyJuMy+1i+v5tpicnxtqwLsLulipMKe2K22TE=
  -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp

index 10e9941504db109d915865defa906478c69fd64b..5e745554050070679c19f31d8d68f27343a6b580 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp and b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req

index 4cfefd2c609c937fdb067455e001c39e2401e67e..99c0f4d452749097d0f3c1fd8af880ab35ba1db9 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req and b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12 b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12

index cbb748c1fd321e2c1f0939ff12e53f6690cf660f..bb3e94db906e6a04651e143f8225e1992cc98bbb 100644 (file)

Binary files a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12 and b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12 differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem

index 71cb505671ac893894436eb5b83f46a48d14a164..d38f90843fe136f5afb89552894a5775e0cd126e 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem
@@ -1,24 +1,26 @@
  Bag Attributes
      friendlyName: server1.example_ec.com
-    localKeyID: D6 46 1B EF 9D FA B1 F4 11 76 3E EA B9 87 4F E7 9A F4 01 FD 
-subject=/CN=server1.example_ec.com
-issuer=/O=example_ec.com/CN=clica Signing Cert ec
+    localKeyID: E7 01 2E 71 F0 32 7E 95 C2 1B 3A C2 6B 51 CC 8E 2E F5 EC CD 
+subject=CN = server1.example_ec.com
+
+issuer=O = example_ec.com, CN = clica Signing Cert ec
+
  -----BEGIN CERTIFICATE-----
-MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
+MIIDADCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
  ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xMjEx
-MDExMjQxNDZaFw0zNzEyMDExMjQxNDZaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAE9zdvyyhVXrrfD
-WSISI3makfsVDo9g202zPmn/MM3SdBqmM+rASyMhXYDtijSYuSNaS29jDSlAMC2C
-Pqq88PHWXwBH+U7D9QnenDlN2kEDokbJ/lgXSzF4+NOoIcwh+DIr20QuTM3hGfCJ
-tctRfVvdjRfa4Quj7hkG56ajsBz/Osi6i6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjM2NTNaFw0zNzEyMDExMjM2NTNaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAC0MTRua6/FR8lI
+E21W8isVdazmBPJQbN4ECvSxHQQrhnYTCZVa/rFvfinMaQVdMiwbLoE2gSqT3/99
+yGf/dNAZNgFDAQ9jzE0PRKIxe4bHFBwUa/zmMbzw1K5CLilSjbKsV8y7OSz1w6un
+EErf4bWlH00fHCcZavxRonxuvrhRmNiMPKOCASwwggEoMA4GA1UdDwEB/wQEAwIE
  8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
  oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
  BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4IWc2VydmVyMS5leGFtcGxlX2VjLmNvbYITc2VydmVyMS5leGFt
-cGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIJKi50
-ZXN0LmV4giFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkIBWndSdGp1lFxScamCi0sgysif3SPRt68d+cIKty3pUvEs
-kZspf26wooCAe2wELgg8UqAciEA8phO99sEaFsn3bjACQVCuUx8gyMvuqOf0tZMM
-UzhcceUCLOmde8yy5oUK/GQUqG2LdD65D4AlR+aXuOiSg17t4q/quILUcU+tSK/X
-wXvO
+BgNVHREEgYEwf4IiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIh
+YWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1wbGUuY29tghNzZXJ2ZXIxLmV4YW1w
+bGUuY29tggkqLnRlc3QuZXiCFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
+zj0EAwIDgYwAMIGIAkIA3Ptg+FHovpkCfCs8Z/HZ47HcRZb3FNF0KXUKQ43MnQsR
+6tgbO8k+saoU496dHDRrNtC+w7WwOZ7ka147QjlsxyoCQgHC5DCbyEIf8kwnj/Zp
+mrttmc2dfgiz9y3P/j+ZnjbLeABMWif4i0cmyzIaV9mhFqVcXAygSUcdRfO9lNOn
+/zgqAA==
  -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key

index 70c4009bf19174e5fd884c301fe595dabae5cb19..ed6d33132ec4192d184a3b72b734660b002d7c0e 100644 (file)
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key
@@ -1,7 +1,7 @@
  -----BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIAKK8Hj471sHschNupNRmwYYrY9JSFkTlZMhsNg8zcQPkCfGEuxHkz
-ReLdG4dy8bBJA6CGDvKRJ0hFMPF++RNU+sGgBwYFK4EEACOhgYkDgYYABAE9zdvy
-yhVXrrfDWSISI3makfsVDo9g202zPmn/MM3SdBqmM+rASyMhXYDtijSYuSNaS29j
-DSlAMC2CPqq88PHWXwBH+U7D9QnenDlN2kEDokbJ/lgXSzF4+NOoIcwh+DIr20Qu
-TM3hGfCJtctRfVvdjRfa4Quj7hkG56ajsBz/Osi6iw==
+MIHcAgEBBEIBsbQvtW0mRijy/QtKxjYK176RUWvS4uyVtQ2ghi3x9kzIHStH5hBv
+q8yxmYn2HjOR2bhTA6FwW91mey2wsfAP2VmgBwYFK4EEACOhgYkDgYYABAC0MTRu
+a6/FR8lIE21W8isVdazmBPJQbN4ECvSxHQQrhnYTCZVa/rFvfinMaQVdMiwbLoE2
+gSqT3/99yGf/dNAZNgFDAQ9jzE0PRKIxe4bHFBwUa/zmMbzw1K5CLilSjbKsV8y7
+OSz1w6unEErf4bWlH00fHCcZavxRonxuvrhRmNiMPA==
  -----END EC PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/genall b/test/aux-fixed/exim-ca/genall

index 6998108b0bff135379b520a11613d13c73b73731..bcdc40d9371ed0c46a38426edc8865d3f965d5ed 100755 (executable)
--- a/test/aux-fixed/exim-ca/genall
+++ b/test/aux-fixed/exim-ca/genall
@@ -44,7 +44,7 @@ do
      clica $V -D $idir -p password -s 103 -S expired1.$iname -m 1
  
      clica $V -D $idir -p password -s 201 -S  server2.$iname -m 301 \
-       -3 'CN=clica CA rsa,O=example.com' -8 '*.test.ex'
+       -3 "CN=clica CA rsa,O=example.$tld" -8 '*.test.ex'
      clica $V -D $idir -p password -s 202 -S revoked2.$iname -m 301
      clica $V -D $idir -p password -s 203 -S expired2.$iname -m 1
  
diff --git a/test/dnszones-src/db.example.com b/test/dnszones-src/db.example.com

index 94eb71ccc1462c8a3c136760c305c2f0a7211deb..4997d4d7c5d9ac0ac6a6177743fb0787263dd9a0 100644 (file)
--- a/test/dnszones-src/db.example.com
+++ b/test/dnszones-src/db.example.com
@@ -52,7 +52,7 @@ alternatename.server1 CNAME server1
  ;
  ;
  DNSSEC danebroken7  A       127.0.0.1
-DNSSEC _1225._tcp.danebroken7 TLSA 2 0 1 3110db5e73708d6fc3ffed8dcd1eef2bcd3c35d8da86ed048a332cb9d9538a0f
+DNSSEC _1225._tcp.danebroken7 TLSA 2 0 1 7b7f27746dafe59e5b419ee4c5ea97f04fcf100f65567d92b1b91f88cf199055
  
  ; the same, EE-mode
  ;
@@ -60,6 +60,6 @@ DNSSEC _1225._tcp.danebroken7 TLSA 2 0 1 3110db5e73708d6fc3ffed8dcd1eef2bcd3c35d
  ; | openssl pkey -pubin -outform DER | openssl dgst -sha256 | awk '{print $2}'
  ;
  DNSSEC danebroken8  A       127.0.0.1
-DNSSEC _1225._tcp.danebroken8 TLSA 3 1 1 5384398f502c423736dcc42295808f7a84769eb96d009816fa077e00bebc768e
+DNSSEC _1225._tcp.danebroken8 TLSA 3 1 1 403071b52f61ba0ab13013b68a97b08325ce8d5e13ba6b6b6f42c2da89ed1b21
  
  ; End
diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex

index 8eeff20a20817cbd7415293bd9197f9e88b64bcf..5c7c5a5ae532ccc9fe8dfe0692216f6aef21b8a1 100644 (file)
--- a/test/dnszones-src/db.test.ex
+++ b/test/dnszones-src/db.test.ex
@@ -447,7 +447,7 @@ mxnondane512ee              MX  1  dane512ee
  DNSSEC dane512ee            A      HOSTIPV4
  DNSSEC nodane               A      HOSTIPV4
  
-DNSSEC _1225._tcp.dane512ee TLSA  3 1 2 c0c2fc12e9fe1abf0ae7b1f2ad2798a4689668db8cf7f7b771a43bf8a4f1d9741ef103bad470b1201157150fbd6182054b0170e90ce66b944a82a0a9c81281af
+DNSSEC _1225._tcp.dane512ee TLSA  3 1 2 c67ee9fe126c0d4e941540ea5136884fcd750d78f2868163345ba40b6af503666803c6a29ca37c52925947ce6ecc568dc5249da1a8ccfabcd1824629ec8e92c0
  
  # mx of mxdane owns a secure A and TLSA record
  # used in 5802
@@ -470,7 +470,7 @@ daneinsecchain              CNAME  dane512ee
  ; | awk '{print $2}'
  ;
  DNSSEC dane256ee            A      HOSTIPV4
-DNSSEC _1225._tcp.dane256ee TLSA  3 1 1 7230d90731ea2c94f7f5e892489cc43f842ad261974e89e4306b081401032b7a
+DNSSEC _1225._tcp.dane256ee TLSA  3 1 1 9177e577d294f52da8eb206eb53e7963fb8d354bb4a1a62aa8318101dbc11e46
  
  ; full MX, sha256, TA-mode
  ;
@@ -479,7 +479,7 @@ DNSSEC _1225._tcp.dane256ee TLSA  3 1 1 7230d90731ea2c94f7f5e892489cc43f842ad261
  ;
  DNSSEC mxdane256ta          MX  1  dane256ta
  DNSSEC dane256ta            A      HOSTIPV4
-DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 52a90c3571549f83cff5b6166ae3210fe6e43dd3f95694cc85c989221bdfc4c7
+DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 0d41f0b28cf41f19f6f5fe116300e2cc8c60764547271f5de37f6323478d6e50
  
  
  ; full MX, sha256, TA-mode, cert-key-only
@@ -496,7 +496,7 @@ DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 52a90c3571549f83cff5b6166ae3210fe6e43dd3f
  ;
  DNSSEC mxdane256tak          MX  1  dane256tak
  DNSSEC dane256tak            A      HOSTIPV4
-DNSSEC _1225._tcp.dane256tak TLSA 2 1 1 535b534691f5755ae7deef6593ef73f7a34db16833d6653300c942a29877e18f
+DNSSEC _1225._tcp.dane256tak TLSA 2 1 1 1eb5225459d5d901183855ef1e853235a6c31b91deed292751e4536dbf0ab9ea
  
  
  
@@ -528,17 +528,17 @@ DNSSEC _1225._tcp.danebroken2 TLSA 2 0 1 cb0fa6000000000000000000000000000000000
  ; (record copied from dane256ee above)
  ; 3 for dane-requested, 4 for dane-required
  DNSSEC danebroken3          A       127.0.0.1
-_1225._tcp.danebroken3 TLSA 2 0 1 7230d90731ea2c94f7f5e892489cc43f842ad261974e89e4306b081401032b7a
+_1225._tcp.danebroken3 TLSA 2 0 1 9177e577d294f52da8eb206eb53e7963fb8d354bb4a1a62aa8318101dbc11e46
  DNSSEC danebroken4          A       HOSTIPV4
-_1225._tcp.danebroken4 TLSA 2 0 1 7230d90731ea2c94f7f5e892489cc43f842ad261974e89e4306b081401032b7a
+_1225._tcp.danebroken4 TLSA 2 0 1 9177e577d294f52da8eb206eb53e7963fb8d354bb4a1a62aa8318101dbc11e46
  
  ; a broken dane config (or under attack) where the address record is correct but not DNSSEC-assured
  ; (TLSA record copied from dane256ee above)
  ; 5 for dane-requested, 6 for dane-required
  danebroken5          A       127.0.0.1
-DNSSEC _1225._tcp.danebroken5 TLSA 2 0 1 7230d90731ea2c94f7f5e892489cc43f842ad261974e89e4306b081401032b7a
+DNSSEC _1225._tcp.danebroken5 TLSA 2 0 1 9177e577d294f52da8eb206eb53e7963fb8d354bb4a1a62aa8318101dbc11e46
  danebroken6          A       HOSTIPV4
-DNSSEC _1225._tcp.danebroken6 TLSA 2 0 1 7230d90731ea2c94f7f5e892489cc43f842ad261974e89e4306b081401032b7a
+DNSSEC _1225._tcp.danebroken6 TLSA 2 0 1 9177e577d294f52da8eb206eb53e7963fb8d354bb4a1a62aa8318101dbc11e46
  
  ; a good dns config saying there is no dane support, by securely returning NOXDOMAIN for TLSA lookups
  ; 3 for dane-required, 4 for merely requested
@@ -551,7 +551,7 @@ DNSSEC NXDOMAIN _1225._tcp.dane.no.4 TLSA 2 0 1 eec923139018c540a344c5191660ecba
  
  ; a mixed-usage set of TLSA records, EE one failing.  TA one coped from dane256ta.
  DNSSEC danemixed            A      127.0.0.1
-DNSSEC _1225._tcp.danemixed TLSA  2 0 1 52a90c3571549f83cff5b6166ae3210fe6e43dd3f95694cc85c989221bdfc4c7
+DNSSEC _1225._tcp.danemixed TLSA  2 0 1 0d41f0b28cf41f19f6f5fe116300e2cc8c60764547271f5de37f6323478d6e50
  DNSSEC                      TLSA  3 1 1 8276000000000000000000000000000000000000000000000000000000000000
  
  ; ------- Testing delays ------------
diff --git a/test/log/2002 b/test/log/2002

index 36ea6c17332e4f820997c22ea92fb3e968cdd49c..0641b50836034bcd7d5abf0ce35f883f0a93324c 100644 (file)
--- a/test/log/2002
+++ b/test/log/2002
@@ -28,19 +28,19 @@
  1999-03-02 09:44:33 SN  <CN=server2.example.com>
  1999-03-02 09:44:33 IN  <O=example.com,CN=clica Signing Cert rsa>
  1999-03-02 09:44:33 IN/O <example.com>
-1999-03-02 09:44:33 NB/r <Nov  1 12:40:04 2012 GMT>
-1999-03-02 09:44:33 NB   <Nov  1 12:40:04 2012 GMT>
-1999-03-02 09:44:33 NB/i <1351773604>
-1999-03-02 09:44:33 NA/i <2143284004>
-1999-03-02 09:44:33 NA   <Dec  1 12:40:04 2037 GMT>
+1999-03-02 09:44:33 NB/r <Nov  1 12:34:30 2012 GMT>
+1999-03-02 09:44:33 NB   <Nov  1 12:34:30 2012 GMT>
+1999-03-02 09:44:33 NB/i <1351773270>
+1999-03-02 09:44:33 NA/i <2143283670>
+1999-03-02 09:44:33 NA   <Dec  1 12:34:30 2037 GMT>
  1999-03-02 09:44:33 SA  <RSA-SHA256>
-1999-03-02 09:44:33 SG  <b1 ce 91 99 2f 1c ba 4d 9b 44 12 a1 fd 3d be 69 9d 34 51 3a ff ed 13 08 8a 0f 13 17 aa a9 23 ac cb 83 6c 17 e1 da e3 a5 ad b6 32 51 49 5b 5b 85 1c 45 f2 3c 44 53 b6 ed 3e 21 60 41 46 8e 70 96 53 c1 03 c3 86 64 12 38 f3 4e f0 64 b8 ea 82 79 ed a4 3b 53 b3 be 5f 73 35 b1 54 b9 3d ad 88 cc 4e af ac 94 a1 df 8f 7f 08 d6 d3 03 c5 8f 41 d5 8b 97 15 49 84 95 c0 71 93 6d 68 4b ba 94 2b 19 b8 34 8c 4e 90 2c 5b 92 38 fa c9 f2 ae 6d f2 bc fe 6d d1 e0 f6 f0 ae 4b 80 22 9e 3d 7f 7a d9 da e4 00 e3 fa 5c 64 39 d5 59 db 31 0e db d5 34 9d 41 e7 6d 60 a2 29 47 75 4a 52 f1 b9 2b 2f fe d1 cf 91 9b 07 e2 d9 a4 3c a1 75 f0 7a 4c c9 c9 2e 63 be 8b dd 55 5b 1d 84 ee bc 22 df 91 cf fc ee ae c3 79 3e 7f 86 8f 56 2e 40 d5 2c da 70 eb 18 73 7e 54 82 05 a6 05 94 8c b6 4e e1 b7 09 72 d6>
-1999-03-02 09:44:33 SAN <DNS=server2.example.com\nDNS=*.test.ex>
+1999-03-02 09:44:33 SG  <5d 2c 8d dc bf 45 79 5d 60 8e 57 08 fe 10 da 9d 34 eb e6 b0 b0 5b 88 16 70 97 0b ab b4 1c a8 04 99 40 84 1b ed 45 6c fc 30 9c f2 f2 44 28 f3 76 28 a0 14 49 9f a1 00 ac 2b cf 88 68 ea bc 21 d2 4b 29 fa 5e 38 d8 78 52 ae 0e d8 ef 20 84 f3 43 8a 05 ea 17 f7 37 89 a8 9b 3a ba 41 26 d2 e4 0f a5 21 f6 c1 e7 15 90 b0 c4 5b 2b d0 05 23 e7 84 45 77 24 b1 34 8f 24 a0 9b 69 39 52 0a ec b3 38 1e 70 47 60 23 ea f7 3d c7 0c 20 de dd d5 6f 56 76 db 74 24 c4 4e 13 e1 ee 0a b5 c1 72 95 38 08 11 bc e4 fe d5 be 5f 80 1d 5d c9 48 b8 40 43 5a 3e 2a fa bb e7 df 29 79 d2 c2 3a 2d f4 4b 02 f1 c3 05 88 84 9a b4 af 03 c0 55 2b 72 b0 ba f4 3b 5d 09 8f 6e 06 2a 52 0d a4 4a 38 06 2c c3 4c 83 a9 91 d9 6a ed a5 a1 fe 67 44 97 2c f1 f9 4f 36 1f 92 57 0c 76 7a d3 e0 6f 04 72 11 db ae 4b 42>
+1999-03-02 09:44:33 SAN <DNS=*.test.ex\nDNS=server2.example.com>
  1999-03-02 09:44:33 (no CRU)
-1999-03-02 09:44:33 md5    fingerprint 861F6627E5FD9C624B4B27ECA6FA6B06
-1999-03-02 09:44:33 sha1   fingerprint E75D537E478758010505D4F339B00DFD73728088
-1999-03-02 09:44:33 sha256 fingerprint E251FA7D0372CB784294CF92B243DCE53FDDABD9F58A1B89226586C07C82CAC6
-1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2Igy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSodF3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xwPCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYGOhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNSgCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59YtxxJC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPDhmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJhJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovdVVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY=
+1999-03-02 09:44:33 md5    fingerprint 1B701FAEF70F57451A50B2A91EF011EE
+1999-03-02 09:44:33 sha1   fingerprint DE737222042460A49F3E53A3FE05B9313E57327B
+1999-03-02 09:44:33 sha256 fingerprint D64B951B475CAB05CD7CFDBC4A1E4754D448FA554D6BB0411E065A5A885A013A
+1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTIzNDMwWhcNMzcxMjAxMTIzNDMwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHHdAsbLWHT6remjd2Rw+Tb1EDjDgHkhc6X2d3KyEvcNkbp+RMhyC0grYbue0tOp8SU+3U+TjLAsc3xesuGJYmsC8ttWf3fNOCM7TmE80fSzbZ4j6B8z6jbGT+fblaunHTRJF5H+yRKrV+Nfi7Pqu0YO3dnlGuehg8jjDUq3QrPTSU67P7DyDQv68cgWmck4h9OOC/T81hkNJk99ThWMkTkj8WsmdLVysK8suaniNuhDQvRmF/OZBUGb6hqEdRYDz3rIjrENHCtOygPFtZhc/YNSYMokIcJw3mTPLwTE0GbCfLowhkjPYW6J7ZuOlTTQqF/9b3yIYTpmm8sGVacEEwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAF0sjdy/RXldYI5XCP4Q2p006+awsFuIFnCXC6u0HKgEmUCEG+1FbPwwnPLyRCjzdiigFEmfoQCsK8+IaOq8IdJLKfpeONh4Uq4O2O8ghPNDigXqF/c3iaibOrpBJtLkD6Uh9sHnFZCwxFsr0AUj54RFdySxNI8koJtpOVIK7LM4HnBHYCPq9z3HDCDe3dVvVnbbdCTEThPh7gq1wXKVOAgRvOT+1b5fgB1dyUi4QENaPir6u+ffKXnSwjot9EsC8cMFiISatK8DwFUrcrC69DtdCY9uBipSDaRKOAYsw0yDqZHZau2lof5nRJcs8flPNh+SVwx2etPgbwRyEduuS0I=
  1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
  1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
  1999-03-02 09:44:33 ver:    TLS1.x
diff --git a/test/log/2102.openssl_1_1_1 b/test/log/2102.openssl_1_1_1

index ff99c1b67eada12d8465af35e8ad4b8f64051092..67d6c7ea65113f411c376af343aea9f9ca860cf7 100644 (file)
--- a/test/log/2102.openssl_1_1_1
+++ b/test/log/2102.openssl_1_1_1
@@ -25,20 +25,20 @@
  1999-03-02 09:44:33 SN  <CN=server2.example.com>
  1999-03-02 09:44:33 IN  <CN=clica Signing Cert rsa,O=example.com>
  1999-03-02 09:44:33 IN/O <example.com>
-1999-03-02 09:44:33 NB/r <Nov  1 12:40:04 2012 GMT>
-1999-03-02 09:44:33 NB   <Nov  1 12:40:04 2012 +0000>
-1999-03-02 09:44:33 NB/i <1351773604>
-1999-03-02 09:44:33 NA/i <2143284004>
-1999-03-02 09:44:33 NA   <Dec  1 12:40:04 2037 +0000>
+1999-03-02 09:44:33 NB/r <Nov  1 12:34:30 2012 GMT>
+1999-03-02 09:44:33 NB   <Nov  1 12:34:30 2012 +0000>
+1999-03-02 09:44:33 NB/i <1351773270>
+1999-03-02 09:44:33 NA/i <2143283670>
+1999-03-02 09:44:33 NA   <Dec  1 12:34:30 2037 +0000>
  1999-03-02 09:44:33 SA  <sha256WithRSAEncryption>
-1999-03-02 09:44:33 SG  <         b1:ce:91:99:2f:1c:ba:4d:9b:44:12:a1:fd:3d:be:69:9d:34:\n         51:3a:ff:ed:13:08:8a:0f:13:17:aa:a9:23:ac:cb:83:6c:17:\n         e1:da:e3:a5:ad:b6:32:51:49:5b:5b:85:1c:45:f2:3c:44:53:\n         b6:ed:3e:21:60:41:46:8e:70:96:53:c1:03:c3:86:64:12:38:\n         f3:4e:f0:64:b8:ea:82:79:ed:a4:3b:53:b3:be:5f:73:35:b1:\n         54:b9:3d:ad:88:cc:4e:af:ac:94:a1:df:8f:7f:08:d6:d3:03:\n         c5:8f:41:d5:8b:97:15:49:84:95:c0:71:93:6d:68:4b:ba:94:\n         2b:19:b8:34:8c:4e:90:2c:5b:92:38:fa:c9:f2:ae:6d:f2:bc:\n         fe:6d:d1:e0:f6:f0:ae:4b:80:22:9e:3d:7f:7a:d9:da:e4:00:\n         e3:fa:5c:64:39:d5:59:db:31:0e:db:d5:34:9d:41:e7:6d:60:\n         a2:29:47:75:4a:52:f1:b9:2b:2f:fe:d1:cf:91:9b:07:e2:d9:\n         a4:3c:a1:75:f0:7a:4c:c9:c9:2e:63:be:8b:dd:55:5b:1d:84:\n         ee:bc:22:df:91:cf:fc:ee:ae:c3:79:3e:7f:86:8f:56:2e:40:\n         d5:2c:da:70:eb:18:73:7e:54:82:05:a6:05:94:8c:b6:4e:e1:\n         b7:09:72:d6\n>
-1999-03-02 09:44:33 SAN <DNS=*.test.ex\nDNS=server2.example.com>
+1999-03-02 09:44:33 SG  <         5d:2c:8d:dc:bf:45:79:5d:60:8e:57:08:fe:10:da:9d:34:eb:\n         e6:b0:b0:5b:88:16:70:97:0b:ab:b4:1c:a8:04:99:40:84:1b:\n         ed:45:6c:fc:30:9c:f2:f2:44:28:f3:76:28:a0:14:49:9f:a1:\n         00:ac:2b:cf:88:68:ea:bc:21:d2:4b:29:fa:5e:38:d8:78:52:\n         ae:0e:d8:ef:20:84:f3:43:8a:05:ea:17:f7:37:89:a8:9b:3a:\n         ba:41:26:d2:e4:0f:a5:21:f6:c1:e7:15:90:b0:c4:5b:2b:d0:\n         05:23:e7:84:45:77:24:b1:34:8f:24:a0:9b:69:39:52:0a:ec:\n         b3:38:1e:70:47:60:23:ea:f7:3d:c7:0c:20:de:dd:d5:6f:56:\n         76:db:74:24:c4:4e:13:e1:ee:0a:b5:c1:72:95:38:08:11:bc:\n         e4:fe:d5:be:5f:80:1d:5d:c9:48:b8:40:43:5a:3e:2a:fa:bb:\n         e7:df:29:79:d2:c2:3a:2d:f4:4b:02:f1:c3:05:88:84:9a:b4:\n         af:03:c0:55:2b:72:b0:ba:f4:3b:5d:09:8f:6e:06:2a:52:0d:\n         a4:4a:38:06:2c:c3:4c:83:a9:91:d9:6a:ed:a5:a1:fe:67:44:\n         97:2c:f1:f9:4f:36:1f:92:57:0c:76:7a:d3:e0:6f:04:72:11:\n         db:ae:4b:42\n>
+1999-03-02 09:44:33 SAN <DNS=server2.example.com\nDNS=*.test.ex>
  1999-03-02 09:44:33 OCU <http://oscp.example.com/>
  1999-03-02 09:44:33 (no CRU)
-1999-03-02 09:44:33 md5    fingerprint 861F6627E5FD9C624B4B27ECA6FA6B06
-1999-03-02 09:44:33 sha1   fingerprint E75D537E478758010505D4F339B00DFD73728088
-1999-03-02 09:44:33 sha256 fingerprint E251FA7D0372CB784294CF92B243DCE53FDDABD9F58A1B89226586C07C82CAC6
-1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2Igy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSodF3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xwPCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYGOhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNSgCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59YtxxJC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPDhmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJhJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovdVVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY=
+1999-03-02 09:44:33 md5    fingerprint 1B701FAEF70F57451A50B2A91EF011EE
+1999-03-02 09:44:33 sha1   fingerprint DE737222042460A49F3E53A3FE05B9313E57327B
+1999-03-02 09:44:33 sha256 fingerprint D64B951B475CAB05CD7CFDBC4A1E4754D448FA554D6BB0411E065A5A885A013A
+1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTIzNDMwWhcNMzcxMjAxMTIzNDMwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHHdAsbLWHT6remjd2Rw+Tb1EDjDgHkhc6X2d3KyEvcNkbp+RMhyC0grYbue0tOp8SU+3U+TjLAsc3xesuGJYmsC8ttWf3fNOCM7TmE80fSzbZ4j6B8z6jbGT+fblaunHTRJF5H+yRKrV+Nfi7Pqu0YO3dnlGuehg8jjDUq3QrPTSU67P7DyDQv68cgWmck4h9OOC/T81hkNJk99ThWMkTkj8WsmdLVysK8suaniNuhDQvRmF/OZBUGb6hqEdRYDz3rIjrENHCtOygPFtZhc/YNSYMokIcJw3mTPLwTE0GbCfLowhkjPYW6J7ZuOlTTQqF/9b3yIYTpmm8sGVacEEwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAF0sjdy/RXldYI5XCP4Q2p006+awsFuIFnCXC6u0HKgEmUCEG+1FbPwwnPLyRCjzdiigFEmfoQCsK8+IaOq8IdJLKfpeONh4Uq4O2O8ghPNDigXqF/c3iaibOrpBJtLkD6Uh9sHnFZCwxFsr0AUj54RFdySxNI8koJtpOVIK7LM4HnBHYCPq9z3HDCDe3dVvVnbbdCTEThPh7gq1wXKVOAgRvOT+1b5fgB1dyUi4QENaPir6u+ffKXnSwjot9EsC8cMFiISatK8DwFUrcrC69DtdCY9uBipSDaRKOAYsw0yDqZHZau2lof5nRJcs8flPNh+SVwx2etPgbwRyEduuS0I=
  1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
  1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
  1999-03-02 09:44:33 ver:    TLS1.x
diff --git a/test/log/5710 b/test/log/5710

index 4a3a18095644512d1f5be4eb49d2daf5cacabc32..73ac2ec8c11eba51d71c9b3ad04dcbc5754408b1 100644 (file)
--- a/test/log/5710
+++ b/test/log/5710
@@ -13,11 +13,11 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 SN; <CN=server1.example.com>
  1999-03-02 09:44:33 10HmaX-0005vi-00 SNCN<server1.example.com>
  1999-03-02 09:44:33 10HmaX-0005vi-00 IN  <O=example.com,CN=clica Signing Cert rsa>
-1999-03-02 09:44:33 10HmaX-0005vi-00 NB  <Nov  1 12:39:45 2012 GMT>
-1999-03-02 09:44:33 10HmaX-0005vi-00 NA  <Dec  1 12:39:45 2037 GMT>
+1999-03-02 09:44:33 10HmaX-0005vi-00 NB  <Nov  1 12:34:10 2012 GMT>
+1999-03-02 09:44:33 10HmaX-0005vi-00 NA  <Dec  1 12:34:10 2037 GMT>
  1999-03-02 09:44:33 10HmaX-0005vi-00 SA  <RSA-SHA256>
-1999-03-02 09:44:33 10HmaX-0005vi-00 SG  <af ef e1 09 1c 4c 5d 83 98 d1 76 b5 69 8d 52 cd ff 4d b2 aa 90 ed b5 e1 49 86 2d 5e 44 fe ca ae 0c d0 d4 f3 9a 64 96 cb bf c5 ec ec da 84 85 a4 50 ba e4 aa 6b fb c4 2f 0b 4d e1 b9 f3 06 32 18 29 3e e8 bb ff b8 aa 1e a1 c9 5d 33 e7 48 d4 20 a8 9c cb 3a 22 24 ce b9 7f 44 8c 61 b1 1d 57 4d ed 6d 70 29 4b 76 a1 f3 05 6c 7e b4 f2 b9 44 37 f8 37 e3 47 5d 3e 52 9a e0 8a 57 d7 cf c8 49 65 70 6b 4a 8b 82 dc d0 42 93 00 84 8c 07 55 20 2c cc 1d 11 69 8c a1 38 f8 b6 80 86 96 a6 9f 8e 8c 83 37 d6 b1 93 0d 14 4c 9b c1 ee bf 88 40 cb 1d 7e 2b 5c aa 70 5d 97 e6 bc 18 35 a0 ae b8 84 ee af 95 f2 e2 d1 f4 75 bc d0 b0 cd aa e1 48 90 04 a3 53 bb 23 59 92 66 eb f7 cb 87 9f 08 d9 dc 22 b5 4a 1f db de 55 c0 b7 48 c8 b1 aa 3e 48 5f a8 fd 9f 3d be 89 b9 3b 69 35 1c 2b 63 02 46 5d 4a>
-1999-03-02 09:44:33 10HmaX-0005vi-00 SAN <DNS=alternatename.server1.example.com\nDNS=alternatename2.server1.example.com\nDNS=*.test.ex\nDNS=server1.example.com>
+1999-03-02 09:44:33 10HmaX-0005vi-00 SG  <96 29 b8 21 7e 2e 40 8f 4c c0 a3 e4 08 cc d0 06 80 cd 02 cc 06 3e 48 09 f8 58 83 b7 8e f5 82 ca da c7 f9 9f 02 9b 68 47 d1 69 72 08 e6 d1 7e 2b 1c be 26 66 e1 04 05 47 e4 5d 48 bd 2a 65 58 80 a3 5c f1 85 1b 3f fe 09 7e aa e2 a8 a6 23 8e 69 76 41 56 8b 61 70 40 ff ea e2 7f 1e 07 18 18 43 5f fc 31 8f ad 93 f4 d6 af 19 36 dc f5 e9 ae 76 87 90 85 0d 8b f5 76 70 b2 1c 48 ce 41 22 d4 35 e9 74 6b 65 06 04 c7 cf 86 16 81 6e 54 6f 3b d3 df 7c 55 36 bd 04 5c a3 1d 42 cc 23 1a f5 b2 3d 30 22 19 0e a0 10 e5 8f eb a5 a0 29 9b 34 de 3c 86 5c 09 77 26 f1 38 46 06 52 79 bf 7f 35 70 15 d0 06 1f 5a 54 16 d2 a3 df 38 a1 43 da 03 9e f9 90 10 dc 35 04 ea ca dc 94 f0 6a 60 3e d2 c5 53 a2 0a a6 62 bd 95 21 22 f2 24 b9 66 10 08 7b 16 88 75 8c 6c e2 ed 92 c1 c8 ba ac 6d 76 61 fe c3>
+1999-03-02 09:44:33 10HmaX-0005vi-00 SAN <DNS=alternatename2.server1.example.com\nDNS=server1.example.com\nDNS=alternatename.server1.example.com\nDNS=*.test.ex>
  1999-03-02 09:44:33 10HmaX-0005vi-00 CRU <http://crl.example.com/latest.crl>
  1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (certificate verification failed): certificate invalid: delivering unencrypted to H=127.0.0.1 [127.0.0.1] (not in hosts_require_tls)
  1999-03-02 09:44:33 10HmaX-0005vi-00 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
@@ -44,11 +44,11 @@
  1999-03-02 09:44:33 10HmaY-0005vi-00 SN; <CN=server1.example.com>
  1999-03-02 09:44:33 10HmaY-0005vi-00 SNCN<server1.example.com>
  1999-03-02 09:44:33 10HmaY-0005vi-00 IN  <O=example.com,CN=clica Signing Cert rsa>
-1999-03-02 09:44:33 10HmaY-0005vi-00 NB  <Nov  1 12:39:45 2012 GMT>
-1999-03-02 09:44:33 10HmaY-0005vi-00 NA  <Dec  1 12:39:45 2037 GMT>
+1999-03-02 09:44:33 10HmaY-0005vi-00 NB  <Nov  1 12:34:10 2012 GMT>
+1999-03-02 09:44:33 10HmaY-0005vi-00 NA  <Dec  1 12:34:10 2037 GMT>
  1999-03-02 09:44:33 10HmaY-0005vi-00 SA  <RSA-SHA256>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SG  <af ef e1 09 1c 4c 5d 83 98 d1 76 b5 69 8d 52 cd ff 4d b2 aa 90 ed b5 e1 49 86 2d 5e 44 fe ca ae 0c d0 d4 f3 9a 64 96 cb bf c5 ec ec da 84 85 a4 50 ba e4 aa 6b fb c4 2f 0b 4d e1 b9 f3 06 32 18 29 3e e8 bb ff b8 aa 1e a1 c9 5d 33 e7 48 d4 20 a8 9c cb 3a 22 24 ce b9 7f 44 8c 61 b1 1d 57 4d ed 6d 70 29 4b 76 a1 f3 05 6c 7e b4 f2 b9 44 37 f8 37 e3 47 5d 3e 52 9a e0 8a 57 d7 cf c8 49 65 70 6b 4a 8b 82 dc d0 42 93 00 84 8c 07 55 20 2c cc 1d 11 69 8c a1 38 f8 b6 80 86 96 a6 9f 8e 8c 83 37 d6 b1 93 0d 14 4c 9b c1 ee bf 88 40 cb 1d 7e 2b 5c aa 70 5d 97 e6 bc 18 35 a0 ae b8 84 ee af 95 f2 e2 d1 f4 75 bc d0 b0 cd aa e1 48 90 04 a3 53 bb 23 59 92 66 eb f7 cb 87 9f 08 d9 dc 22 b5 4a 1f db de 55 c0 b7 48 c8 b1 aa 3e 48 5f a8 fd 9f 3d be 89 b9 3b 69 35 1c 2b 63 02 46 5d 4a>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <DNS=alternatename.server1.example.com\nDNS=alternatename2.server1.example.com\nDNS=*.test.ex\nDNS=server1.example.com>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SG  <96 29 b8 21 7e 2e 40 8f 4c c0 a3 e4 08 cc d0 06 80 cd 02 cc 06 3e 48 09 f8 58 83 b7 8e f5 82 ca da c7 f9 9f 02 9b 68 47 d1 69 72 08 e6 d1 7e 2b 1c be 26 66 e1 04 05 47 e4 5d 48 bd 2a 65 58 80 a3 5c f1 85 1b 3f fe 09 7e aa e2 a8 a6 23 8e 69 76 41 56 8b 61 70 40 ff ea e2 7f 1e 07 18 18 43 5f fc 31 8f ad 93 f4 d6 af 19 36 dc f5 e9 ae 76 87 90 85 0d 8b f5 76 70 b2 1c 48 ce 41 22 d4 35 e9 74 6b 65 06 04 c7 cf 86 16 81 6e 54 6f 3b d3 df 7c 55 36 bd 04 5c a3 1d 42 cc 23 1a f5 b2 3d 30 22 19 0e a0 10 e5 8f eb a5 a0 29 9b 34 de 3c 86 5c 09 77 26 f1 38 46 06 52 79 bf 7f 35 70 15 d0 06 1f 5a 54 16 d2 a3 df 38 a1 43 da 03 9e f9 90 10 dc 35 04 ea ca dc 94 f0 6a 60 3e d2 c5 53 a2 0a a6 62 bd 95 21 22 f2 24 b9 66 10 08 7b 16 88 75 8c 6c e2 ed 92 c1 c8 ba ac 6d 76 61 fe c3>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <DNS=alternatename2.server1.example.com\nDNS=server1.example.com\nDNS=alternatename.server1.example.com\nDNS=*.test.ex>
  1999-03-02 09:44:33 10HmaY-0005vi-00 CRU <http://crl.example.com/latest.crl>
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/5720 b/test/log/5720

index 4f6254f6291aec0b688dd877ff93b9e92bb948fe..4ecc5f8b2f8815aa9e8d3e5519f7f676e5d3a2b0 100644 (file)
--- a/test/log/5720
+++ b/test/log/5720
@@ -13,10 +13,10 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 SN; <CN=clica CA rsa;O=example.com>
  1999-03-02 09:44:33 10HmaX-0005vi-00 SNO <example.com>
  1999-03-02 09:44:33 10HmaX-0005vi-00 IN  <CN=clica CA rsa,O=example.com>
-1999-03-02 09:44:33 10HmaX-0005vi-00 NB  <Nov  1 12:39:33 2012 +0000>
-1999-03-02 09:44:33 10HmaX-0005vi-00 NA  <Jan  1 12:39:33 2038 +0000>
+1999-03-02 09:44:33 10HmaX-0005vi-00 NB  <Nov  1 12:34:04 2012 +0000>
+1999-03-02 09:44:33 10HmaX-0005vi-00 NA  <Jan  1 12:34:04 2038 +0000>
  1999-03-02 09:44:33 10HmaX-0005vi-00 SA  <sha256WithRSAEncryption>
-1999-03-02 09:44:33 10HmaX-0005vi-00 SG  <         0e:88:63:f2:4c:a9:1e:6a:5b:ec:1e:31:1d:90:69:de:08:b1:\n         9e:ca:36:90:94:84:93:61:81:75:20:07:02:6b:66:c8:ae:0d:\n         54:b1:0a:cd:95:bd:0b:83:ff:c7:4b:2c:af:f5:6a:df:58:d4:\n         61:50:2e:6c:ec:7c:39:b0:6d:81:f3:35:87:ee:ad:f1:90:8e:\n         94:fd:9c:c2:5f:57:29:0e:d2:5b:90:02:f5:fe:df:92:bd:58:\n         f2:58:54:08:b0:26:38:b8:c0:b7:2f:b7:97:cf:9e:ac:a2:b3:\n         98:d8:54:90:3a:07:0d:24:ac:ad:ad:65:5c:60:30:92:76:4b:\n         18:ee:ae:84:6a:6b:81:86:c0:16:50:69:91:42:6c:85:ab:ed:\n         60:70:89:72:d0:4d:95:1c:7a:a8:03:6e:61:83:bf:67:3c:3e:\n         74:d7:24:c7:2d:d7:bc:b3:1b:cc:4f:4d:ee:98:e0:e9:b9:61:\n         7e:41:ac:3f:19:37:b3:05:13:78:30:b4:b8:b8:6b:2a:95:37:\n         a6:98:63:45:74:1b:0a:62:60:f8:cc:04:fe:69:e6:76:16:9c:\n         0a:a3:e5:f2:64:7a:82:00:a4:6e:d1:88:7c:1e:fb:6f:bb:af:\n         7a:86:74:d2:ca:f7:c5:64:42:b5:b8:a8:d4:b8:4b:03:9f:45:\n         d3:f4:db:28\n>
+1999-03-02 09:44:33 10HmaX-0005vi-00 SG  <         2f:9e:ed:c8:45:94:91:a3:97:5b:4f:a5:60:96:c7:be:40:28:\n         0c:19:25:a8:ec:29:2e:09:1c:e6:95:00:1d:8e:96:bb:80:7b:\n         d7:61:3e:37:8b:d5:1d:37:26:f8:3e:c5:0b:07:fb:79:9c:0f:\n         ed:95:58:90:1a:42:49:97:9b:c5:9e:f3:f2:3b:ff:41:b0:74:\n         ff:8e:24:04:95:9f:85:93:b3:75:f4:38:80:1c:25:7d:2e:e1:\n         e4:f4:a7:ba:6d:89:6c:6c:30:c1:19:96:47:a2:9d:e7:c7:8a:\n         0b:54:eb:f1:1d:af:0a:84:87:7e:c5:74:19:b0:ce:e3:f7:ef:\n         8f:5e:2a:bd:b6:d7:49:b9:ac:31:2a:30:8a:c0:5b:f8:a8:b4:\n         9d:ca:b7:e2:e7:14:09:15:54:9c:0a:09:16:38:3c:32:97:32:\n         51:66:d2:c2:fb:5c:d8:b8:8b:28:23:d7:e5:4c:78:91:55:0b:\n         15:2b:10:87:04:f4:d0:55:3f:fe:c8:f4:27:ca:4d:5b:75:79:\n         c5:df:ef:b2:e9:1c:be:af:0b:13:7b:da:7f:a2:76:34:7f:d0:\n         34:42:be:94:6c:ce:f7:36:c1:ee:f3:4f:61:aa:ba:54:d7:3b:\n         67:f7:47:5f:a2:ce:aa:fd:8d:92:09:46:21:de:bf:7f:1e:b8:\n         4b:00:c8:a6\n>
  1999-03-02 09:44:33 10HmaX-0005vi-00 (no SAN)
  1999-03-02 09:44:33 10HmaX-0005vi-00 (no OCU)
  1999-03-02 09:44:33 10HmaX-0005vi-00 (no CRU)
@@ -47,11 +47,11 @@
  1999-03-02 09:44:33 10HmaY-0005vi-00 SN; <CN=server1.example.com>
  1999-03-02 09:44:33 10HmaY-0005vi-00 SNO <>
  1999-03-02 09:44:33 10HmaY-0005vi-00 IN  <CN=clica Signing Cert rsa,O=example.com>
-1999-03-02 09:44:33 10HmaY-0005vi-00 NB  <Nov  1 12:39:45 2012 +0000>
-1999-03-02 09:44:33 10HmaY-0005vi-00 NA  <Dec  1 12:39:45 2037 +0000>
+1999-03-02 09:44:33 10HmaY-0005vi-00 NB  <Nov  1 12:34:10 2012 +0000>
+1999-03-02 09:44:33 10HmaY-0005vi-00 NA  <Dec  1 12:34:10 2037 +0000>
  1999-03-02 09:44:33 10HmaY-0005vi-00 SA  <sha256WithRSAEncryption>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SG  <         af:ef:e1:09:1c:4c:5d:83:98:d1:76:b5:69:8d:52:cd:ff:4d:\n         b2:aa:90:ed:b5:e1:49:86:2d:5e:44:fe:ca:ae:0c:d0:d4:f3:\n         9a:64:96:cb:bf:c5:ec:ec:da:84:85:a4:50:ba:e4:aa:6b:fb:\n         c4:2f:0b:4d:e1:b9:f3:06:32:18:29:3e:e8:bb:ff:b8:aa:1e:\n         a1:c9:5d:33:e7:48:d4:20:a8:9c:cb:3a:22:24:ce:b9:7f:44:\n         8c:61:b1:1d:57:4d:ed:6d:70:29:4b:76:a1:f3:05:6c:7e:b4:\n         f2:b9:44:37:f8:37:e3:47:5d:3e:52:9a:e0:8a:57:d7:cf:c8:\n         49:65:70:6b:4a:8b:82:dc:d0:42:93:00:84:8c:07:55:20:2c:\n         cc:1d:11:69:8c:a1:38:f8:b6:80:86:96:a6:9f:8e:8c:83:37:\n         d6:b1:93:0d:14:4c:9b:c1:ee:bf:88:40:cb:1d:7e:2b:5c:aa:\n         70:5d:97:e6:bc:18:35:a0:ae:b8:84:ee:af:95:f2:e2:d1:f4:\n         75:bc:d0:b0:cd:aa:e1:48:90:04:a3:53:bb:23:59:92:66:eb:\n         f7:cb:87:9f:08:d9:dc:22:b5:4a:1f:db:de:55:c0:b7:48:c8:\n         b1:aa:3e:48:5f:a8:fd:9f:3d:be:89:b9:3b:69:35:1c:2b:63:\n         02:46:5d:4a\n>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <DNS=server1.example.com;DNS=*.test.ex;DNS=alternatename2.server1.example.com;DNS=alternatename.server1.example.com>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SG  <         96:29:b8:21:7e:2e:40:8f:4c:c0:a3:e4:08:cc:d0:06:80:cd:\n         02:cc:06:3e:48:09:f8:58:83:b7:8e:f5:82:ca:da:c7:f9:9f:\n         02:9b:68:47:d1:69:72:08:e6:d1:7e:2b:1c:be:26:66:e1:04:\n         05:47:e4:5d:48:bd:2a:65:58:80:a3:5c:f1:85:1b:3f:fe:09:\n         7e:aa:e2:a8:a6:23:8e:69:76:41:56:8b:61:70:40:ff:ea:e2:\n         7f:1e:07:18:18:43:5f:fc:31:8f:ad:93:f4:d6:af:19:36:dc:\n         f5:e9:ae:76:87:90:85:0d:8b:f5:76:70:b2:1c:48:ce:41:22:\n         d4:35:e9:74:6b:65:06:04:c7:cf:86:16:81:6e:54:6f:3b:d3:\n         df:7c:55:36:bd:04:5c:a3:1d:42:cc:23:1a:f5:b2:3d:30:22:\n         19:0e:a0:10:e5:8f:eb:a5:a0:29:9b:34:de:3c:86:5c:09:77:\n         26:f1:38:46:06:52:79:bf:7f:35:70:15:d0:06:1f:5a:54:16:\n         d2:a3:df:38:a1:43:da:03:9e:f9:90:10:dc:35:04:ea:ca:dc:\n         94:f0:6a:60:3e:d2:c5:53:a2:0a:a6:62:bd:95:21:22:f2:24:\n         b9:66:10:08:7b:16:88:75:8c:6c:e2:ed:92:c1:c8:ba:ac:6d:\n         76:61:fe:c3\n>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <DNS=*.test.ex;DNS=alternatename.server1.example.com;DNS=server1.example.com;DNS=alternatename2.server1.example.com>
  1999-03-02 09:44:33 10HmaY-0005vi-00 OCU <http://oscp.example.com/>
  1999-03-02 09:44:33 10HmaY-0005vi-00 CRU <http://crl.example.com/latest.crl>
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/stdout/3720 b/test/stdout/3720

index 0351cdfd2dcb09bb44b7e58703c405268aa2c540..854382ee58392121331b67811bac38f00116858a 100644 (file)
--- a/test/stdout/3720
+++ b/test/stdout/3720
@@ -1,6 +1,6 @@
  Connecting to 127.0.0.1 port 1225 ... connected
-Certificate file = aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
-Key file = aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
+Certificate file = TESTSUITE/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
+Key file = TESTSUITE/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
  ??? 220
  <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  >>> EHLO tester
diff --git a/test/stdout/5800 b/test/stdout/5800

index dfac4a8a58ec8c8ade6552cecb5af4399af58601..e75acfcd5e71645500fef729915c24010fcb0f41 100644 (file)
--- a/test/stdout/5800
+++ b/test/stdout/5800
@@ -1,4 +1,4 @@
  > 
-> dnslookup tlsa: 3 1 2 c0c2fc12e9fe1abf0ae7b1f2ad2798a4689668db8cf7f7b771a43bf8a4f1d9741ef103bad470b1201157150fbd6182054b0170e90ce66b944a82a0a9c81281af
+> dnslookup tlsa: 3 1 2 c67ee9fe126c0d4e941540ea5136884fcd750d78f2868163345ba40b6af503666803c6a29ca37c52925947ce6ecc568dc5249da1a8ccfabcd1824629ec8e92c0
  > 
  >
author	Jeremy Harris <jgh146exb@wizmail.org>
	Tue, 1 Jun 2021 20:20:38 +0000 (21:20 +0100)
committer	Jeremy Harris <jgh146exb@wizmail.org>
	Fri, 4 Jun 2021 18:44:02 +0000 (19:44 +0100)