Testsuite: TLS server testcase consolidation

26 files changed, 18 insertions, 411 deletions

diff --git a/test/scripts/2000-GnuTLS/2003 b/test/scripts/1100-Basic-TLS/1103
index d4bcedd67..d8441dc40 100644
--- a/test/scripts/2000-GnuTLS/2003
+++ b/test/scripts/1100-Basic-TLS/1103
@@ -2,7 +2,7 @@
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client-gnutls HOSTIPV4 PORT_D
+client-anytls HOSTIPV4 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -20,7 +20,7 @@ rcpt to:<userx@test.ex>
 quit
 ??? 221
 ****
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/2000-GnuTLS/2004 b/test/scripts/1100-Basic-TLS/1104
index a310bb6ec..4a3af17ee 100644
--- a/test/scripts/2000-GnuTLS/2004
+++ b/test/scripts/1100-Basic-TLS/1104
@@ -2,7 +2,7 @@
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -18,7 +18,7 @@ rcpt to:<userx@test.ex>
 quit
 ??? 221
 ****
-client-gnutls HOSTIPV4 PORT_D
+client-anytls HOSTIPV4 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/2000-GnuTLS/2005 b/test/scripts/1100-Basic-TLS/1105
index a2164b327..fe06d2cab 100644
--- a/test/scripts/2000-GnuTLS/2005
+++ b/test/scripts/1100-Basic-TLS/1105
@@ -2,7 +2,7 @@
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 mail from:<userx@test.ex>
 ??? 250
diff --git a/test/scripts/2000-GnuTLS/2006 b/test/scripts/1100-Basic-TLS/1106
index 1da0f7ddc..1b8438f7e 100644
--- a/test/scripts/2000-GnuTLS/2006
+++ b/test/scripts/1100-Basic-TLS/1106
@@ -2,7 +2,7 @@
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/2000-GnuTLS/2015 b/test/scripts/1100-Basic-TLS/1107
index 07fda35b3..79d412d70 100644
--- a/test/scripts/2000-GnuTLS/2015
+++ b/test/scripts/1100-Basic-TLS/1107
@@ -2,7 +2,7 @@
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 ehlo timeout.rhu.barb
 ??? 250-
@@ -16,7 +16,7 @@ starttls_wait
 +++ 2
 ??? 421
 ****
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 ehlo close.rhu.barb
 ??? 250-
diff --git a/test/scripts/2000-GnuTLS/2018 b/test/scripts/1100-Basic-TLS/1108
index 3f06e59e8..7da4f444b 100644
--- a/test/scripts/2000-GnuTLS/2018
+++ b/test/scripts/1100-Basic-TLS/1108
@@ -2,7 +2,7 @@
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -25,7 +25,7 @@ This is a test encrypted message.
 quit
 ??? 221
 ****
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/2000-GnuTLS/2023 b/test/scripts/1100-Basic-TLS/1109
index 395fcdcde..395fcdcde 100644
--- a/test/scripts/2000-GnuTLS/2023
+++ b/test/scripts/1100-Basic-TLS/1109
diff --git a/test/scripts/2000-GnuTLS/2019 b/test/scripts/1100-Basic-TLS/1110
index d59f42ea2..865b2202f 100644
--- a/test/scripts/2000-GnuTLS/2019
+++ b/test/scripts/1100-Basic-TLS/1110
@@ -2,7 +2,7 @@
 gnutls
 exim -DSERVER=server -tls-on-connect -bd -oX PORT_D
 ****
-client-gnutls -tls-on-connect 127.0.0.1 PORT_D
+client-anytls -tls-on-connect 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -22,7 +22,7 @@ This is a test encrypted message.
 quit
 ??? 221
 ****
-client-gnutls -tls-on-connect HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
+client-anytls -tls-on-connect HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
 mail from:<userx@test.ex>
 ??? 250
diff --git a/test/scripts/2000-GnuTLS/2022 b/test/scripts/1100-Basic-TLS/1111
index b90361982..f36360d8f 100644
--- a/test/scripts/2000-GnuTLS/2022
+++ b/test/scripts/1100-Basic-TLS/1111
@@ -2,7 +2,7 @@
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
-client-gnutls HOSTIPV4 PORT_D
+client-anytls HOSTIPV4 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/2000-GnuTLS/2028 b/test/scripts/1100-Basic-TLS/1112
index e5bb97b72..396ee3fef 100644
--- a/test/scripts/2000-GnuTLS/2028
+++ b/test/scripts/1100-Basic-TLS/1112
@@ -4,7 +4,7 @@ need_ipv4
 gnutls
 exim -DSERVER=server -bd -oX PORT_D:PORT_D2:PORT_D3
 ****
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -18,7 +18,7 @@ starttls
 quit
 ??? 221
 ****
-client-gnutls -tls-on-connect 127.0.0.1 PORT_D2
+client-anytls -tls-on-connect 127.0.0.1 PORT_D2
 ??? 220
 ehlo rhu.barb
 ??? 250-
