Gitweb:
https://git.exim.org/exim.git/commitdiff/bfba2a3018912e44d89b52e6649fc11f37a42ecb
Commit: bfba2a3018912e44d89b52e6649fc11f37a42ecb
Parent: 48f733ce6670fb161d3ae194340f94d4d77eb69b
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Jul 20 20:24:31 2024 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sat Jul 20 20:33:48 2024 +0100
Testsuite: split testcase for non-OCSP build
---
test/confs/1102 | 4 +++-
test/confs/5680 | 1 +
test/log/5680 | 5 +++++
test/scripts/1100-Basic-TLS/1102 | 8 ++------
test/scripts/{1100-Basic-TLS/1102 => 5680-OCSP/5680} | 6 +++---
test/scripts/5680-OCSP/REQUIRES | 3 +++
test/stdout/1102 | 6 ++----
test/stdout/{1102 => 5680} | 0
8 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/test/confs/1102 b/test/confs/1102
index 23afc36ee..c8379e0f4 100644
--- a/test/confs/1102
+++ b/test/confs/1102
@@ -1,4 +1,4 @@
-# Exim test configuration 1102
+# Exim test configuration 1102 & 5680
.include DIR/aux-var/tls_conf_prefix
@@ -10,7 +10,9 @@ tls_advertise_hosts = *
tls_certificate = DIR/tmp/certs/servercert
tls_privatekey = DIR/tmp/certs/serverkey
+.ifdef OPT
tls_ocsp_file = DIR/tmp/certs/ocsp_proof
+.endif
#tls_verify_certificates = DIR/aux-fixed/cert2
tls_verify_certificates = system,cache
diff --git a/test/confs/5680 b/test/confs/5680
new file mode 120000
index 000000000..4d642625f
--- /dev/null
+++ b/test/confs/5680
@@ -0,0 +1 @@
+1102
\ No newline at end of file
diff --git a/test/log/5680 b/test/log/5680
new file mode 100644
index 000000000..89933f709
--- /dev/null
+++ b/test/log/5680
@@ -0,0 +1,5 @@
+
+******** SERVER ********
+2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
+2017-07-30 18:51:05.712 server cert: CN=server1.example.com
+2017-07-30 18:51:05.712 server cert: CN=server1.example.net
diff --git a/test/scripts/1100-Basic-TLS/1102 b/test/scripts/1100-Basic-TLS/1102
index 285b3be09..a29ef0ba4 100644
--- a/test/scripts/1100-Basic-TLS/1102
+++ b/test/scripts/1100-Basic-TLS/1102
@@ -1,15 +1,13 @@
# TLS server: creds caching
#
-#
mkdir -p DIR/tmp/certs
cp DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem DIR/tmp/certs/servercert
cp DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key DIR/tmp/certs/serverkey
-cp DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp DIR/tmp/certs/ocsp_proof
#
#exim -d-all+tls+receive+timestamp -DSERVER=server -bd -oX PORT_D
exim -DSERVER=server -bd -oX PORT_D
****
-client-anytls -ocsp DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
??? 220
EHLO rhu.barb
????250
@@ -26,13 +24,11 @@ QUIT
****
sleep 1
# Now overwrite the cert
-# XXX using server2.com fails here, on the ocsp verify. Why?
cp DIR/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem DIR/tmp/certs/servercert
cp DIR/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key DIR/tmp/certs/serverkey
-cp DIR/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp DIR/tmp/certs/ocsp_proof
# The watch mech waits 5 sec after the last trigger, so give that time to expire then send another message
sleep 7
-client-anytls -ocsp DIR/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
??? 220
EHLO rhu.barb
????250
diff --git a/test/scripts/1100-Basic-TLS/1102 b/test/scripts/5680-OCSP/5680
similarity index 90%
copy from test/scripts/1100-Basic-TLS/1102
copy to test/scripts/5680-OCSP/5680
index 285b3be09..ac56b8448 100644
--- a/test/scripts/1100-Basic-TLS/1102
+++ b/test/scripts/5680-OCSP/5680
@@ -1,4 +1,4 @@
-# TLS server: creds caching
+# TLS server: creds caching, OCSP
#
#
mkdir -p DIR/tmp/certs
@@ -6,8 +6,8 @@ cp DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
cp DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key DIR/tmp/certs/serverkey
cp DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp DIR/tmp/certs/ocsp_proof
#
-#exim -d-all+tls+receive+timestamp -DSERVER=server -bd -oX PORT_D
-exim -DSERVER=server -bd -oX PORT_D
+#exim -d-all+tls+receive+timestamp -DSERVER=server -DOPT=ocsp -bd -oX PORT_D
+exim -DSERVER=server -DOPT=ocsp -bd -oX PORT_D
****
client-anytls -ocsp DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem 127.0.0.1 PORT_D
??? 220
diff --git a/test/scripts/5680-OCSP/REQUIRES b/test/scripts/5680-OCSP/REQUIRES
new file mode 100644
index 000000000..64054f671
--- /dev/null
+++ b/test/scripts/5680-OCSP/REQUIRES
@@ -0,0 +1,3 @@
+feature _HAVE_TLS
+support OCSP
+running IPv4
diff --git a/test/stdout/1102 b/test/stdout/1102
index 3803fb2a9..0e9c0b366 100644
--- a/test/stdout/1102
+++ b/test/stdout/1102
@@ -7,8 +7,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-OCSP status response: good signature
-Succeeded in starting TLS (with OCSP)
+Succeeded in starting TLS
>>> EHLO rhu.barb
????250
>>> MAIL FROM:<>
@@ -30,8 +29,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-OCSP status response: good signature
-Succeeded in starting TLS (with OCSP)
+Succeeded in starting TLS
>>> EHLO rhu.barb
????250
>>> MAIL FROM:<>
diff --git a/test/stdout/1102 b/test/stdout/5680
similarity index 100%
copy from test/stdout/1102
copy to test/stdout/5680
--
## subscription configuration (requires account):
##
https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at
http://www.exim.org/
## Please use the Wiki with this list -
http://wiki.exim.org/
