git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Report two-phase queue run in daemon startup log line
[exim.git]
/
test
/
confs
/
2125
diff --git
a/test/confs/2125
b/test/confs/2125
index 3591c86536e95c0c56901dbb26f34309abcc1a5b..91b5283b2754ff3ea7d575cf3949127c797b65f2 100644
(file)
--- a/
test/confs/2125
+++ b/
test/confs/2125
@@
-19,11
+19,7
@@
tls_advertise_hosts = *
tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
{AES256}{AES128}}
tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
{AES256}{AES128}}
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1
.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
openssl_options = +no_tlsv1_3
.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
openssl_options = +no_tlsv1_3
@@
-52,7
+48,8
@@
send_to_server:
hosts_require_tls = HOSTIPV4
tls_require_ciphers = AES128-SHA
hosts_try_fastopen = :
hosts_require_tls = HOSTIPV4
tls_require_ciphers = AES128-SHA
hosts_try_fastopen = :
- tls_try_verify_hosts = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
# ----- Retry -----
# ----- Retry -----