tidying

[exim.git] / test / confs / 5891

diff --git a/test/confs/5891 b/test/confs/5891
index 599a6e3f0cd22d6506c63ec20143e61ab59d8371..ff50b2b2ec667ae3a62d03b8b75dcf09e1ff1420 100644 (file)
--- a/test/confs/5891
+++ b/test/confs/5891
@@ -1,7 +1,7 @@
 # Exim test configuration 5891
 
 SERVER =
 # Exim test configuration 5891
 
 SERVER =

-OPTION =
+OPTION = NORMAL

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


@@ -15,13 +15,17 @@ acl_smtp_helo = check_helo
 acl_smtp_rcpt = check_recipient
 log_selector = +received_recipients +tls_resumption +tls_peerdn
 
 acl_smtp_rcpt = check_recipient
 log_selector = +received_recipients +tls_resumption +tls_peerdn
 

-openssl_options = +no_sslv2 +no_sslv3 +single_dh_use OPTION

 tls_advertise_hosts = *
 
 # Set certificate only if server
 
 tls_advertise_hosts = *
 
 # Set certificate only if server
 

-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+CDIR=DIR/aux-fixed/exim-ca/example.com

 
 

+tls_certificate = CDIR/server1.example.com/server1.example.com.chain.pem
+tls_privatekey =  CDIR/server1.example.com/server1.example.com.unlocked.key
+tls_ocsp_file =   CDIR/server1.example.com/server1.example.com.ocsp.good.resp
+
+tls_require_ciphers = OPTION

 tls_resumption_hosts = 127.0.0.1
 
 
 tls_resumption_hosts = 127.0.0.1
 
 


@@ -63,10 +67,9 @@ log_resumption:
 begin routers
 
 client:
 begin routers
 
 client:

-  driver = accept
-  condition = ${if eq {SERVER}{server}{no}{yes}}
-  retry_use_local_part
-  transport = send_to_server${if eq{$local_part}{abcd}{2}{1}}
+  driver =     accept
+  condition =  ${if eq {SERVER}{server}{no}{yes}}
+  transport =  send_to_server${if eq{$local_part}{abcd}{2}{1}}

 
 server:
   driver = redirect
 
 server:
   driver = redirect


@@ -77,28 +80,34 @@ server:
 begin transports
 
 send_to_server1:
 begin transports
 
 send_to_server1:

-  driver = smtp
+  driver =                     smtp

   allow_localhost
   allow_localhost

-  hosts = 127.0.0.1
-  port = PORT_D
-  helo_data = helo.data.changed
+  hosts =                      127.0.0.1
+  port =                       PORT_D
+  helo_data =                  helo.data.changed

 .ifdef VALUE
 .ifdef VALUE

-  tls_resumption_hosts = *
+  tls_resumption_hosts =       *

 .else
 .else

-  tls_resumption_hosts = :
+  tls_resumption_hosts =       :
+.endif
+  tls_verify_certificates =    CDIR/CA/CA.pem
+  tls_verify_cert_hostnames =  ${if match {$local_part}{^noverify} {*}{:}}
+  tls_try_verify_hosts =       *
+.ifdef _HAVE_EVENT
+  event_action =               ${acl {log_resumption}}

 .endif
 .endif

-  tls_verify_certificates = DIR/aux-fixed/cert1
-  tls_verify_cert_hostnames = :
-  event_action =       ${acl {log_resumption}}

 
 send_to_server2:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
 
 send_to_server2:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

-  tls_verify_certificates = DIR/aux-fixed/cert1
-  tls_verify_cert_hostnames = :
-  event_action =       ${acl {log_resumption}}
+  hosts_try_fastopen = :
+  tls_verify_certificates =    CDIR/CA/CA.pem
+  tls_verify_cert_hostnames =  :
+.ifdef _HAVE_EVENT
+  event_action =               ${acl {log_resumption}}
+.endif

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----