diff --git a/test/scripts/2000-GnuTLS/2030 b/test/scripts/1100-Basic-TLS/1113
index b009d476b..b009d476b 100644
--- a/test/scripts/2000-GnuTLS/2030
+++ b/test/scripts/1100-Basic-TLS/1113
diff --git a/test/scripts/2000-GnuTLS/2090 b/test/scripts/1100-Basic-TLS/1114
index 91227e8ca..47badfe42 100644
--- a/test/scripts/2000-GnuTLS/2090
+++ b/test/scripts/1100-Basic-TLS/1114
@@ -4,7 +4,7 @@ exim -DSERVER=server -DSRV=tls -bd -oX PORT_D
 ****
 #
 # non-piplined
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 EHLO rhu.barb
 ??? 250-
@@ -39,7 +39,7 @@ QUIT
 ****
 #
 # pipelined
-client-gnutls 127.0.0.1 PORT_D
+client-anytls 127.0.0.1 PORT_D
 ??? 220
 EHLO rhu.barb
 ??? 250-
diff --git a/test/scripts/2000-GnuTLS/2099 b/test/scripts/1100-Basic-TLS/1149
index 632dc094b..501a9c9da 100644
--- a/test/scripts/2000-GnuTLS/2099
+++ b/test/scripts/1100-Basic-TLS/1149
@@ -12,3 +12,4 @@ exim -be
 millisleep 500
 #
 killdaemon
