Testsuite: split out OpenSSL TLS1.3 resume tests

Older library versions do not support 1.3 so a separate numbered
testcase is needed

4 files changed, 300 insertions, 296 deletions

diff --git a/test/log/5892 b/test/log/5892
index 61450a7a9..b3d395f5e 100644
--- a/test/log/5892
+++ b/test/log/5892
@@ -88,75 +88,6 @@
 1999-03-02 09:44:33 10HmbM-0005vi-00 bits	256
 1999-03-02 09:44:33 10HmbM-0005vi-00 => noverify_resume@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbN-0005vi-00"
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for getticket@test.ex
-1999-03-02 09:44:33 10HmbO-0005vi-00 tls_out_resumption client requested new ticket, server provided
-1999-03-02 09:44:33 10HmbO-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbO-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbO-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbO-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbO-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbO-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbO-0005vi-00 => getticket@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbP-0005vi-00"
-1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbQ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for resume@test.ex abcd@test.ex xyz@test.ex
-1999-03-02 09:44:33 10HmbQ-0005vi-00 tls_out_resumption session resumed
-1999-03-02 09:44:33 10HmbQ-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbQ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbQ-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbQ-0005vi-00 tls_out_resumption not requested or offered
-1999-03-02 09:44:33 10HmbQ-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbQ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbQ-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbQ-0005vi-00 => resume@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbR-0005vi-00"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbR-0005vi-00"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbS-0005vi-00"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbT-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for renewal@test.ex
-1999-03-02 09:44:33 10HmbT-0005vi-00 tls_out_resumption session resumed, also new ticket
-1999-03-02 09:44:33 10HmbT-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbT-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbT-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbT-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbT-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbT-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbT-0005vi-00 => renewal@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbU-0005vi-00"
-1999-03-02 09:44:33 10HmbT-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbV-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for postrenewal@test.ex
-1999-03-02 09:44:33 10HmbV-0005vi-00 tls_out_resumption session resumed
-1999-03-02 09:44:33 10HmbV-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbV-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbV-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbV-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbV-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbV-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbV-0005vi-00 => postrenewal@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbW-0005vi-00"
-1999-03-02 09:44:33 10HmbV-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for timeout@test.ex
-1999-03-02 09:44:33 10HmbX-0005vi-00 tls_out_resumption session resumed, also new ticket
-1999-03-02 09:44:33 10HmbX-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbX-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbX-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbX-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbX-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbX-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbX-0005vi-00 => timeout@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbY-0005vi-00"
-1999-03-02 09:44:33 10HmbX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for notreq@test.ex
-1999-03-02 09:44:33 10HmbZ-0005vi-00 tls_out_resumption not requested or offered
-1999-03-02 09:44:33 10HmbZ-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbZ-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbZ-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbZ-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbZ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbZ-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbZ-0005vi-00 => notreq@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmcA-0005vi-00"
-1999-03-02 09:44:33 10HmbZ-0005vi-00 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
@@ -251,75 +182,3 @@
 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbM-0005vi-00@myhost.test.ex for noverify_resume@test.ex
 1999-03-02 09:44:33 10HmbN-0005vi-00 => :blackhole: <noverify_resume@test.ex> R=server
 1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 tls_in_resumption	client requested new ticket, server provided
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbO-0005vi-00@myhost.test.ex for getticket@test.ex
-1999-03-02 09:44:33 10HmbP-0005vi-00 => :blackhole: <getticket@test.ex> R=server
-1999-03-02 09:44:33 10HmbP-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	session resumed
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbR-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbQ-0005vi-00@myhost.test.ex for resume@test.ex xyz@test.ex
-1999-03-02 09:44:33 10HmbR-0005vi-00 => :blackhole: <xyz@test.ex> R=server
-1999-03-02 09:44:33 10HmbR-0005vi-00 => :blackhole: <resume@test.ex> R=server
-1999-03-02 09:44:33 10HmbR-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	not requested or offered
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbS-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbQ-0005vi-00@myhost.test.ex for abcd@test.ex
-1999-03-02 09:44:33 10HmbS-0005vi-00 => :blackhole: <abcd@test.ex> R=server
-1999-03-02 09:44:33 10HmbS-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	session resumed, also new ticket
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbU-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbT-0005vi-00@myhost.test.ex for renewal@test.ex
-1999-03-02 09:44:33 10HmbU-0005vi-00 => :blackhole: <renewal@test.ex> R=server
-1999-03-02 09:44:33 10HmbU-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	session resumed
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbW-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbV-0005vi-00@myhost.test.ex for postrenewal@test.ex
-1999-03-02 09:44:33 10HmbW-0005vi-00 => :blackhole: <postrenewal@test.ex> R=server
-1999-03-02 09:44:33 10HmbW-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	session resumed, also new ticket
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbY-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbX-0005vi-00@myhost.test.ex for timeout@test.ex
-1999-03-02 09:44:33 10HmbY-0005vi-00 => :blackhole: <timeout@test.ex> R=server
-1999-03-02 09:44:33 10HmbY-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	client requested new ticket, server provided
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmcA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbZ-0005vi-00@myhost.test.ex for notreq@test.ex
-1999-03-02 09:44:33 10HmcA-0005vi-00 => :blackhole: <notreq@test.ex> R=server
-1999-03-02 09:44:33 10HmcA-0005vi-00 Completed
diff --git a/test/log/5893 b/test/log/5893
index 6b0405704..8c535f72f 100644
--- a/test/log/5893
+++ b/test/log/5893
@@ -97,82 +97,6 @@
 1999-03-02 09:44:33 10HmbM-0005vi-00 bits	256
 1999-03-02 09:44:33 10HmbM-0005vi-00 => noverify_resume@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbN-0005vi-00"
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for getticket@test.ex
-1999-03-02 09:44:33 10HmbO-0005vi-00 tls_out_resumption client requested new ticket, server provided
-1999-03-02 09:44:33 10HmbO-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbO-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbO-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbO-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbO-0005vi-00 ocsp	4
-1999-03-02 09:44:33 10HmbO-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbO-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbO-0005vi-00 => getticket@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbP-0005vi-00"
-1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbQ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for resume@test.ex abcd@test.ex xyz@test.ex
-1999-03-02 09:44:33 10HmbQ-0005vi-00 tls_out_resumption session resumed
-1999-03-02 09:44:33 10HmbQ-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbQ-0005vi-00 ocsp	4
-1999-03-02 09:44:33 10HmbQ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbQ-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbQ-0005vi-00 tls_out_resumption not requested or offered
-1999-03-02 09:44:33 10HmbQ-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbQ-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbQ-0005vi-00 ocsp	4
-1999-03-02 09:44:33 10HmbQ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbQ-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbQ-0005vi-00 => resume@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbR-0005vi-00"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbR-0005vi-00"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbS-0005vi-00"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbT-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for renewal@test.ex
-1999-03-02 09:44:33 10HmbT-0005vi-00 tls_out_resumption session resumed, also new ticket
-1999-03-02 09:44:33 10HmbT-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbT-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbT-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbT-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbT-0005vi-00 ocsp	4
-1999-03-02 09:44:33 10HmbT-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbT-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbT-0005vi-00 => renewal@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbU-0005vi-00"
-1999-03-02 09:44:33 10HmbT-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbV-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for postrenewal@test.ex
-1999-03-02 09:44:33 10HmbV-0005vi-00 tls_out_resumption session resumed
-1999-03-02 09:44:33 10HmbV-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbV-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbV-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbV-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbV-0005vi-00 ocsp	4
-1999-03-02 09:44:33 10HmbV-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbV-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbV-0005vi-00 => postrenewal@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbW-0005vi-00"
-1999-03-02 09:44:33 10HmbV-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for timeout@test.ex
-1999-03-02 09:44:33 10HmbX-0005vi-00 tls_out_resumption session resumed, also new ticket
-1999-03-02 09:44:33 10HmbX-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbX-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbX-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbX-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbX-0005vi-00 ocsp	4
-1999-03-02 09:44:33 10HmbX-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbX-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbX-0005vi-00 => timeout@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbY-0005vi-00"
-1999-03-02 09:44:33 10HmbX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for notreq@test.ex
-1999-03-02 09:44:33 10HmbZ-0005vi-00 tls_out_resumption not requested or offered
-1999-03-02 09:44:33 10HmbZ-0005vi-00 our cert subject	
-1999-03-02 09:44:33 10HmbZ-0005vi-00 peer cert subject	CN=server1.example.com
-1999-03-02 09:44:33 10HmbZ-0005vi-00 peer cert verified	1
-1999-03-02 09:44:33 10HmbZ-0005vi-00 peer dn	/CN=server1.example.com
-1999-03-02 09:44:33 10HmbZ-0005vi-00 ocsp	4
-1999-03-02 09:44:33 10HmbZ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 10HmbZ-0005vi-00 bits	256
-1999-03-02 09:44:33 10HmbZ-0005vi-00 => notreq@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmcA-0005vi-00"
-1999-03-02 09:44:33 10HmbZ-0005vi-00 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
@@ -276,82 +200,3 @@
 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbM-0005vi-00@myhost.test.ex for noverify_resume@test.ex
 1999-03-02 09:44:33 10HmbN-0005vi-00 => :blackhole: <noverify_resume@test.ex> R=server
 1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 tls_in_resumption	client requested new ticket, server provided
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 ocsp	4
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbO-0005vi-00@myhost.test.ex for getticket@test.ex
-1999-03-02 09:44:33 10HmbP-0005vi-00 => :blackhole: <getticket@test.ex> R=server
-1999-03-02 09:44:33 10HmbP-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	session resumed
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 ocsp	0
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbR-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbQ-0005vi-00@myhost.test.ex for resume@test.ex xyz@test.ex
-1999-03-02 09:44:33 10HmbR-0005vi-00 => :blackhole: <xyz@test.ex> R=server
-1999-03-02 09:44:33 10HmbR-0005vi-00 => :blackhole: <resume@test.ex> R=server
-1999-03-02 09:44:33 10HmbR-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	not requested or offered
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 ocsp	4
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbS-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbQ-0005vi-00@myhost.test.ex for abcd@test.ex
-1999-03-02 09:44:33 10HmbS-0005vi-00 => :blackhole: <abcd@test.ex> R=server
-1999-03-02 09:44:33 10HmbS-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	session resumed, also new ticket
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 ocsp	0
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbU-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbT-0005vi-00@myhost.test.ex for renewal@test.ex
-1999-03-02 09:44:33 10HmbU-0005vi-00 => :blackhole: <renewal@test.ex> R=server
-1999-03-02 09:44:33 10HmbU-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	session resumed
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 ocsp	0
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbW-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbV-0005vi-00@myhost.test.ex for postrenewal@test.ex
-1999-03-02 09:44:33 10HmbW-0005vi-00 => :blackhole: <postrenewal@test.ex> R=server
-1999-03-02 09:44:33 10HmbW-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	session resumed, also new ticket
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 ocsp	0
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmbY-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbX-0005vi-00@myhost.test.ex for timeout@test.ex
-1999-03-02 09:44:33 10HmbY-0005vi-00 => :blackhole: <timeout@test.ex> R=server
-1999-03-02 09:44:33 10HmbY-0005vi-00 Completed
-1999-03-02 09:44:33 tls_in_resumption	client requested new ticket, server provided
-1999-03-02 09:44:33 our cert subject	CN=server1.example.com
-1999-03-02 09:44:33 peer cert subject	
-1999-03-02 09:44:33 peer cert verified	0
-1999-03-02 09:44:33 peer dn	
-1999-03-02 09:44:33 ocsp	4
-1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
-1999-03-02 09:44:33 bits	256
-1999-03-02 09:44:33 10HmcA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbZ-0005vi-00@myhost.test.ex for notreq@test.ex
-1999-03-02 09:44:33 10HmcA-0005vi-00 => :blackhole: <notreq@test.ex> R=server
-1999-03-02 09:44:33 10HmcA-0005vi-00 Completed
diff --git a/test/log/5894 b/test/log/5894
new file mode 100644
index 000000000..429c34568
--- /dev/null
+++ b/test/log/5894
@@ -0,0 +1,143 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for getticket@test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 tls_out_resumption client requested new ticket, server provided
+1999-03-02 09:44:33 10HmaX-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmaX-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmaX-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmaX-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmaX-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmaX-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmaX-0005vi-00 => getticket@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for resume@test.ex abcd@test.ex xyz@test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 tls_out_resumption session resumed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmaZ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmaZ-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmaZ-0005vi-00 tls_out_resumption not requested or offered
+1999-03-02 09:44:33 10HmaZ-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmaZ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmaZ-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => resume@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbB-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for renewal@test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 tls_out_resumption session resumed, also new ticket
+1999-03-02 09:44:33 10HmbC-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmbC-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmbC-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmbC-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmbC-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbC-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmbC-0005vi-00 => renewal@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00"
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for postrenewal@test.ex
+1999-03-02 09:44:33 10HmbE-0005vi-00 tls_out_resumption session resumed
+1999-03-02 09:44:33 10HmbE-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmbE-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmbE-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmbE-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmbE-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbE-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmbE-0005vi-00 => postrenewal@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbF-0005vi-00"
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for timeout@test.ex
+1999-03-02 09:44:33 10HmbG-0005vi-00 tls_out_resumption session resumed, also new ticket
+1999-03-02 09:44:33 10HmbG-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmbG-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmbG-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmbG-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmbG-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbG-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmbG-0005vi-00 => timeout@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbH-0005vi-00"
+1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for notreq@test.ex
+1999-03-02 09:44:33 10HmbI-0005vi-00 tls_out_resumption not requested or offered
+1999-03-02 09:44:33 10HmbI-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmbI-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmbI-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmbI-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmbI-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbI-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmbI-0005vi-00 => notreq@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbJ-0005vi-00"
+1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 tls_in_resumption	client requested new ticket, server provided
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for getticket@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <getticket@test.ex> R=server
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	session resumed
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for resume@test.ex xyz@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <xyz@test.ex> R=server
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <resume@test.ex> R=server
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	not requested or offered
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for abcd@test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <abcd@test.ex> R=server
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	session resumed, also new ticket
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbC-0005vi-00@myhost.test.ex for renewal@test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <renewal@test.ex> R=server
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	session resumed
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for postrenewal@test.ex
+1999-03-02 09:44:33 10HmbF-0005vi-00 => :blackhole: <postrenewal@test.ex> R=server
+1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	session resumed, also new ticket
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbG-0005vi-00@myhost.test.ex for timeout@test.ex
+1999-03-02 09:44:33 10HmbH-0005vi-00 => :blackhole: <timeout@test.ex> R=server
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	client requested new ticket, server provided
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbI-0005vi-00@myhost.test.ex for notreq@test.ex
+1999-03-02 09:44:33 10HmbJ-0005vi-00 => :blackhole: <notreq@test.ex> R=server
+1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
diff --git a/test/log/5895 b/test/log/5895
new file mode 100644
index 000000000..fa15df27f
--- /dev/null
+++ b/test/log/5895
@@ -0,0 +1,157 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for getticket@test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 tls_out_resumption client requested new ticket, server provided
+1999-03-02 09:44:33 10HmaX-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmaX-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmaX-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmaX-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmaX-0005vi-00 ocsp	4
+1999-03-02 09:44:33 10HmaX-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmaX-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmaX-0005vi-00 => getticket@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for resume@test.ex abcd@test.ex xyz@test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 tls_out_resumption session resumed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ocsp	4
+1999-03-02 09:44:33 10HmaZ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmaZ-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmaZ-0005vi-00 tls_out_resumption not requested or offered
+1999-03-02 09:44:33 10HmaZ-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmaZ-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ocsp	4
+1999-03-02 09:44:33 10HmaZ-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmaZ-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => resume@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbB-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for renewal@test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 tls_out_resumption session resumed, also new ticket
+1999-03-02 09:44:33 10HmbC-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmbC-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmbC-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmbC-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmbC-0005vi-00 ocsp	4
+1999-03-02 09:44:33 10HmbC-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbC-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmbC-0005vi-00 => renewal@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00"
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for postrenewal@test.ex
+1999-03-02 09:44:33 10HmbE-0005vi-00 tls_out_resumption session resumed
+1999-03-02 09:44:33 10HmbE-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmbE-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmbE-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmbE-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmbE-0005vi-00 ocsp	4
+1999-03-02 09:44:33 10HmbE-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbE-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmbE-0005vi-00 => postrenewal@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbF-0005vi-00"
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for timeout@test.ex
+1999-03-02 09:44:33 10HmbG-0005vi-00 tls_out_resumption session resumed, also new ticket
+1999-03-02 09:44:33 10HmbG-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmbG-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmbG-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmbG-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmbG-0005vi-00 ocsp	4
+1999-03-02 09:44:33 10HmbG-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbG-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmbG-0005vi-00 => timeout@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbH-0005vi-00"
+1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for notreq@test.ex
+1999-03-02 09:44:33 10HmbI-0005vi-00 tls_out_resumption not requested or offered
+1999-03-02 09:44:33 10HmbI-0005vi-00 our cert subject	
+1999-03-02 09:44:33 10HmbI-0005vi-00 peer cert subject	CN=server1.example.com
+1999-03-02 09:44:33 10HmbI-0005vi-00 peer cert verified	1
+1999-03-02 09:44:33 10HmbI-0005vi-00 peer dn	/CN=server1.example.com
+1999-03-02 09:44:33 10HmbI-0005vi-00 ocsp	4
+1999-03-02 09:44:33 10HmbI-0005vi-00 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbI-0005vi-00 bits	256
+1999-03-02 09:44:33 10HmbI-0005vi-00 => notreq@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbJ-0005vi-00"
+1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 tls_in_resumption	client requested new ticket, server provided
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 ocsp	4
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for getticket@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <getticket@test.ex> R=server
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	session resumed
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 ocsp	0
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for resume@test.ex xyz@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <xyz@test.ex> R=server
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <resume@test.ex> R=server
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	not requested or offered
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 ocsp	4
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for abcd@test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <abcd@test.ex> R=server
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	session resumed, also new ticket
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 ocsp	0
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbC-0005vi-00@myhost.test.ex for renewal@test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <renewal@test.ex> R=server
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	session resumed
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 ocsp	0
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for postrenewal@test.ex
+1999-03-02 09:44:33 10HmbF-0005vi-00 => :blackhole: <postrenewal@test.ex> R=server
+1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	session resumed, also new ticket
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 ocsp	0
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbG-0005vi-00@myhost.test.ex for timeout@test.ex
+1999-03-02 09:44:33 10HmbH-0005vi-00 => :blackhole: <timeout@test.ex> R=server
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 tls_in_resumption	client requested new ticket, server provided
+1999-03-02 09:44:33 our cert subject	CN=server1.example.com
+1999-03-02 09:44:33 peer cert subject	
+1999-03-02 09:44:33 peer cert verified	0
+1999-03-02 09:44:33 peer dn	
+1999-03-02 09:44:33 ocsp	4
+1999-03-02 09:44:33 cipher	TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits	256
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbI-0005vi-00@myhost.test.ex for notreq@test.ex
+1999-03-02 09:44:33 10HmbJ-0005vi-00 => :blackhole: <notreq@test.ex> R=server
+1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed