diff options
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/5820 | 52 | ||||
| -rw-r--r-- | test/confs/5840 | 14 | ||||
| -rw-r--r-- | test/confs/5860 | 14 |
3 files changed, 43 insertions, 37 deletions
diff --git a/test/confs/5820 b/test/confs/5820 index 6c2f26ce0..d4dce2f85 100644 --- a/test/confs/5820 +++ b/test/confs/5820 @@ -1,19 +1,22 @@ -# Exim test configuration 5800 -# DANE +# Exim test configuration 5820 +# DANE/GnuTLS SERVER= -.include DIR/aux-var/std_conf_prefix +.include DIR/aux-var/tls_conf_prefix primary_hostname = myhost.test.ex # ----- Main settings ----- -acl_smtp_rcpt = accept +.ifndef OPT +acl_smtp_rcpt = accept logwrite = "rcpt ACL" +.else +acl_smtp_rcpt = accept verify = recipient/callout +.endif -log_selector = +tls_peerdn +log_selector = +received_recipients +tls_peerdn +tls_certificate_verified -queue_only queue_run_in_order tls_advertise_hosts = * @@ -21,23 +24,33 @@ tls_advertise_hosts = * tls_dhparam = historic # Set certificate only if server +CDIR1 = DIR/aux-fixed/exim-ca/example.net/server1.example.net +CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -#tls_verify_hosts = * -#tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail} +tls_certificate = ${if eq {SERVER}{server} \ + {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \ + {CDIR2/fullchain.pem}\ + {CDIR1/fullchain.pem}}}\ + fail} +tls_privatekey = ${if eq {SERVER}{server} \ + {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \ + {CDIR2/server1.example.com.unlocked.key}\ + {CDIR1/server1.example.net.unlocked.key}}}\ + fail} # ----- Routers ----- begin routers client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part + driver = dnslookup + condition = ${if eq {SERVER}{}} + dnssec_request_domains = * + self = send transport = send_to_server + errors_to = "" server: driver = redirect @@ -51,11 +64,14 @@ begin transports send_to_server: driver = smtp allow_localhost - hosts = 127.0.0.1 - port = PORT_D -# tls_certificate = DIR/aux-fixed/cert2 -# tls_privatekey = DIR/aux-fixed/cert2 -# tls_verify_certificates = DIR/aux-fixed/cert2 + port = ${if match {$host}{\Ntest.ex$\N} {PORT_D}{25}} + + hosts_try_dane = * + 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 + # ----- Retry ----- diff --git a/test/confs/5840 b/test/confs/5840 index 1a16e1c09..10ca2111b 100644 --- a/test/confs/5840 +++ b/test/confs/5840 @@ -1,5 +1,5 @@ # Exim test configuration 5840 -# DANE +# DANE/OpenSSL SERVER= @@ -10,7 +10,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 +22,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 +39,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 diff --git a/test/confs/5860 b/test/confs/5860 index 94436c344..82079fe38 100644 --- a/test/confs/5860 +++ b/test/confs/5860 @@ -19,20 +19,10 @@ queue_run_in_order tls_advertise_hosts = * # Set certificate only if server -CDIR1 = DIR/aux-fixed CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com -tls_certificate = ${if eq {SERVER}{server} \ - {${if eq {DETAILS}{ta} \ - {CDIR2/fullchain.pem}\ - {CDIR1/cert1}}}\ - fail} - -tls_privatekey = ${if eq {SERVER}{server} \ - {${if eq {DETAILS}{ta} \ - {CDIR2/server1.example.com.unlocked.key}\ - {CDIR1/cert1}}}\ - fail} +tls_certificate = ${if eq {SERVER}{server} {CDIR2/fullchain.pem} fail} +tls_privatekey = ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.key} fail} begin acl |