Testsuite: tidying GnuTLS with TLS1.3

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

diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014
index 1e12b4ef52650d9283993380d3aff854b2777a34..5bd5858db856c825941b9bd9f639d245ece9f35f 100644 (file)
--- a/test/scripts/2000-GnuTLS/2014
+++ b/test/scripts/2000-GnuTLS/2014
@@ -15,6 +15,8 @@ ehlo rhu1.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+nop
+????554

 ****
 ### No certificate, certificate optional at TLS time, required by ACL
 client-gnutls 127.0.0.1 PORT_D
 ****
 ### No certificate, certificate optional at TLS time, required by ACL
 client-gnutls 127.0.0.1 PORT_D


@@ -89,6 +91,8 @@ ehlo rhu5.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+nop
+????554

 ****
 ### Bad certificate, certificate optional at TLS time, reject at ACL time
 # (situation as above)
 ****
 ### Bad certificate, certificate optional at TLS time, reject at ACL time
 # (situation as above)


@@ -130,6 +134,8 @@ ehlo rhu7.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+mail from:<userx@test.ex>
+??? 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
 ****
 ### 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


@@ -153,7 +159,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
 ### 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-
 ??? 250-
 ??? 250-
 ??? 250-