summaryrefslogtreecommitdiff
path: root/test/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'test/scripts')
-rw-r--r--test/scripts/5892-Resume-OpenSSL/589231
-rw-r--r--test/scripts/5893-Resume-OpenSSL-OCSP/589331
-rw-r--r--test/scripts/5894-Resume-OpenSSL-TLS1.3/589428
-rw-r--r--test/scripts/5894-Resume-OpenSSL-TLS1.3/REQUIRES4
-rw-r--r--test/scripts/5895-Resume-OpenSSL-TLS1.3-OCSP/589528
-rw-r--r--test/scripts/5895-Resume-OpenSSL-TLS1.3-OCSP/REQUIRES5
6 files changed, 67 insertions, 60 deletions
diff --git a/test/scripts/5892-Resume-OpenSSL/5892 b/test/scripts/5892-Resume-OpenSSL/5892
index 6c04424ce..5a8dd3ef2 100644
--- a/test/scripts/5892-Resume-OpenSSL/5892
+++ b/test/scripts/5892-Resume-OpenSSL/5892
@@ -1,4 +1,4 @@
-# TLS session resumption
+# TLSv1.2 session resumption
#
### TLS1.2
exim -DSERVER=server -DOPTION=+no_tlsv1_3 -bd -oX PORT_D
@@ -32,33 +32,4 @@ exim -odf -DVALUE=resume noverify_resume@test.ex
Dest on this means the server cert will not verify (but try_verify will permit it)
****
killdaemon
-sleep 1
-sudo rm -f DIR/spool/db/tls
-#
-#
-### TLS1.3
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim -DVALUE=resume -odf getticket@test.ex
-Test message. Contains FF: ÿ
-****
-exim -DVALUE=resume -odf resume@test.ex abcd@test.ex xyz@test.ex
-Test message to two different hosts, one does not support resume
-****
-# allow time for ticket to hit renewal time
-sleep 3
-exim -DVALUE=resume -odf renewal@test.ex
-Test message.
-****
-exim -DVALUE=resume -odf postrenewal@test.ex
-Test message.
-****
-sleep 3
-exim -DVALUE=resume -odf timeout@test.ex
-Test message.
-****
-exim -odf notreq@test.ex
-Test message, not requesting resumption.
-****
-killdaemon
no_msglog_check
diff --git a/test/scripts/5893-Resume-OpenSSL-OCSP/5893 b/test/scripts/5893-Resume-OpenSSL-OCSP/5893
index 18bce1f27..a85c3edda 100644
--- a/test/scripts/5893-Resume-OpenSSL-OCSP/5893
+++ b/test/scripts/5893-Resume-OpenSSL-OCSP/5893
@@ -1,4 +1,4 @@
-# TLS session resumption with OCSP
+# TLSv1.2 session resumption with OCSP
#
### TLS1.2
exim -DSERVER=server -DOPTION=+no_tlsv1_3 -bd -oX PORT_D
@@ -32,33 +32,4 @@ exim -odf -DVALUE=resume noverify_resume@test.ex
Dest on this means the server cert will not verify (but try_verify will permit it)
****
killdaemon
-sleep 1
-sudo rm -f DIR/spool/db/tls
-#
-#
-### TLS1.3
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim -DVALUE=resume -odf getticket@test.ex
-Test message. Contains FF: ÿ
-****
-exim -DVALUE=resume -odf resume@test.ex abcd@test.ex xyz@test.ex
-Test message to two different hosts, one does not support resume
-****
-# allow time for ticket to hit renewal time
-sleep 3
-exim -DVALUE=resume -odf renewal@test.ex
-Test message.
-****
-exim -DVALUE=resume -odf postrenewal@test.ex
-Test message.
-****
-sleep 3
-exim -DVALUE=resume -odf timeout@test.ex
-Test message.
-****
-exim -odf notreq@test.ex
-Test message, not requesting resumption.
-****
-killdaemon
no_msglog_check
diff --git a/test/scripts/5894-Resume-OpenSSL-TLS1.3/5894 b/test/scripts/5894-Resume-OpenSSL-TLS1.3/5894
new file mode 100644
index 000000000..722bc9b08
--- /dev/null
+++ b/test/scripts/5894-Resume-OpenSSL-TLS1.3/5894
@@ -0,0 +1,28 @@
+# TLSv1.3 session resumption
+#
+### TLS1.3
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim -DVALUE=resume -odf getticket@test.ex
+Test message. Contains FF: ÿ
+****
+exim -DVALUE=resume -odf resume@test.ex abcd@test.ex xyz@test.ex
+Test message to two different hosts, one does not support resume
+****
+# allow time for ticket to hit renewal time
+sleep 3
+exim -DVALUE=resume -odf renewal@test.ex
+Test message.
+****
+exim -DVALUE=resume -odf postrenewal@test.ex
+Test message.
+****
+sleep 3
+exim -DVALUE=resume -odf timeout@test.ex
+Test message.
+****
+exim -odf notreq@test.ex
+Test message, not requesting resumption.
+****
+killdaemon
+no_msglog_check
diff --git a/test/scripts/5894-Resume-OpenSSL-TLS1.3/REQUIRES b/test/scripts/5894-Resume-OpenSSL-TLS1.3/REQUIRES
new file mode 100644
index 000000000..6b79369fc
--- /dev/null
+++ b/test/scripts/5894-Resume-OpenSSL-TLS1.3/REQUIRES
@@ -0,0 +1,4 @@
+support OpenSSL
+running IPv4
+support TLS_resume
+feature _OPT_OPENSSL_NO_TLSV1_3_X
diff --git a/test/scripts/5895-Resume-OpenSSL-TLS1.3-OCSP/5895 b/test/scripts/5895-Resume-OpenSSL-TLS1.3-OCSP/5895
new file mode 100644
index 000000000..5709b4a78
--- /dev/null
+++ b/test/scripts/5895-Resume-OpenSSL-TLS1.3-OCSP/5895
@@ -0,0 +1,28 @@
+# TLSv1.3 session resumption with OCSP
+#
+### TLS1.3
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim -DVALUE=resume -odf getticket@test.ex
+Test message. Contains FF: ÿ
+****
+exim -DVALUE=resume -odf resume@test.ex abcd@test.ex xyz@test.ex
+Test message to two different hosts, one does not support resume
+****
+# allow time for ticket to hit renewal time
+sleep 3
+exim -DVALUE=resume -odf renewal@test.ex
+Test message.
+****
+exim -DVALUE=resume -odf postrenewal@test.ex
+Test message.
+****
+sleep 3
+exim -DVALUE=resume -odf timeout@test.ex
+Test message.
+****
+exim -odf notreq@test.ex
+Test message, not requesting resumption.
+****
+killdaemon
+no_msglog_check
diff --git a/test/scripts/5895-Resume-OpenSSL-TLS1.3-OCSP/REQUIRES b/test/scripts/5895-Resume-OpenSSL-TLS1.3-OCSP/REQUIRES
new file mode 100644
index 000000000..1ba7fa74f
--- /dev/null
+++ b/test/scripts/5895-Resume-OpenSSL-TLS1.3-OCSP/REQUIRES
@@ -0,0 +1,5 @@
+support OpenSSL
+running IPv4
+support TLS_resume
+support OCSP
+feature _OPT_OPENSSL_NO_TLSV1_3_X