X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0160bfb8f6435449f80ccd8a8d20a0d749c0624d..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/scripts/2100-OpenSSL/2132?ds=sidebyside

diff --git a/test/scripts/2100-OpenSSL/2132 b/test/scripts/2100-OpenSSL/2132
index 620a63f57..ec0ccc6f8 100644
--- a/test/scripts/2100-OpenSSL/2132
+++ b/test/scripts/2100-OpenSSL/2132
@@ -1,6 +1,8 @@
 # TLS server: server ca cert from directory
 exim -DSERVER=server -bd -oX PORT_D
 ****
+#
+### Should accept message
 client-ssl 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
@@ -9,9 +11,12 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -24,6 +29,7 @@ This is a test encrypted message.
 quit
 ??? 221
 ****
+### Should accept message (with a difficult env-from)
 client-ssl 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
@@ -32,9 +38,12 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -47,7 +56,8 @@ This is a test encrypted message.
 quit
 ??? 221
 ****
-client-ssl HOSTIPV4 PORT_D
+### client cert verify required; none given
+client-ssl -t2 HOSTIPV4 PORT_D
 ??? 220
 ehlo rhu.barb
 ??? 250-
@@ -55,10 +65,16 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 starttls
 ??? 220
+noop
+????554
+noop
+??? 554
 ****
+### client cert verify required; good one supplied
 client-ssl HOSTIPV4 PORT_D DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
 ??? 220
 ehlo rhu.barb
@@ -67,9 +83,12 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>