git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP: allow_insecure_tainted_data
[users/heiko/exim.git]
/
test
/
confs
/
2131
diff --git
a/test/confs/2131
b/test/confs/2131
index 43db2ac1c228dc8456061e54a9f8b3ee854f9842..e4d4ae55118960fc8421d78b3aa69da92a50f303 100644
(file)
--- a/
test/confs/2131
+++ b/
test/confs/2131
@@
-17,22
+17,13
@@
remote_max_parallel = 1
tls_advertise_hosts = *
tls_advertise_hosts = *
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server} \
- {DIR/aux-fixed/${if eq {$tls_in_sni}{bill} \
+tls_certificate = DIR/aux-fixed/${if eq {$tls_in_sni}{bill} \
{exim-ca/example.com/server1.example.com/server1.example.com.pem} \
{exim-ca/example.com/server1.example.com/server1.example.com.pem} \
- {cert1} \
- }\
- }fail}
+ {cert1} }
-tls_privatekey = ${if eq {SERVER}{server} \
- {DIR/aux-fixed/${if eq {$tls_in_sni}{bill} \
+tls_privatekey = DIR/aux-fixed/${if eq {$tls_in_sni}{bill} \
{exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key} \
{exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key} \
- {cert1} \
- }\
- }fail}
-
+ {cert1} }
# ------ ACL ------
# ------ ACL ------
@@
-65,18
+56,22
@@
send_to_server1:
allow_localhost
hosts = HOSTIPV4
port = PORT_D
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
tls_sni = fred
hosts_require_tls = *
tls_sni = fred
hosts_require_tls = *
- tls_try_verify_hosts = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
send_to_server2:
driver = smtp
allow_localhost
hosts = HOSTIPV4
port = PORT_D
send_to_server2:
driver = smtp
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
tls_sni = bill
hosts_require_tls = *
tls_sni = bill
hosts_require_tls = *
- tls_try_verify_hosts = :
+ tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
+ tls_verify_cert_hostnames = :
# ----- Retry -----
# ----- Retry -----