Merge branch 'hs/fix-proxy-bh' (Closes 2656)

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

diff --git a/test/scripts/2100-OpenSSL/2114 b/test/scripts/2100-OpenSSL/2114
index cc78ab0fb0598be3714a184513856d10a37c1d6e..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-


@@ -14,10 +14,12 @@ ehlo rhu.barb
 starttls
 ??? 220
 noop
 starttls
 ??? 220
 noop

+????554 Security failure
+noop

 ??? 554 Security failure
 quit
 ????554 Security failure
 ??? 554 Security failure
 quit
 ????554 Security failure

-??? 221
+????221

 ???*
 ****
 ### No certificate, certificate optional at TLS time, required by ACL
 ???*
 ****
 ### No certificate, certificate optional at TLS time, required by ACL


@@ -92,6 +94,8 @@ ehlo rhu.barb
 starttls
 ??? 220
 noop
 starttls
 ??? 220
 noop

+????554 Security failure
+noop

 ??? 554 Security failure
 ****
 ### Bad certificate, certificate optional at TLS time, reject at ACL time
 ??? 554 Security failure
 ****
 ### Bad certificate, certificate optional at TLS time, reject at ACL time


@@ -133,6 +137,8 @@ ehlo rhu.barb
 starttls
 ??? 220
 noop
 starttls
 ??? 220
 noop

+????554 Security failure
+noop

 ??? 554 Security failure
 ****
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 ??? 554 Security failure
 ****
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time