+no_stderr_check
diff --git a/test/scripts/2100-OpenSSL/2103 b/test/scripts/2100-OpenSSL/2103
deleted file mode 100644
index 1018c4eb4..000000000
--- a/test/scripts/2100-OpenSSL/2103
+++ /dev/null
@@ -1,49 +0,0 @@
-# TLS server: unavailable cipher
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-ssl HOSTIPV4 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls
-??? 220
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 550
-quit
-??? 221
-****
-client-ssl 127.0.0.1 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls
-??? 220
-helo rhu.barb
-??? 250
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 250
-DATA
-??? 3
-This is a test encrypted message.
-.
-??? 250
-quit
-??? 221
-****
-killdaemon
-exim -qf
-****
diff --git a/test/scripts/2100-OpenSSL/2104 b/test/scripts/2100-OpenSSL/2104
deleted file mode 100644
index 55e54ddeb..000000000
--- a/test/scripts/2100-OpenSSL/2104
+++ /dev/null
@@ -1,43 +0,0 @@
-# TLS server: TLS required
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-ssl 127.0.0.1 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 550
-quit
-??? 221
-****
-client-ssl HOSTIPV4 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 250
-DATA
-??? 3
-This is a test unencrypted message.
-.
-??? 250
-quit
-??? 221
-****
-killdaemon
-exim -qf
-****
diff --git a/test/scripts/2100-OpenSSL/2105 b/test/scripts/2100-OpenSSL/2105
deleted file mode 100644
index 130fa48d9..000000000
--- a/test/scripts/2100-OpenSSL/2105
+++ /dev/null
@@ -1,28 +0,0 @@
-# TLS server: accept for relay if encrypted
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-ssl 127.0.0.1 PORT_D
-??? 220
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@remote.test.ex>
-??? 550
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls
-??? 220
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@remote.test.ex>
-??? 250
-quit
-??? 221
-****
-killdaemon
-exim -qf
-****
diff --git a/test/scripts/2100-OpenSSL/2106 b/test/scripts/2100-OpenSSL/2106
deleted file mode 100644
index 3e36603a9..000000000
--- a/test/scripts/2100-OpenSSL/2106
+++ /dev/null
@@ -1,17 +0,0 @@
-# TLS server: timeout in TLS session
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-ssl 127.0.0.1 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls
-??? 220
-+++ 3
-****
-killdaemon
diff --git a/test/scripts/2100-OpenSSL/2115 b/test/scripts/2100-OpenSSL/2115
deleted file mode 100644
index 9ecefdbac..000000000
--- a/test/scripts/2100-OpenSSL/2115
+++ /dev/null
@@ -1,18 +0,0 @@
-# TLS server: timeout after accepting STARTTLS
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-ssl 127.0.0.1 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls_wait
-??? 220
-+++ 2
-??? 421
-****
-killdaemon
diff --git a/test/scripts/2100-OpenSSL/2118 b/test/scripts/2100-OpenSSL/2118
deleted file mode 100644
index 281060ca8..000000000
--- a/test/scripts/2100-OpenSSL/2118
+++ /dev/null
@@ -1,44 +0,0 @@
-# TLS: ACL encryption test
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-ssl 127.0.0.1 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls
-??? 220
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 250
-DATA
-??? 3
-This is a test encrypted message.
-.
-??? 250
-quit
-??? 221
-****
-client-ssl 127.0.0.1 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 550
-quit
-??? 221
-****
-killdaemon
-no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2119 b/test/scripts/2100-OpenSSL/2119
deleted file mode 100644
index 1ad9befd7..000000000
--- a/test/scripts/2100-OpenSSL/2119
+++ /dev/null
@@ -1,40 +0,0 @@
-# TLS server: -tls-on-connect
-exim -DSERVER=server -tls-on-connect -bd -oX PORT_D
-****
-client-ssl -tls-on-connect 127.0.0.1 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 250
-DATA
-??? 3
-This is a test encrypted message.
-.
-??? 250
-quit
-??? 221
-****
-client-ssl -tls-on-connect HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
-??? 220
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 250
-DATA
-??? 3
-This is a test encrypted message from a verified host.
-.
-??? 250
-quit
-??? 221
-****
-killdaemon
-exim -qf
-****
diff --git a/test/scripts/2100-OpenSSL/2122 b/test/scripts/2100-OpenSSL/2122
deleted file mode 100644
index b93013962..000000000
--- a/test/scripts/2100-OpenSSL/2122
+++ /dev/null
@@ -1,21 +0,0 @@
-# TLS server: help command in encrypted session
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-ssl HOSTIPV4 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls
-??? 220
-help
-??? 214-
-??? 214
-quit
-??? 221
-****
-killdaemon
diff --git a/test/scripts/2100-OpenSSL/2123 b/test/scripts/2100-OpenSSL/2123
deleted file mode 100644
index 927c266c6..000000000
--- a/test/scripts/2100-OpenSSL/2123
+++ /dev/null
@@ -1,6 +0,0 @@
-# TLS: ACL for STARTTLS
-exim -bs -oMa 10.9.8.10
-ehlo a.b.c
-starttls
-quit
-****
diff --git a/test/scripts/2100-OpenSSL/2128 b/test/scripts/2100-OpenSSL/2128
deleted file mode 100644
index b9d781a28..000000000
--- a/test/scripts/2100-OpenSSL/2128
+++ /dev/null
@@ -1,32 +0,0 @@
-# tls_on_connect_ports 
-need_ipv4
-#
-exim -DSERVER=server -bd -oX PORT_D:PORT_D2:PORT_D3
-****
-client-ssl 127.0.0.1 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls
-??? 220
-quit
-??? 221
-****
-client-ssl -tls-on-connect 127.0.0.1 PORT_D2
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-quit
-??? 221
-****
-killdaemon
-no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2130 b/test/scripts/2100-OpenSSL/2130
deleted file mode 100644
index afaa949e0..000000000
--- a/test/scripts/2100-OpenSSL/2130
+++ /dev/null
@@ -1,11 +0,0 @@
-# TLS: client SNI
-#
-exim -DSERVER=server -bd -oX PORT_D
-****
-# Basic: is SNI set on tpt seen by server
-exim CALLER@test.ex
-Test message.
-****
-millisleep 500
-killdaemon
-sleep 2
diff --git a/test/scripts/2100-OpenSSL/2190 b/test/scripts/2100-OpenSSL/2190
deleted file mode 100644
index e004e5e02..000000000
--- a/test/scripts/2100-OpenSSL/2190
+++ /dev/null
@@ -1,71 +0,0 @@
-# TLS server, CHUNKING reception
-exim -DSERVER=server -DSRV=tls -bd -oX PORT_D
-****
-#
-# non-piplined
-client-ssl 127.0.0.1 PORT_D
-??? 220
-EHLO rhu.barb
-??? 250-
-??? 250-SIZE
-??? 250-8BITMIME
-??? 250-PIPELINING
-??? 250-CHUNKING
-??? 250-STARTTLS
-??? 250 HELP
-STARTTLS
-??? 220
-EHLO rhu.barb
-??? 250-
-??? 250-SIZE
-??? 250-8BITMIME
-??? 250-PIPELINING
-??? 250-CHUNKING
-??? 250 HELP
-MAIL FROM:<someone@some.domain>
-??? 250
-RCPT TO:<CALLER@test.ex>
-??? 250
-BDAT 88 LAST
-To: Susan@random.com
-From: Sam@random.com
-Subject: This is a bodyless test message
-
-??? 250-
-??? 250
-QUIT
-??? 221
-****
-#
-# pipelined
-client-ssl 127.0.0.1 PORT_D
-??? 220
-EHLO rhu.barb
-??? 250-
-??? 250-SIZE
-??? 250-8BITMIME
-??? 250-PIPELINING
-??? 250-CHUNKING
-??? 250-STARTTLS
-??? 250 HELP
-STARTTLS
-??? 220
-EHLO rhu.barb
-??? 250-
-??? 250-SIZE
-??? 250-8BITMIME
-??? 250-PIPELINING
-??? 250-CHUNKING
-??? 250 HELP
-MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
-??? 250
-??? 250
-??? 250-
-??? 250
-QUIT
-??? 221
-****
-#
-#
-killdaemon
-no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2199 b/test/scripts/2100-OpenSSL/2199
deleted file mode 100644
index 632dc094b..000000000
--- a/test/scripts/2100-OpenSSL/2199
+++ /dev/null
@@ -1,14 +0,0 @@
-# ${readsocket (IPv4 TLS)
-need_ipv4
-#
-exim -DSERVER=server -tls-on-connect -bd -oX PORT_D
-****
-#
-#
-millisleep 500
-exim -be
-1 >>${readsocket{inet:thisloop:PORT_D}{QUIT\n}{2s:tls=yes}}<<
-****
-millisleep 500
-#
-killdaemon