DMARC: expand main-config options. Bug 3102

[exim.git] / test / scripts / 5650-OCSP-GnuTLS / 5650

diff --git a/test/scripts/5650-OCSP-GnuTLS/5650 b/test/scripts/5650-OCSP-GnuTLS/5650
index 99aaa0b7a47c582d8135d0bbcec8156dea405e9c..e2259c7edec7d3693d6893544fe1756c9f5c6fe1 100644 (file)
--- a/test/scripts/5650-OCSP-GnuTLS/5650
+++ b/test/scripts/5650-OCSP-GnuTLS/5650
@@ -18,9 +18,12 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

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

+helo test
+??? 250

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


@@ -34,6 +37,7 @@ killdaemon
 #
 exim -z '2: Server does not staple an outdated response'
 ****
 #
 exim -z '2: Server does not staple an outdated response'
 ****

+# This test fails on older GnuTLS versions, which do not check the resp on the server

 #
 exim -bd -oX PORT_D -DSERVER=server \
  -DOPTION=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
 #
 exim -bd -oX PORT_D -DSERVER=server \
  -DOPTION=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp


@@ -46,6 +50,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 starttls
 ??? 454
 ??? 250
 starttls
 ??? 454


@@ -58,6 +63,7 @@ killdaemon
 #
 exim -z '3: Server does not staple a response for a revoked cert'
 ****
 #
 exim -z '3: Server does not staple a response for a revoked cert'
 ****

+# This test fails on older GnuTLS versions, which do not check the resp on the server

 #
 exim -bd -oX PORT_D -DSERVER=server \
  -DOPTION=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
 #
 exim -bd -oX PORT_D -DSERVER=server \
  -DOPTION=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp


@@ -72,6 +78,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 starttls
 ??? 454
 ??? 250
 starttls
 ??? 454


@@ -98,6 +105,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

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


@@ -106,6 +114,7 @@ ehlo rhu.barb.tls
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 quit
 ****
 ??? 250
 quit
 ****