git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use DH_bits for OpenSSL 1.1.0
[users/jgh/exim.git]
/
test
/
confs
/
2012
diff --git
a/test/confs/2012
b/test/confs/2012
index 6bc5487fffbc9edc4ef5790a8640bc933ff5b30a..8fbc555957e8b1af02566e54aec764d03975ec89 100644
(file)
--- a/
test/confs/2012
+++ b/
test/confs/2012
@@
-3,14
+3,9
@@
SERVER=
SERVER=
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
FX = DIR/aux-fixed
S1 = FX/exim-ca/example.com/server1.example.com
FX = DIR/aux-fixed
S1 = FX/exim-ca/example.com/server1.example.com
@@
-104,6
+99,7
@@
send_to_server_failcert:
tls_privatekey = CERT2
tls_verify_certificates = CA2
tls_privatekey = CERT2
tls_verify_certificates = CA2
+ tls_try_verify_hosts =
tls_verify_cert_hostnames =
# this will fail to verify the cert at HOSTIPV4 so fail the crypt, then retry on 127.1; ok
tls_verify_cert_hostnames =
# this will fail to verify the cert at HOSTIPV4 so fail the crypt, then retry on 127.1; ok
@@
-118,6
+114,7
@@
send_to_server_retry:
tls_verify_certificates = \
${if eq{$host_address}{127.0.0.1}{CA1}{CA2}}
tls_verify_certificates = \
${if eq{$host_address}{127.0.0.1}{CA1}{CA2}}
+ tls_try_verify_hosts =
tls_verify_cert_hostnames =
# this will fail to verify the cert but continue unverified though crypted
tls_verify_cert_hostnames =
# this will fail to verify the cert but continue unverified though crypted