X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/854586e1495b0a0f4be2a561c419ec4671009dbd..723f7bdb06013d9fabe5197151d25dda38832962:/test/confs/5840?ds=sidebyside diff --git a/test/confs/5840 b/test/confs/5840 index 1a16e1c09..5852ef2c0 100644 --- a/test/confs/5840 +++ b/test/confs/5840 @@ -1,7 +1,8 @@ # Exim test configuration 5840 -# DANE +# DANE/OpenSSL SERVER= +CONTROL= * .include DIR/aux-var/tls_conf_prefix @@ -10,7 +11,7 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- .ifndef OPT -acl_smtp_rcpt = accept +acl_smtp_rcpt = accept logwrite = "rcpt ACL" .else acl_smtp_rcpt = accept verify = recipient/callout .endif @@ -22,16 +23,16 @@ queue_run_in_order tls_advertise_hosts = * # Set certificate only if server -CDIR1 = DIR/aux-fixed +CDIR1 = DIR/aux-fixed/exim-ca/example.net/server1.example.net CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com .ifdef CERT tls_certificate = CERT .else tls_certificate = ${if eq {SERVER}{server} \ - {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \ + {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \ {CDIR2/fullchain.pem}\ - {CDIR1/cert1}}}\ + {CDIR1/fullchain.pem}}}\ fail} .endif @@ -39,9 +40,9 @@ tls_certificate = ${if eq {SERVER}{server} \ tls_privatekey = ALLOW .else tls_privatekey = ${if eq {SERVER}{server} \ - {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \ + {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \ {CDIR2/server1.example.com.unlocked.key}\ - {CDIR1/cert1}}}\ + {CDIR1/server1.example.net.unlocked.key}}}\ fail} .endif @@ -69,13 +70,14 @@ begin transports send_to_server: driver = smtp allow_localhost - port = ${if match {$host}{\Ntest.ex$\N} {PORT_D}{25}} + port = PORT_D + hosts_try_fastopen = : - hosts_try_dane = * + hosts_try_dane = CONTROL hosts_require_dane = HOSTIPV4 tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}} tls_try_verify_hosts = thishost.test.ex - tls_verify_certificates = CDIR2/ca_chain.pem + tls_verify_certificates = ${if eq {DETAILS}{ca} {CDIR2/ca_chain.pem} {}}