Testsuite: TLS server testcase consolidation

13 files changed, 0 insertions, 417 deletions

diff --git a/test/scripts/2000-GnuTLS/2003 b/test/scripts/2000-GnuTLS/2003
deleted file mode 100644
index d4bcedd67..000000000
--- a/test/scripts/2000-GnuTLS/2003
+++ /dev/null
@@ -1,50 +0,0 @@
-# TLS server: unavailable cipher
-gnutls
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-gnutls 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-gnutls 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/2000-GnuTLS/2004 b/test/scripts/2000-GnuTLS/2004
deleted file mode 100644
index a310bb6ec..000000000
--- a/test/scripts/2000-GnuTLS/2004
+++ /dev/null
@@ -1,44 +0,0 @@
-# TLS server: TLS required
-gnutls
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-gnutls 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-gnutls 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/2000-GnuTLS/2005 b/test/scripts/2000-GnuTLS/2005
deleted file mode 100644
index a2164b327..000000000
--- a/test/scripts/2000-GnuTLS/2005
+++ /dev/null
@@ -1,29 +0,0 @@
-# TLS server: accept for relay if encrypted
-gnutls
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-gnutls 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/2000-GnuTLS/2006 b/test/scripts/2000-GnuTLS/2006
deleted file mode 100644
index 1da0f7ddc..000000000
--- a/test/scripts/2000-GnuTLS/2006
+++ /dev/null
@@ -1,18 +0,0 @@
-# TLS server: timeout in TLS session
-gnutls
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-gnutls 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/2000-GnuTLS/2015 b/test/scripts/2000-GnuTLS/2015
deleted file mode 100644
index 07fda35b3..000000000
--- a/test/scripts/2000-GnuTLS/2015
+++ /dev/null
@@ -1,32 +0,0 @@
-# TLS server: timeout or close after accepting STARTTLS
-gnutls
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-gnutls 127.0.0.1 PORT_D
-??? 220
-ehlo timeout.rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls_wait
-??? 220
-+++ 2
-??? 421
-****
-client-gnutls 127.0.0.1 PORT_D
-??? 220
-ehlo close.rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls_wait
-??? 220
-****
-millisleep 500
-killdaemon
diff --git a/test/scripts/2000-GnuTLS/2018 b/test/scripts/2000-GnuTLS/2018
deleted file mode 100644
index 3f06e59e8..000000000
--- a/test/scripts/2000-GnuTLS/2018
+++ /dev/null
@@ -1,45 +0,0 @@
-# TLS ACL encryption test
-gnutls
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-gnutls 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-gnutls 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/2000-GnuTLS/2019 b/test/scripts/2000-GnuTLS/2019
deleted file mode 100644
index d59f42ea2..000000000
--- a/test/scripts/2000-GnuTLS/2019
+++ /dev/null
@@ -1,41 +0,0 @@
-# TLS server: -tls-on-connect
-gnutls
-exim -DSERVER=server -tls-on-connect -bd -oX PORT_D
-****
-client-gnutls -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-gnutls -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/2000-GnuTLS/2022 b/test/scripts/2000-GnuTLS/2022
deleted file mode 100644
index b90361982..000000000
--- a/test/scripts/2000-GnuTLS/2022
+++ /dev/null
@@ -1,22 +0,0 @@
-# TLS server: help command in encrypted session
-gnutls
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-gnutls 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/2000-GnuTLS/2023 b/test/scripts/2000-GnuTLS/2023
deleted file mode 100644
index 395fcdcde..000000000
--- a/test/scripts/2000-GnuTLS/2023
+++ /dev/null
@@ -1,7 +0,0 @@
-# TLS: ACL for STARTTLS
-gnutls
-exim -bs -oMa 10.9.8.10
-ehlo a.b.c
-starttls
-quit
-****
diff --git a/test/scripts/2000-GnuTLS/2028 b/test/scripts/2000-GnuTLS/2028
deleted file mode 100644
index e5bb97b72..000000000
--- a/test/scripts/2000-GnuTLS/2028
+++ /dev/null
@@ -1,33 +0,0 @@
-# tls_on_connect_ports 
-need_ipv4
-#
-gnutls
-exim -DSERVER=server -bd -oX PORT_D:PORT_D2:PORT_D3
-****
-client-gnutls 127.0.0.1 PORT_D
-??? 220
-ehlo rhu.barb
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-starttls
-??? 220
-quit
-??? 221
-****
-client-gnutls -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/2000-GnuTLS/2030 b/test/scripts/2000-GnuTLS/2030
deleted file mode 100644
index b009d476b..000000000
--- a/test/scripts/2000-GnuTLS/2030
+++ /dev/null
@@ -1,10 +0,0 @@
-# TLS: SNI
-gnutls
-exim -DSERVER=server -bd -oX PORT_D
-****
-# Basic: is SNI set on tpt seen by server
-exim CALLER@test.ex
-Test message.
-****
-sleep 1
-killdaemon
diff --git a/test/scripts/2000-GnuTLS/2090 b/test/scripts/2000-GnuTLS/2090
deleted file mode 100644
index 91227e8ca..000000000
--- a/test/scripts/2000-GnuTLS/2090
+++ /dev/null
@@ -1,72 +0,0 @@
-# TLS server, CHUNKING reception
-gnutls
-exim -DSERVER=server -DSRV=tls -bd -oX PORT_D
-****
-#
-# non-piplined
-client-gnutls 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-gnutls 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/2000-GnuTLS/2099 b/test/scripts/2000-GnuTLS/2099
deleted file mode 100644
index 632dc094b..000000000
--- a/test/scripts/2000-GnuTLS/2099
+++ /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