X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cbe4bbb27e59bf5e1d607d961b8d26ea09a9432c..4f780c09d2ab95bd9562ebe307a01043933adcd9:/test/scripts/2000-GnuTLS/2002

diff --git a/test/scripts/2000-GnuTLS/2002 b/test/scripts/2000-GnuTLS/2002
index 1cfc293d5..2cf6b3329 100644
--- a/test/scripts/2000-GnuTLS/2002
+++ b/test/scripts/2000-GnuTLS/2002
@@ -24,6 +24,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -47,6 +53,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -59,19 +67,29 @@ This is a test encrypted message.
 quit
 ??? 221
 ****
-# Server asks for a client cert (?but client does not supply one?)
+#
+# Server asks for a client cert but client does not supply one
 client-gnutls -p NONE:+SIGN-RSA-SHA256:+SIGN-ECDSA-SHA512:+VERS-TLS1.2:+ECDHE-RSA:+DHE-RSA:+RSA:+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509 HOSTIPV4 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
+??? 250-SIZE
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250-STARTTLS
+??? 250 HELP
 starttls
-??? 220
+??? 220 TLS go ahead
+nop
+???*
+****
+# ensure sequence of log TLS error line
+killdaemon
+sleep 1
+exim -DSERVER=server -bd -oX PORT_D
 ****
+#
+#
 # Server asks for a client cert, and one is given which is verifiable by the server
 client-gnutls -p NONE:+SIGN-RSA-SHA256:+SIGN-ECDSA-SHA512:+VERS-TLS1.2:+ECDHE-RSA:+DHE-RSA:+RSA:+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509 HOSTIPV4 PORT_D DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
 ??? 220
@@ -84,6 +102,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -114,6 +134,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -141,6 +163,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -155,8 +179,13 @@ quit
 ??? 221
 ****
 killdaemon
+sleep 1
+# clear out the queue
 exim -qf
 ****
+sleep 1
+#
+# STARTTLS used when not advertised
 exim -bh 10.0.0.1
 starttls
 quit