summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/confs/58903
-rw-r--r--test/confs/58923
-rw-r--r--test/log/589080
-rw-r--r--test/log/589116
-rw-r--r--test/log/589280
-rw-r--r--test/scripts/5890-Resume-GnuTLS/589014
-rw-r--r--test/scripts/5891-Resume-GnuTLS-OCSP/5891 (renamed from test/scripts/5891-Resume-GnuTLS-OCSP/5890)2
-rw-r--r--test/scripts/5892-Resume-OpenSSL/589215
-rw-r--r--test/stderr/541096
-rw-r--r--test/stderr/542096
-rw-r--r--test/stdout/05721
11 files changed, 397 insertions, 9 deletions
diff --git a/test/confs/5890 b/test/confs/5890
index 0c812fd89..88743cfd0 100644
--- a/test/confs/5890
+++ b/test/confs/5890
@@ -82,6 +82,9 @@ send_to_server1:
hosts = 127.0.0.1
port = PORT_D
helo_data = helo.data.changed
+.ifdef HELO_MSG
+ host_name_extract = HELO_MSG
+.endif
.ifdef VALUE
tls_resumption_hosts = *
.else
diff --git a/test/confs/5892 b/test/confs/5892
index a7738468f..0aec9bfaf 100644
--- a/test/confs/5892
+++ b/test/confs/5892
@@ -86,6 +86,9 @@ send_to_server1:
hosts = 127.0.0.1
port = PORT_D
helo_data = helo.data.changed
+.ifdef HELO_MSG
+ host_name_extract = HELO_MSG
+.endif
.ifdef VALUE
tls_resumption_hosts = *
.else
diff --git a/test/log/5890 b/test/log/5890
index 6d6a6a8b2..97f779835 100644
--- a/test/log/5890
+++ b/test/log/5890
@@ -156,6 +156,46 @@
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
+1999-03-02 09:44:33 10HmcB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for getticket@test.ex
+1999-03-02 09:44:33 10HmcB-0005vi-00 tls_out_resumption client requested new ticket, server provided
+1999-03-02 09:44:33 10HmcB-0005vi-00 our cert subject
+1999-03-02 09:44:33 10HmcB-0005vi-00 peer cert subject CN=server1.example.com
+1999-03-02 09:44:33 10HmcB-0005vi-00 peer cert verified 1
+1999-03-02 09:44:33 10HmcB-0005vi-00 peer dn CN=server1.example.com
+1999-03-02 09:44:33 10HmcB-0005vi-00 cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmcB-0005vi-00 bits 256
+1999-03-02 09:44:33 10HmcB-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=10HmcC-0005vi-00"
+1999-03-02 09:44:33 10HmcB-0005vi-00 Completed
+1999-03-02 09:44:33 10HmcD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for noresume@test.ex
+1999-03-02 09:44:33 10HmcD-0005vi-00 tls_out_resumption client requested new ticket, server provided
+1999-03-02 09:44:33 10HmcD-0005vi-00 our cert subject
+1999-03-02 09:44:33 10HmcD-0005vi-00 peer cert subject CN=server1.example.com
+1999-03-02 09:44:33 10HmcD-0005vi-00 peer cert verified 1
+1999-03-02 09:44:33 10HmcD-0005vi-00 peer dn CN=server1.example.com
+1999-03-02 09:44:33 10HmcD-0005vi-00 cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmcD-0005vi-00 bits 256
+1999-03-02 09:44:33 10HmcD-0005vi-00 => noresume@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=10HmcE-0005vi-00"
+1999-03-02 09:44:33 10HmcD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmcF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for resume@test.ex
+1999-03-02 09:44:33 10HmcF-0005vi-00 tls_out_resumption session resumed, also new ticket
+1999-03-02 09:44:33 10HmcF-0005vi-00 our cert subject
+1999-03-02 09:44:33 10HmcF-0005vi-00 peer cert subject CN=server1.example.com
+1999-03-02 09:44:33 10HmcF-0005vi-00 peer cert verified 1
+1999-03-02 09:44:33 10HmcF-0005vi-00 peer dn CN=server1.example.com
+1999-03-02 09:44:33 10HmcF-0005vi-00 cipher TLS1.x:ke-PSK-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmcF-0005vi-00 bits 256
+1999-03-02 09:44:33 10HmcF-0005vi-00 => resume@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-PSK-AES256-SHAnnn:xxx* CV=yes DN="CN=server1.example.com" C="250 OK id=10HmcG-0005vi-00"
+1999-03-02 09:44:33 10HmcF-0005vi-00 Completed
+1999-03-02 09:44:33 10HmcH-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for resume@test.ex
+1999-03-02 09:44:33 10HmcH-0005vi-00 tls_out_resumption session resumed, also new ticket
+1999-03-02 09:44:33 10HmcH-0005vi-00 our cert subject
+1999-03-02 09:44:33 10HmcH-0005vi-00 peer cert subject CN=server1.example.com
+1999-03-02 09:44:33 10HmcH-0005vi-00 peer cert verified 1
+1999-03-02 09:44:33 10HmcH-0005vi-00 peer dn CN=server1.example.com
+1999-03-02 09:44:33 10HmcH-0005vi-00 cipher TLS1.x:ke-PSK-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmcH-0005vi-00 bits 256
+1999-03-02 09:44:33 10HmcH-0005vi-00 => resume@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-PSK-AES256-SHAnnn:xxx* CV=yes DN="CN=server1.example.com" C="250 OK id=10HmcI-0005vi-00"
+1999-03-02 09:44:33 10HmcH-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
@@ -322,3 +362,43 @@
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
+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 10HmcC-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=E10HmcB-0005vi-00@myhost.test.ex for getticket@test.ex
+1999-03-02 09:44:33 10HmcC-0005vi-00 => :blackhole: <getticket@test.ex> R=server
+1999-03-02 09:44:33 10HmcC-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 10HmcE-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=E10HmcD-0005vi-00@myhost.test.ex for noresume@test.ex
+1999-03-02 09:44:33 10HmcE-0005vi-00 => :blackhole: <noresume@test.ex> R=server
+1999-03-02 09:44:33 10HmcE-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
+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-PSK-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits 256
+1999-03-02 09:44:33 10HmcG-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-PSK-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmcF-0005vi-00@myhost.test.ex for resume@test.ex
+1999-03-02 09:44:33 10HmcG-0005vi-00 => :blackhole: <resume@test.ex> R=server
+1999-03-02 09:44:33 10HmcG-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
+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-PSK-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 bits 256
+1999-03-02 09:44:33 10HmcI-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-PSK-AES256-SHAnnn:xxx* CV=no S=sss id=E10HmcH-0005vi-00@myhost.test.ex for resume@test.ex
+1999-03-02 09:44:33 10HmcI-0005vi-00 => :blackhole: <resume@test.ex> R=server
+1999-03-02 09:44:33 10HmcI-0005vi-00 Completed
diff --git a/test/log/5891 b/test/log/5891
index 5ffb9ccf7..b33d5d27d 100644
--- a/test/log/5891
+++ b/test/log/5891
@@ -129,7 +129,7 @@
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 tls_out_resumption session resumed
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
@@ -140,7 +140,7 @@
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-PSK-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, also new ticket
+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
@@ -175,7 +175,7 @@
******** 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 tls_in_resumption client offered session, server only provided 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
@@ -198,7 +198,7 @@
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 tls_in_resumption 0x05
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
@@ -242,7 +242,7 @@
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 tls_in_resumption client offered session, server only provided 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
@@ -253,7 +253,7 @@
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
-1999-03-02 09:44:33 tls_in_resumption client requested new ticket, server provided
+1999-03-02 09:44:33 tls_in_resumption client offered session, server only provided 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
@@ -310,7 +310,7 @@
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 tls_in_resumption session resumed
1999-03-02 09:44:33 our cert subject
1999-03-02 09:44:33 peer cert subject
1999-03-02 09:44:33 peer cert verified 0
@@ -321,7 +321,7 @@
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-PSK-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, also new ticket
+1999-03-02 09:44:33 tls_in_resumption session resumed
1999-03-02 09:44:33 our cert subject
1999-03-02 09:44:33 peer cert subject
1999-03-02 09:44:33 peer cert verified 0
diff --git a/test/log/5892 b/test/log/5892
index b3d395f5e..58e9e6e6c 100644
--- a/test/log/5892
+++ b/test/log/5892
@@ -88,6 +88,46 @@
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 noresume@test.ex
+1999-03-02 09:44:33 10HmbQ-0005vi-00 tls_out_resumption client requested new ticket, server provided
+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 => noresume@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 Completed
+1999-03-02 09:44:33 10HmbS-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for resume@test.ex
+1999-03-02 09:44:33 10HmbS-0005vi-00 tls_out_resumption session resumed
+1999-03-02 09:44:33 10HmbS-0005vi-00 our cert subject
+1999-03-02 09:44:33 10HmbS-0005vi-00 peer cert subject CN=server1.example.com
+1999-03-02 09:44:33 10HmbS-0005vi-00 peer cert verified 1
+1999-03-02 09:44:33 10HmbS-0005vi-00 peer dn /CN=server1.example.com
+1999-03-02 09:44:33 10HmbS-0005vi-00 cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbS-0005vi-00 bits 256
+1999-03-02 09:44:33 10HmbS-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=10HmbT-0005vi-00"
+1999-03-02 09:44:33 10HmbS-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbU-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for resume@test.ex
+1999-03-02 09:44:33 10HmbU-0005vi-00 tls_out_resumption session resumed
+1999-03-02 09:44:33 10HmbU-0005vi-00 our cert subject
+1999-03-02 09:44:33 10HmbU-0005vi-00 peer cert subject CN=server1.example.com
+1999-03-02 09:44:33 10HmbU-0005vi-00 peer cert verified 1
+1999-03-02 09:44:33 10HmbU-0005vi-00 peer dn /CN=server1.example.com
+1999-03-02 09:44:33 10HmbU-0005vi-00 cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 10HmbU-0005vi-00 bits 256
+1999-03-02 09:44:33 10HmbU-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=10HmbV-0005vi-00"
+1999-03-02 09:44:33 10HmbU-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
@@ -182,3 +222,43 @@
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 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 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 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 noresume@test.ex
+1999-03-02 09:44:33 10HmbR-0005vi-00 => :blackhole: <noresume@test.ex> R=server
+1999-03-02 09:44:33 10HmbR-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 10HmbT-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=E10HmbS-0005vi-00@myhost.test.ex for resume@test.ex
+1999-03-02 09:44:33 10HmbT-0005vi-00 => :blackhole: <resume@test.ex> R=server
+1999-03-02 09:44:33 10HmbT-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 10HmbV-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=E10HmbU-0005vi-00@myhost.test.ex for resume@test.ex
+1999-03-02 09:44:33 10HmbV-0005vi-00 => :blackhole: <resume@test.ex> R=server
+1999-03-02 09:44:33 10HmbV-0005vi-00 Completed
diff --git a/test/scripts/5890-Resume-GnuTLS/5890 b/test/scripts/5890-Resume-GnuTLS/5890
index d54973cef..d129da2db 100644
--- a/test/scripts/5890-Resume-GnuTLS/5890
+++ b/test/scripts/5890-Resume-GnuTLS/5890
@@ -65,5 +65,19 @@ Test message.
exim -odf notreq@test.ex
Test message, not requesting resumption.
****
+#
+# Test the host_name_extract transport option. Due to the change the second
+# message's connection should not offer a session. The third should (on the 2nd),
+# as should the fourth (on the 1st).
+sudo rm -f DIR/spool/db/tls*
+exim -DVALUE=resume -odf getticket@test.ex
+****
+exim -DVALUE=resume -DHELO_MSG=differenthost -odf noresume@test.ex
+****
+exim -DVALUE=resume -DHELO_MSG=differenthost -odf resume@test.ex
+****
+exim -DVALUE=resume -odf resume@test.ex
+****
+#
killdaemon
no_msglog_check
diff --git a/test/scripts/5891-Resume-GnuTLS-OCSP/5890 b/test/scripts/5891-Resume-GnuTLS-OCSP/5891
index 449b0eb3d..a497fbb0b 100644
--- a/test/scripts/5891-Resume-GnuTLS-OCSP/5890
+++ b/test/scripts/5891-Resume-GnuTLS-OCSP/5891
@@ -29,7 +29,7 @@ Test message.
exim -odf notreq@test.ex
Test message, not requesting resumption.
****
-sudo rm -f DIR/spool/db/tls
+sudo rm -f DIR/spool/db/tls*
exim -odf -DVALUE=resume noverify_getticket@test.ex
Dest on this means the server cert will not verify (but try_verify will permit it)
****
diff --git a/test/scripts/5892-Resume-OpenSSL/5892 b/test/scripts/5892-Resume-OpenSSL/5892
index 1fdc7e949..814a27b6b 100644
--- a/test/scripts/5892-Resume-OpenSSL/5892
+++ b/test/scripts/5892-Resume-OpenSSL/5892
@@ -24,6 +24,7 @@ Test message.
exim -odf notreq@test.ex
Test message, not requesting resumption.
****
+#
sudo rm -f DIR/spool/db/tls*
exim -odf -DVALUE=resume noverify_getticket@test.ex
Dest on this means the server cert will not verify (but try_verify will permit it)
@@ -31,5 +32,19 @@ Dest on this means the server cert will not verify (but try_verify will permit i
exim -odf -DVALUE=resume noverify_resume@test.ex
Dest on this means the server cert will not verify (but try_verify will permit it)
****
+#
+# Test the host_name_extract transport option. Due to the change the second
+# message's connection should not offer a session. The third should (on the 2nd),
+# as should the fourth (on the 1st).
+sudo rm -f DIR/spool/db/tls*
+exim -DVALUE=resume -odf getticket@test.ex
+****
+exim -DVALUE=resume -DHELO_MSG=differenthost -odf noresume@test.ex
+****
+exim -DVALUE=resume -DHELO_MSG=differenthost -odf resume@test.ex
+****
+exim -DVALUE=resume -odf resume@test.ex
+****
+#
killdaemon
no_msglog_check
diff --git a/test/stderr/5410 b/test/stderr/5410
index 8599c878a..bbde8b873 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -80,6 +80,38 @@ cmd buf flush ddd bytes
250-PIPELINING
250-STARTTLS
250 HELP
+ ╭considering: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╭considering: $host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├considering: }{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $host
+ ╰─────result: 127.0.0.1
+ ╭considering: .outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───────text: .outlook.com
+ ├considering: \$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├backslashed: '\$'
+ ├considering: }} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: .outlook.com\$
+ ╰─────result: .outlook.com$
+ ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───scanning: }{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $item
+ ├─────result:
+ ╰───skipping: result is not used
+ ╭───scanning: \N^250-([\w.]+)\s\N}}} {$1}}
+ ├──protected: ^250-([\w.]+)\s
+ ├───scanning: }}} {$1}}
+ ├──expanding: \N^250-([\w.]+)\s\N
+ ├─────result: ^250-([\w.]+)\s
+ ╰───skipping: result is not used
+ ├──condition: and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}}
+ ├─────result: false
+ ╭───scanning: $1}}
+ ├───scanning: }}
+ ├──expanding: $1
+ ├─────result:
+ ╰───skipping: result is not used
+ ├──expanding: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╰─────result:
╭considering: ${if eq {$address_data}{usery}{*}{:}}
╭considering: $address_data}{usery}{*}{:}}
├considering: }{usery}{*}{:}}
@@ -604,6 +636,38 @@ cmd buf flush ddd bytes
250-PIPELINING
250-STARTTLS
250 HELP
+ ╭considering: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╭considering: $host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├considering: }{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $host
+ ╰─────result: 127.0.0.1
+ ╭considering: .outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───────text: .outlook.com
+ ├considering: \$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├backslashed: '\$'
+ ├considering: }} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: .outlook.com\$
+ ╰─────result: .outlook.com$
+ ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───scanning: }{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $item
+ ├─────result:
+ ╰───skipping: result is not used
+ ╭───scanning: \N^250-([\w.]+)\s\N}}} {$1}}
+ ├──protected: ^250-([\w.]+)\s
+ ├───scanning: }}} {$1}}
+ ├──expanding: \N^250-([\w.]+)\s\N
+ ├─────result: ^250-([\w.]+)\s
+ ╰───skipping: result is not used
+ ├──condition: and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}}
+ ├─────result: false
+ ╭───scanning: $1}}
+ ├───scanning: }}
+ ├──expanding: $1
+ ├─────result:
+ ╰───skipping: result is not used
+ ├──expanding: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╰─────result:
╭considering: ${if eq {$address_data}{usery}{*}{:}}
╭considering: $address_data}{usery}{*}{:}}
├considering: }{usery}{*}{:}}
@@ -1089,6 +1153,38 @@ cmd buf flush ddd bytes
250-PIPELINING
250-STARTTLS
250 HELP
+ ╭considering: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╭considering: $host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├considering: }{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $host
+ ╰─────result: 127.0.0.1
+ ╭considering: .outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───────text: .outlook.com
+ ├considering: \$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├backslashed: '\$'
+ ├considering: }} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: .outlook.com\$
+ ╰─────result: .outlook.com$
+ ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───scanning: }{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $item
+ ├─────result:
+ ╰───skipping: result is not used
+ ╭───scanning: \N^250-([\w.]+)\s\N}}} {$1}}
+ ├──protected: ^250-([\w.]+)\s
+ ├───scanning: }}} {$1}}
+ ├──expanding: \N^250-([\w.]+)\s\N
+ ├─────result: ^250-([\w.]+)\s
+ ╰───skipping: result is not used
+ ├──condition: and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}}
+ ├─────result: false
+ ╭───scanning: $1}}
+ ├───scanning: }}
+ ├──expanding: $1
+ ├─────result:
+ ╰───skipping: result is not used
+ ├──expanding: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╰─────result:
╭considering: ${if eq {$address_data}{usery}{*}{:}}
╭considering: $address_data}{usery}{*}{:}}
├considering: }{usery}{*}{:}}
diff --git a/test/stderr/5420 b/test/stderr/5420
index 384a11736..27889f255 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -80,6 +80,38 @@ cmd buf flush ddd bytes
250-PIPELINING
250-STARTTLS
250 HELP
+ ╭considering: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╭considering: $host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├considering: }{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $host
+ ╰─────result: 127.0.0.1
+ ╭considering: .outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───────text: .outlook.com
+ ├considering: \$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├backslashed: '\$'
+ ├considering: }} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: .outlook.com\$
+ ╰─────result: .outlook.com$
+ ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───scanning: }{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $item
+ ├─────result:
+ ╰───skipping: result is not used
+ ╭───scanning: \N^250-([\w.]+)\s\N}}} {$1}}
+ ├──protected: ^250-([\w.]+)\s
+ ├───scanning: }}} {$1}}
+ ├──expanding: \N^250-([\w.]+)\s\N
+ ├─────result: ^250-([\w.]+)\s
+ ╰───skipping: result is not used
+ ├──condition: and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}}
+ ├─────result: false
+ ╭───scanning: $1}}
+ ├───scanning: }}
+ ├──expanding: $1
+ ├─────result:
+ ╰───skipping: result is not used
+ ├──expanding: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╰─────result:
╭considering: ${if eq {$address_data}{usery}{*}{:}}
╭considering: $address_data}{usery}{*}{:}}
├considering: }{usery}{*}{:}}
@@ -605,6 +637,38 @@ cmd buf flush ddd bytes
250-PIPELINING
250-STARTTLS
250 HELP
+ ╭considering: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╭considering: $host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├considering: }{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $host
+ ╰─────result: 127.0.0.1
+ ╭considering: .outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───────text: .outlook.com
+ ├considering: \$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├backslashed: '\$'
+ ├considering: }} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: .outlook.com\$
+ ╰─────result: .outlook.com$
+ ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───scanning: }{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $item
+ ├─────result:
+ ╰───skipping: result is not used
+ ╭───scanning: \N^250-([\w.]+)\s\N}}} {$1}}
+ ├──protected: ^250-([\w.]+)\s
+ ├───scanning: }}} {$1}}
+ ├──expanding: \N^250-([\w.]+)\s\N
+ ├─────result: ^250-([\w.]+)\s
+ ╰───skipping: result is not used
+ ├──condition: and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}}
+ ├─────result: false
+ ╭───scanning: $1}}
+ ├───scanning: }}
+ ├──expanding: $1
+ ├─────result:
+ ╰───skipping: result is not used
+ ├──expanding: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╰─────result:
╭considering: ${if eq {$address_data}{usery}{*}{:}}
╭considering: $address_data}{usery}{*}{:}}
├considering: }{usery}{*}{:}}
@@ -1090,6 +1154,38 @@ cmd buf flush ddd bytes
250-PIPELINING
250-STARTTLS
250 HELP
+ ╭considering: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╭considering: $host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├considering: }{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $host
+ ╰─────result: 127.0.0.1
+ ╭considering: .outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───────text: .outlook.com
+ ├considering: \$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├backslashed: '\$'
+ ├considering: }} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: .outlook.com\$
+ ╰─────result: .outlook.com$
+ ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├───scanning: }{\N^250-([\w.]+)\s\N}}} {$1}}
+ ├──expanding: $item
+ ├─────result:
+ ╰───skipping: result is not used
+ ╭───scanning: \N^250-([\w.]+)\s\N}}} {$1}}
+ ├──protected: ^250-([\w.]+)\s
+ ├───scanning: }}} {$1}}
+ ├──expanding: \N^250-([\w.]+)\s\N
+ ├─────result: ^250-([\w.]+)\s
+ ╰───skipping: result is not used
+ ├──condition: and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}}
+ ├─────result: false
+ ╭───scanning: $1}}
+ ├───scanning: }}
+ ├──expanding: $1
+ ├─────result:
+ ╰───skipping: result is not used
+ ├──expanding: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
+ ╰─────result:
╭considering: ${if eq {$address_data}{usery}{*}{:}}
╭considering: $address_data}{usery}{*}{:}}
├considering: }{usery}{*}{:}}
diff --git a/test/stdout/0572 b/test/stdout/0572
index 0ba712dcf..3345451c3 100644
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -48,6 +48,7 @@ fallback_hosts =
final_timeout = 10m
no_gethostbyname
helo_data = $primary_hostname
+host_name_extract = ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
hosts =
hosts_avoid_esmtp =
hosts_avoid_pipelining =
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 10:17:15 +0000