Testsuite: output changes resulting

[exim.git] / test / confs / 5840

diff --git a/test/confs/5840 b/test/confs/5840
index 670ce2c196f5fbac80ddebcc84ae3a2a94f198c0..5852ef2c0ab018a12e0c2e45b2894817dd37c0a5 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -1,21 +1,17 @@
 # Exim test configuration 5840
 # Exim test configuration 5840

-# DANE
+# DANE/OpenSSL

 
 SERVER=
 
 SERVER=

+CONTROL= *
+
+.include DIR/aux-var/tls_conf_prefix

 
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- 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


@@ -27,20 +23,28 @@ queue_run_in_order
 tls_advertise_hosts = *
 
 # Set certificate only if server
 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 -----
 


@@ -67,12 +71,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} {}}