X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/11c4a22b0a2098d2ad7b9d210bc4a1bfc9742ff8..ee359040f0c1e78c057bb1e533059c5c3d9e2c69:/test/confs/5890?ds=sidebyside

diff --git a/test/confs/5890 b/test/confs/5890
index ca205f621..0c812fd89 100644
--- a/test/confs/5890
+++ b/test/confs/5890
@@ -13,13 +13,16 @@ 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
 
 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_require_ciphers = OPTION
 tls_resumption_hosts = 127.0.0.1
@@ -31,12 +34,11 @@ 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
@@ -53,7 +55,6 @@ log_resumption:
 	  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}
 
@@ -63,10 +64,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
@@ -77,28 +77,30 @@ 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 = DIR/aux-fixed/cert1
-  tls_verify_cert_hostnames = :
-  event_action =	${acl {log_resumption}}
+  tls_verify_certificates =	CDIR/CA/CA.pem
+  tls_verify_cert_hostnames =	${if match {$local_part}{^noverify} {*}{:}}
+  tls_try_verify_hosts =	*
+  event_action =		${acl {log_resumption}}
 
 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 =	:
+  event_action =		${acl {log_resumption}}
 
 
 # ----- Retry -----