testsuite: tidy logs/4520 and confs/4520

[exim.git] / test / confs / 5840

diff --git a/test/confs/5840 b/test/confs/5840
index ac3578dc9a3ca113814ac3d625083433ecaef9fe..1b3b122b34d7b15782ee8d98d9bc0dae3a093d57 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -1,7 +1,8 @@
 # Exim test configuration 5840
 # Exim test configuration 5840

-# DANE
+# DANE/OpenSSL

 
 SERVER=
 
 SERVER=

+CONTROL= *

 
 .include DIR/aux-var/tls_conf_prefix
 
 
 .include DIR/aux-var/tls_conf_prefix
 


@@ -10,32 +11,41 @@ primary_hostname = myhost.test.ex
 # ----- Main settings -----
 
 .ifndef OPT
 # ----- Main settings -----
 
 .ifndef OPT

-acl_smtp_rcpt = accept
+acl_smtp_rcpt = accept logwrite = "rcpt ACL"

 .else
 acl_smtp_rcpt = accept verify = recipient/callout
 .endif
 
 .else
 acl_smtp_rcpt = accept verify = recipient/callout
 .endif
 

-log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified
+log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified \
+               +tls_sni

 
 queue_run_in_order
 
 tls_advertise_hosts = *
 
 # Set certificate only if server
 
 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
 
 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 

+.ifdef CERT
+tls_certificate = CERT
+.else

 tls_certificate = ${if eq {SERVER}{server} \
 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}\
                {CDIR2/fullchain.pem}\

-               {CDIR1/cert1}}}\
+               {CDIR1/fullchain.pem}}}\

        fail}
        fail}

+.endif

 
 

+.ifdef ALLOW
+tls_privatekey = ALLOW
+.else

 tls_privatekey = ${if eq {SERVER}{server} \
 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}\
                {CDIR2/server1.example.com.unlocked.key}\

-               {CDIR1/cert1}}}\
+               {CDIR1/server1.example.net.unlocked.key}}}\

        fail}
        fail}

+.endif

 
 # ----- Routers -----
 
 
 # ----- Routers -----
 


@@ -62,12 +72,13 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
   driver = smtp
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

 
 

-  hosts_try_dane =     *
-  hosts_require_dane = !thishost.test.ex
+  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_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} {}}