tidying

[exim.git] / test / confs / 5891

diff --git a/test/confs/5891 b/test/confs/5891
index 78d22f7ff3206dffbca97647cd1ebbbe6fb439c8..ff50b2b2ec667ae3a62d03b8b75dcf09e1ff1420 100644 (file)
--- a/test/confs/5891
+++ b/test/confs/5891
@@ -1,7 +1,7 @@
 # Exim test configuration 5891
 
 SERVER =
-OPTION =
+OPTION = NORMAL
 
 .include DIR/aux-var/tls_conf_prefix
 
@@ -13,15 +13,19 @@ domainlist local_domains = test.ex : *.test.ex
 
 acl_smtp_helo = check_helo
 acl_smtp_rcpt = check_recipient
-log_selector = +received_recipients +tls_resumption
+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_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
 
 
@@ -31,7 +35,14 @@ begin acl
 
 check_helo:
   accept  condition =  ${if def:tls_in_cipher}
-         logwrite =    tls_in_resumption ${listextract {$tls_in_resumption} {_RESUME_DECODE}}
+         logwrite =    tls_in_resumption\t${listextract {$tls_in_resumption} {_RESUME_DECODE}}
+         logwrite =    our cert subject\t${certextract {subject}{$tls_in_ourcert}}
+         logwrite =    peer cert subject\t${certextract {subject}{$tls_in_peercert}}
+         logwrite =    peer cert verified\t${tls_in_certificate_verified}
+         logwrite =    peer dn\t${tls_in_peerdn}
+         logwrite =    ocsp\t${tls_in_ocsp}
+         logwrite =    cipher\t${tls_in_cipher}
+         logwrite =    bits\t${tls_in_bits}
   accept
 
 check_recipient:
@@ -42,6 +53,13 @@ log_resumption:
   accept condition =   ${if def:tls_out_cipher}
         condition =    ${if eq {$event_name}{tcp:close}}
         logwrite =     tls_out_resumption ${listextract {$tls_out_resumption} {_RESUME_DECODE}}
+         logwrite =    our cert subject\t${certextract {subject}{$tls_out_ourcert}}
+         logwrite =    peer cert subject\t${certextract {subject}{$tls_out_peercert}}
+         logwrite =    peer cert verified\t${tls_out_certificate_verified}
+         logwrite =    peer dn\t${tls_out_peerdn}
+         logwrite =    ocsp\t${tls_out_ocsp}
+         logwrite =    cipher\t${tls_out_cipher}
+         logwrite =    bits\t${tls_out_bits}
 
 
 # ----- Routers -----
@@ -49,10 +67,9 @@ log_resumption:
 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
@@ -63,24 +80,34 @@ server:
 begin transports
 
 send_to_server1:
-  driver = smtp
+  driver =                     smtp
   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
-  tls_resumption_hosts = *
+  tls_resumption_hosts =       *
 .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
-  event_action =       ${acl {log_resumption}}
 
 send_to_server2:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
-  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 -----