Fix error messages in dbfn_open

[users/heiko/exim.git] / test / scripts / 2100-OpenSSL / 2114

diff --git a/test/scripts/2100-OpenSSL/2114 b/test/scripts/2100-OpenSSL/2114
index 49598e366dbec4656c1cd24c3a9ed36cf88ca3ce..edf3b6c11af9eee5c7bacf82fc36407c111d7ea9 100644 (file)
--- a/test/scripts/2100-OpenSSL/2114
+++ b/test/scripts/2100-OpenSSL/2114
@@ -2,7 +2,7 @@
 exim -DSERVER=server -bd -oX PORT_D
 ****
 ### No certificate, certificate required
 exim -DSERVER=server -bd -oX PORT_D
 ****
 ### No certificate, certificate required

-client-ssl HOSTIPV4 PORT_D
+client-ssl -t2 HOSTIPV4 PORT_D

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


@@ -13,6 +13,14 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+noop
+????554 Security failure
+noop
+??? 554 Security failure
+quit
+????554 Security failure
+????221
+???*

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


@@ -85,6 +93,10 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+noop
+????554 Security failure
+noop
+??? 554 Security failure

 ****
 ### Bad certificate, certificate optional at TLS time, reject at ACL time
 client-ssl 127.0.0.1 PORT_D aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
 ****
 ### Bad certificate, certificate optional at TLS time, reject at ACL time
 client-ssl 127.0.0.1 PORT_D aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key


@@ -124,6 +136,10 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+noop
+????554 Security failure
+noop
+??? 554 Security failure

 ****
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 client-ssl 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-ssl 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