diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
diff --git a/src/src/lookups/lf_sqlperform.c b/src/src/lookups/lf_sqlperform.c
diff --git a/src/src/lookups/lmdb.c b/src/src/lookups/lmdb.c
diff --git a/src/src/lookups/lsearch.c b/src/src/lookups/lsearch.c
diff --git a/src/src/lookups/mysql.c b/src/src/lookups/mysql.c
diff --git a/src/src/lookups/nis.c b/src/src/lookups/nis.c
diff --git a/src/src/lookups/nisplus.c b/src/src/lookups/nisplus.c
diff --git a/src/src/lookups/oracle.c b/src/src/lookups/oracle.c
diff --git a/src/src/lookups/passwd.c b/src/src/lookups/passwd.c
diff --git a/src/src/lookups/pgsql.c b/src/src/lookups/pgsql.c
diff --git a/src/src/lookups/readsock.c b/src/src/lookups/readsock.c
diff --git a/src/src/lookups/redis.c b/src/src/lookups/redis.c
diff --git a/src/src/lookups/spf.c b/src/src/lookups/spf.c
diff --git a/src/src/lookups/sqlite.c b/src/src/lookups/sqlite.c
diff --git a/src/src/lookups/testdb.c b/src/src/lookups/testdb.c
diff --git a/src/src/lookups/whoson.c b/src/src/lookups/whoson.c
diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c
diff --git a/src/src/macro_predef.h b/src/src/macro_predef.h
diff --git a/src/src/macros.h b/src/src/macros.h
diff --git a/src/src/malware.c b/src/src/malware.c
diff --git a/src/src/match.c b/src/src/match.c
diff --git a/src/src/mime.c b/src/src/mime.c
diff --git a/src/src/moan.c b/src/src/moan.c
diff --git a/src/src/mytypes.h b/src/src/mytypes.h
diff --git a/src/src/os.c b/src/src/os.c
diff --git a/src/src/parse.c b/src/src/parse.c
diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c
diff --git a/src/src/perl.c b/src/src/perl.c
diff --git a/src/src/queue.c b/src/src/queue.c
diff --git a/src/src/rda.c b/src/src/rda.c
diff --git a/src/src/readconf.c b/src/src/readconf.c
diff --git a/src/src/receive.c b/src/src/receive.c
diff --git a/src/src/regex.c b/src/src/regex.c
diff --git a/src/src/retry.c b/src/src/retry.c
diff --git a/src/src/rewrite.c b/src/src/rewrite.c
diff --git a/src/src/rfc2047.c b/src/src/rfc2047.c
diff --git a/src/src/route.c b/src/src/route.c
diff --git a/src/src/routers/accept.c b/src/src/routers/accept.c
diff --git a/src/src/routers/dnslookup.c b/src/src/routers/dnslookup.c
diff --git a/src/src/routers/ipliteral.c b/src/src/routers/ipliteral.c
diff --git a/src/src/routers/iplookup.c b/src/src/routers/iplookup.c
diff --git a/src/src/routers/iplookup.h b/src/src/routers/iplookup.h
diff --git a/src/src/routers/manualroute.c b/src/src/routers/manualroute.c
diff --git a/src/src/routers/queryprogram.c b/src/src/routers/queryprogram.c
diff --git a/src/src/routers/redirect.c b/src/src/routers/redirect.c
diff --git a/src/src/routers/redirect.h b/src/src/routers/redirect.h
diff --git a/src/src/routers/rf_change_domain.c b/src/src/routers/rf_change_domain.c
diff --git a/src/src/routers/rf_get_munge_headers.c b/src/src/routers/rf_get_munge_headers.c
diff --git a/src/src/routers/rf_get_transport.c b/src/src/routers/rf_get_transport.c
diff --git a/src/src/routers/rf_queue_add.c b/src/src/routers/rf_queue_add.c
diff --git a/src/src/search.c b/src/src/search.c
diff --git a/src/src/sieve.c b/src/src/sieve.c
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
diff --git a/src/src/spam.c b/src/src/spam.c
diff --git a/src/src/spam.h b/src/src/spam.h
diff --git a/src/src/spf.c b/src/src/spf.c
diff --git a/src/src/spf.h b/src/src/spf.h
diff --git a/src/src/spool_in.c b/src/src/spool_in.c
diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c
diff --git a/src/src/spool_out.c b/src/src/spool_out.c
diff --git a/src/src/srs.c b/src/src/srs.c
diff --git a/src/src/srs.h b/src/src/srs.h
diff --git a/src/src/std-crypto.c b/src/src/std-crypto.c
diff --git a/src/src/store.c b/src/src/store.c
diff --git a/src/src/store.h b/src/src/store.h
diff --git a/src/src/string.c b/src/src/string.c
diff --git a/src/src/structs.h b/src/src/structs.h
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
diff --git a/src/src/tls.c b/src/src/tls.c
diff --git a/src/src/tlscert-gnu.c b/src/src/tlscert-gnu.c
diff --git a/src/src/tlscert-openssl.c b/src/src/tlscert-openssl.c
diff --git a/src/src/transport.c b/src/src/transport.c
diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
diff --git a/src/src/transports/appendfile.h b/src/src/transports/appendfile.h
diff --git a/src/src/transports/autoreply.c b/src/src/transports/autoreply.c
diff --git a/src/src/transports/lmtp.c b/src/src/transports/lmtp.c
diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
diff --git a/src/src/transports/queuefile.c b/src/src/transports/queuefile.c
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c
diff --git a/src/src/transports/tf_maildir.c b/src/src/transports/tf_maildir.c
diff --git a/src/src/transports/tf_maildir.h b/src/src/transports/tf_maildir.h
diff --git a/src/src/tree.c b/src/src/tree.c
diff --git a/src/src/utf8.c b/src/src/utf8.c
diff --git a/src/src/verify.c b/src/src/verify.c
diff --git a/src/util/gen_pkcs3.c b/src/util/gen_pkcs3.c
diff --git a/test/README b/test/README
diff --git a/test/aux-fixed/0990/example.com b/test/aux-fixed/0990/example.com
diff --git a/test/aux-fixed/2301.testsasldb b/test/aux-fixed/2301.testsasldb
diff --git a/test/aux-fixed/dh2048 b/test/aux-fixed/dh2048
diff --git a/test/aux-fixed/dh3072 b/test/aux-fixed/dh3072
diff --git a/test/aux-fixed/dh1 → test/aux-fixed/dh512 b/test/aux-fixed/dh1 → test/aux-fixed/dh512
diff --git a/test/aux-var-src/0164.F b/test/aux-var-src/0164.F
diff --git a/test/aux-var-src/0173.filter b/test/aux-var-src/0173.filter
diff --git a/test/aux-var-src/0383.F b/test/aux-var-src/0383.F
diff --git a/test/confs/0101 b/test/confs/0101
diff --git a/test/confs/0134 b/test/confs/0134
diff --git a/test/confs/0194 b/test/confs/0194
diff --git a/test/confs/0313 b/test/confs/0313
diff --git a/test/confs/0321 b/test/confs/0321
diff --git a/test/confs/0369 b/test/confs/0369
diff --git a/test/confs/0383 b/test/confs/0383
diff --git a/test/confs/0471 b/test/confs/0471
diff --git a/test/confs/0594 b/test/confs/0594
diff --git a/test/confs/0610 b/test/confs/0610
diff --git a/test/confs/0624 b/test/confs/0624
diff --git a/test/confs/0626 b/test/confs/0626
diff --git a/test/confs/0627 b/test/confs/0627
diff --git a/test/confs/0628 b/test/confs/0628
diff --git a/test/confs/0574 → test/confs/0629 b/test/confs/0574 → test/confs/0629
diff --git a/test/confs/0630 b/test/confs/0630
diff --git a/test/confs/0631 b/test/confs/0631
diff --git a/test/confs/0990 b/test/confs/0990
diff --git a/test/confs/2011 b/test/confs/2011
diff --git a/test/confs/2020 b/test/confs/2020
diff --git a/test/confs/2020 b/test/confs/2020
diff --git a/test/confs/2049 b/test/confs/2049
diff --git a/test/confs/2100 b/test/confs/2100
diff --git a/test/confs/2120 b/test/confs/2120
diff --git a/test/confs/2149 b/test/confs/2149
diff --git a/test/confs/2301 b/test/confs/2301
diff --git a/test/confs/2610 b/test/confs/2610
diff --git a/test/confs/2620 b/test/confs/2620
diff --git a/test/confs/4050 b/test/confs/4050
diff --git a/test/confs/5000 b/test/confs/5000
diff --git a/test/confs/5100 b/test/confs/5100
diff --git a/test/confs/5711 b/test/confs/5711
diff --git a/test/confs/5721 b/test/confs/5721
diff --git a/test/confs/5890 b/test/confs/5890
diff --git a/test/confs/5892 b/test/confs/5892
diff --git a/test/lib/Exim/Runtest.pm b/test/lib/Exim/Runtest.pm
diff --git a/test/log/0164 b/test/log/0164
diff --git a/test/log/0173 b/test/log/0173
diff --git a/test/log/0313 b/test/log/0313
diff --git a/test/log/0383 b/test/log/0383
diff --git a/test/log/0471 b/test/log/0471
diff --git a/test/log/0594 b/test/log/0594
diff --git a/test/log/0608 b/test/log/0608
diff --git a/test/log/0610 b/test/log/0610
diff --git a/test/log/0624 b/test/log/0624
diff --git a/test/log/0628 b/test/log/0628
diff --git a/test/log/0574 → test/log/0629 b/test/log/0574 → test/log/0629
diff --git a/test/log/0630 b/test/log/0630
diff --git a/test/log/0631 b/test/log/0631
diff --git a/test/log/0900 b/test/log/0900
diff --git a/test/log/1165 b/test/log/1165
diff --git a/test/log/2011 b/test/log/2011
diff --git a/test/log/2049 b/test/log/2049
diff --git a/test/log/2149 b/test/log/2149
diff --git a/test/log/2610 b/test/log/2610
diff --git a/test/log/3828 b/test/log/3828
diff --git a/test/log/4051 b/test/log/4051
diff --git a/test/log/4510 b/test/log/4510
diff --git a/test/log/4530 b/test/log/4530
diff --git a/test/log/5601 b/test/log/5601
diff --git a/test/log/5611 b/test/log/5611
diff --git a/test/log/5711 b/test/log/5711
diff --git a/test/log/5721 b/test/log/5721
diff --git a/test/log/5740 b/test/log/5740
diff --git a/test/log/5890 b/test/log/5890
diff --git a/test/log/5891 b/test/log/5891
diff --git a/test/log/5892 b/test/log/5892
diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
diff --git a/test/mail/0383.CALLER b/test/mail/0383.CALLER
diff --git a/test/mail/2149.userx b/test/mail/2149.userx
diff --git a/test/msglog/0594.10HmaX-0005vi-00 b/test/msglog/0594.10HmaX-0005vi-00
diff --git a/test/paniclog/0594 b/test/paniclog/0594
diff --git a/test/paniclog/0608 b/test/paniclog/0608
diff --git a/test/paniclog/0629 b/test/paniclog/0629
diff --git a/test/paniclog/0630 b/test/paniclog/0630
diff --git a/test/paniclog/2049 b/test/paniclog/2049
diff --git a/test/paniclog/2149 b/test/paniclog/2149
diff --git a/test/paniclog/2610 b/test/paniclog/2610
diff --git a/test/rejectlog/0624 b/test/rejectlog/0624
diff --git a/test/rejectlog/0900 b/test/rejectlog/0900
diff --git a/test/rejectlog/2011 b/test/rejectlog/2011
diff --git a/test/rejectlog/3800 b/test/rejectlog/3800
diff --git a/test/runtest b/test/runtest
diff --git a/test/scripts/0000-Basic/0001 b/test/scripts/0000-Basic/0001
diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002
diff --git a/test/scripts/0000-Basic/0037 b/test/scripts/0000-Basic/0037
diff --git a/test/scripts/0000-Basic/0135 b/test/scripts/0000-Basic/0135
diff --git a/test/scripts/0000-Basic/0211 b/test/scripts/0000-Basic/0211
diff --git a/test/scripts/0000-Basic/0264 b/test/scripts/0000-Basic/0264
diff --git a/test/scripts/0000-Basic/0313 b/test/scripts/0000-Basic/0313
diff --git a/test/scripts/0000-Basic/0373 b/test/scripts/0000-Basic/0373
diff --git a/test/scripts/0000-Basic/0383 b/test/scripts/0000-Basic/0383
diff --git a/test/scripts/0000-Basic/0471 b/test/scripts/0000-Basic/0471
diff --git a/test/scripts/0000-Basic/0473 b/test/scripts/0000-Basic/0473
diff --git a/test/scripts/0000-Basic/0512 b/test/scripts/0000-Basic/0512
diff --git a/test/scripts/0000-Basic/0594 b/test/scripts/0000-Basic/0594
diff --git a/test/scripts/0000-Basic/0610 b/test/scripts/0000-Basic/0610
diff --git a/test/scripts/0000-Basic/0611 b/test/scripts/0000-Basic/0611
diff --git a/test/scripts/0000-Basic/0626 b/test/scripts/0000-Basic/0626
diff --git a/test/scripts/0000-Basic/0627 b/test/scripts/0000-Basic/0627
diff --git a/test/scripts/0000-Basic/0628 b/test/scripts/0000-Basic/0628
diff --git a/test/scripts/0000-Basic/0629 b/test/scripts/0000-Basic/0629
diff --git a/test/scripts/0000-Basic/0630 b/test/scripts/0000-Basic/0630
diff --git a/test/scripts/0000-Basic/0574 → test/scripts/0000-Basic/0631 b/test/scripts/0000-Basic/0574 → test/scripts/0000-Basic/0631
diff --git a/test/scripts/0000-Basic/0900 b/test/scripts/0000-Basic/0900
diff --git a/test/scripts/0990-Allow-Tainted-Data/0990 b/test/scripts/0990-Allow-Tainted-Data/0990
diff --git a/test/scripts/0990-Allow-Tainted-Data/REQUIRES b/test/scripts/0990-Allow-Tainted-Data/REQUIRES
diff --git a/test/scripts/1100-Basic-TLS/1165 b/test/scripts/1100-Basic-TLS/1165
diff --git a/test/scripts/1190-TLS-ALPN/1190 b/test/scripts/1190-TLS-ALPN/1190
diff --git a/test/scripts/2000-GnuTLS/2011 b/test/scripts/2000-GnuTLS/2011
diff --git a/test/scripts/2000-GnuTLS/2049 b/test/scripts/2000-GnuTLS/2049
diff --git a/test/scripts/2090-GnuTLS-ALPN/2090 b/test/scripts/2090-GnuTLS-ALPN/2090
diff --git a/test/scripts/2100-OpenSSL/2149 b/test/scripts/2100-OpenSSL/2149
diff --git a/test/scripts/2190-OpenSSL-ALPN/2190 b/test/scripts/2190-OpenSSL-ALPN/2190
diff --git a/test/scripts/2300-DBM/2301 b/test/scripts/2300-DBM/2301
diff --git a/test/scripts/2610-MySQL/2610 b/test/scripts/2610-MySQL/2610
diff --git a/test/scripts/4050-pipe-conn/4050 b/test/scripts/4050-pipe-conn/4050
diff --git a/test/scripts/4050-pipe-conn/4051 b/test/scripts/4050-pipe-conn/4051
diff --git a/test/scripts/4050-pipe-conn/4052 b/test/scripts/4050-pipe-conn/4052
diff --git a/test/scripts/4050-pipe-conn/REQUIRES b/test/scripts/4050-pipe-conn/REQUIRES
diff --git a/test/scripts/4056-pipe-conn-auth/4056 b/test/scripts/4056-pipe-conn-auth/4056
diff --git a/test/scripts/4056-pipe-conn-auth/REQUIRES b/test/scripts/4056-pipe-conn-auth/REQUIRES
diff --git a/test/scripts/4058-pipe-conn-tfo/REQUIRES b/test/scripts/4058-pipe-conn-tfo/REQUIRES
diff --git a/test/scripts/4060-pipe-conn-gnutls/REQUIRES b/test/scripts/4060-pipe-conn-gnutls/REQUIRES
diff --git a/test/scripts/4062-pipe-conn-openssl/REQUIRES b/test/scripts/4062-pipe-conn-openssl/REQUIRES
diff --git a/test/scripts/4064-pipe-conn-gnutls-auth/REQUIRES b/test/scripts/4064-pipe-conn-gnutls-auth/REQUIRES
diff --git a/test/scripts/4066-pipe-conn-openssl-auth/REQUIRES b/test/scripts/4066-pipe-conn-openssl-auth/REQUIRES
diff --git a/test/scripts/4068-pipe-conn-gnutls-tfo/REQUIRES b/test/scripts/4068-pipe-conn-gnutls-tfo/REQUIRES
diff --git a/test/scripts/4069-pipe-conn-openssl-tfo/REQUIRES b/test/scripts/4069-pipe-conn-openssl-tfo/REQUIRES
diff --git a/test/scripts/4620-SRS/4620 b/test/scripts/4620-SRS/4620
diff --git a/test/scripts/5600-OCSP-OpenSSL/5601 b/test/scripts/5600-OCSP-OpenSSL/5601
diff --git a/test/scripts/5600-OCSP-OpenSSL/5611 b/test/scripts/5600-OCSP-OpenSSL/5611
diff --git a/test/scripts/5650-OCSP-GnuTLS/5651 b/test/scripts/5650-OCSP-GnuTLS/5651
diff --git a/test/scripts/5710-GnuTLS-events/5711 b/test/scripts/5710-GnuTLS-events/5711
diff --git a/test/scripts/5720-OpenSSL-events/5721 b/test/scripts/5720-OpenSSL-events/5721
diff --git a/test/scripts/5730-OCSP-GnuTLS-events/5730 b/test/scripts/5730-OCSP-GnuTLS-events/5730
diff --git a/test/scripts/5740-OCSP-OpenSSL-events/5740 b/test/scripts/5740-OCSP-OpenSSL-events/5740
diff --git a/test/scripts/5800-DANE/5801 b/test/scripts/5800-DANE/5801
diff --git a/test/scripts/5820-DANE-GnuTLS/5820 b/test/scripts/5820-DANE-GnuTLS/5820
diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840
diff --git a/test/scripts/5890-Resume-GnuTLS/5890 b/test/scripts/5890-Resume-GnuTLS/5890
diff --git a/test/scripts/5891-Resume-GnuTLS-OCSP/5890 → test/scripts/5891-Resume-GnuTLS-OCSP/5891 b/test/scripts/5891-Resume-GnuTLS-OCSP/5890 → test/scripts/5891-Resume-GnuTLS-OCSP/5891
diff --git a/test/scripts/5892-Resume-OpenSSL/5892 b/test/scripts/5892-Resume-OpenSSL/5892
diff --git a/test/scripts/5893-Resume-OpenSSL-OCSP/5893 b/test/scripts/5893-Resume-OpenSSL-OCSP/5893
diff --git a/test/scripts/9900-testing/9901 b/test/scripts/9900-testing/9901
diff --git a/test/stderr/0002 b/test/stderr/0002
diff --git a/test/stderr/0021 b/test/stderr/0021
diff --git a/test/stderr/0022 b/test/stderr/0022
diff --git a/test/stderr/0023 b/test/stderr/0023
diff --git a/test/stderr/0044 b/test/stderr/0044
diff --git a/test/stderr/0092 b/test/stderr/0092
diff --git a/test/stderr/0143 b/test/stderr/0143
diff --git a/test/stderr/0217 b/test/stderr/0217
diff --git a/test/stderr/0218 b/test/stderr/0218
diff --git a/test/stderr/0227 b/test/stderr/0227
diff --git a/test/stderr/0275 b/test/stderr/0275
diff --git a/test/stderr/0276 b/test/stderr/0276
diff --git a/test/stderr/0278 b/test/stderr/0278
diff --git a/test/stderr/0279 b/test/stderr/0279
diff --git a/test/stderr/0303 b/test/stderr/0303
diff --git a/test/stderr/0332 b/test/stderr/0332
diff --git a/test/stderr/0333 b/test/stderr/0333
diff --git a/test/stderr/0357 b/test/stderr/0357
diff --git a/test/stderr/0358 b/test/stderr/0358
diff --git a/test/stderr/0361 b/test/stderr/0361
diff --git a/test/stderr/0371 b/test/stderr/0371
diff --git a/test/stderr/0374 b/test/stderr/0374
diff --git a/test/stderr/0375 b/test/stderr/0375
diff --git a/test/stderr/0376 b/test/stderr/0376
diff --git a/test/stderr/0386 b/test/stderr/0386
diff --git a/test/stderr/0388 b/test/stderr/0388
diff --git a/test/stderr/0393 b/test/stderr/0393
diff --git a/test/stderr/0398 b/test/stderr/0398
diff --git a/test/stderr/0402 b/test/stderr/0402
diff --git a/test/stderr/0403 b/test/stderr/0403
diff --git a/test/stderr/0404 b/test/stderr/0404
diff --git a/test/stderr/0408 b/test/stderr/0408
diff --git a/test/stderr/0426 b/test/stderr/0426
diff --git a/test/stderr/0432 b/test/stderr/0432
diff --git a/test/stderr/0462 b/test/stderr/0462
diff --git a/test/stderr/0465 b/test/stderr/0465
diff --git a/test/stderr/0467 b/test/stderr/0467
diff --git a/test/stderr/0471 b/test/stderr/0471
diff --git a/test/stderr/0473 b/test/stderr/0473
diff --git a/test/stderr/0476 b/test/stderr/0476
diff --git a/test/stderr/0487 b/test/stderr/0487
diff --git a/test/stderr/0499 b/test/stderr/0499
diff --git a/test/stderr/0525 b/test/stderr/0525
diff --git a/test/stderr/0537 b/test/stderr/0537
diff --git a/test/stderr/0543 b/test/stderr/0543
diff --git a/test/stderr/0544 b/test/stderr/0544
diff --git a/test/stderr/0554 b/test/stderr/0554
diff --git a/test/stderr/0574 b/test/stderr/0574
diff --git a/test/stderr/0575 b/test/stderr/0575
diff --git a/test/stderr/0578 b/test/stderr/0578
diff --git a/test/stderr/0594 b/test/stderr/0594
diff --git a/test/stderr/0608 b/test/stderr/0608
diff --git a/test/stderr/0620 b/test/stderr/0620
diff --git a/test/stderr/0623 b/test/stderr/0623
diff --git a/test/stderr/0626 b/test/stderr/0626
diff --git a/test/stderr/0628 b/test/stderr/0628