X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/4fab92fbc2b63bac2d89c1dae69fa1845cb640b7..46694b802ce0302f3c3344be933cc9737d4d4f4c:/test/confs/2131?ds=inline diff --git a/test/confs/2131 b/test/confs/2131 index 43db2ac1c..e4d4ae551 100644 --- a/test/confs/2131 +++ b/test/confs/2131 @@ -17,22 +17,13 @@ remote_max_parallel = 1 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} \ - {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} \ - {cert1} \ - }\ - }fail} - + {cert1} } # ------ ACL ------ @@ -65,18 +56,22 @@ send_to_server1: allow_localhost hosts = HOSTIPV4 port = PORT_D + hosts_try_fastopen = : 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 + hosts_try_fastopen = : 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 -----