Merge branch '4.next'

[exim.git] / test / scripts / 2000-GnuTLS / 2014

diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014
index 1e12b4ef52650d9283993380d3aff854b2777a34..16bcbe4a98e5c05e1e965bda4b69a13e27dbdd3c 100644 (file)
--- a/test/scripts/2000-GnuTLS/2014
+++ b/test/scripts/2000-GnuTLS/2014
@@ -15,6 +15,8 @@ ehlo rhu1.barb
 ??? 250
 starttls
 ??? 220
+nop
+????554
 ****
 ### No certificate, certificate optional at TLS time, required by ACL
 client-gnutls 127.0.0.1 PORT_D
@@ -49,6 +51,8 @@ ehlo rhu3.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
@@ -68,6 +72,8 @@ ehlo rhu4.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
@@ -89,6 +95,8 @@ ehlo rhu5.barb
 ??? 250
 starttls
 ??? 220
+nop
+????554
 ****
 ### Bad certificate, certificate optional at TLS time, reject at ACL time
 # (situation as above)
@@ -103,6 +111,8 @@ ehlo rhu6.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
@@ -130,6 +140,8 @@ ehlo rhu7.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 554
 ****
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 client-gnutls 127.0.0.1 PORT_D aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
@@ -143,6 +155,8 @@ ehlo rhu8.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
@@ -153,7 +167,7 @@ quit
 ### Good certificate, certificate required - but nonmatching CRL also present
 client-gnutls HOSTIPV4 PORT_D aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
 ??? 220
-ehlo rhu.barb
+ehlo rhu9.barb
 ??? 250-
 ??? 250-
 ??? 250-
@@ -162,6 +176,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>