tidying

[exim.git] / test / scripts / 2100-OpenSSL / 2132

diff --git a/test/scripts/2100-OpenSSL/2132 b/test/scripts/2100-OpenSSL/2132
index 620a63f57b50e1af55c7f3587c97016730fa5d66..ec0ccc6f81fc87f79eca8565f6fc0c92e72858fa 100644 (file)
--- 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
 ****
 # 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
 client-ssl 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb


@@ -9,9 +11,12 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -24,6 +29,7 @@ This is a test encrypted message.
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

+### Should accept message (with a difficult env-from)

 client-ssl 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb
 client-ssl 127.0.0.1 PORT_D
 ??? 220
 ehlo rhu.barb


@@ -32,9 +38,12 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 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
 ****
 quit
 ??? 221
 ****

-client-ssl HOSTIPV4 PORT_D
+### client cert verify required; none given
+client-ssl -t2 HOSTIPV4 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-


@@ -55,10 +65,16 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 starttls
 ??? 220
 ??? 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
 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-
 ??? 250-

+??? 250-

 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>