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
LibreSSL: fixes pulled from OpenBSD patchset
[exim.git]
/
test
/
confs
/
3461
diff --git
a/test/confs/3461
b/test/confs/3461
index 35c2a17b26ded605a767371af4d0a3b2cee2cfce..b793a4f36aeb9f9e83161217672c1ccc89c03352 100644
(file)
--- a/
test/confs/3461
+++ b/
test/confs/3461
@@
-19,11
+19,7
@@
queue_run_in_order
smtp_accept_max_nonmail = 0
tls_advertise_hosts = *
smtp_accept_max_nonmail = 0
tls_advertise_hosts = *
-
-# 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
# ----- Authenticators -----
# ----- Authenticators -----
@@
-62,6
+58,7
@@
begin transports
local_delivery:
driver = appendfile
file = DIR/test-mail/$local_part
local_delivery:
driver = appendfile
file = DIR/test-mail/$local_part
+ create_file = DIR/test-mail
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
@@
-73,6
+70,7
@@
send_to_server:
hosts_try_fastopen = :
hosts_try_auth = *
hosts_noproxy_tls = PEX
hosts_try_fastopen = :
hosts_try_auth = *
hosts_noproxy_tls = PEX
- tls_try_verify_hosts = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
# End
# End