X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/2b4a568dfa3d79a9a968984cf5b23829c084a951..f39bb672424423847bce771bc31f5c13f2eb4185:/test/scripts/5650-OCSP-GnuTLS/5651?ds=sidebyside diff --git a/test/scripts/5650-OCSP-GnuTLS/5651 b/test/scripts/5650-OCSP-GnuTLS/5651 index f5432be19..dbf802298 100644 --- a/test/scripts/5650-OCSP-GnuTLS/5651 +++ b/test/scripts/5650-OCSP-GnuTLS/5651 @@ -1,10 +1,10 @@ # OCSP stapling, client # # -# Client works when we don't demand OCSP stapling -exim -bd -oX PORT_D -DSERVER=server -DOCSP="" +# Client works when we request but don't require OCSP stapling and none comes +exim -bd -oX PORT_D -DSERVER=server -DOPT="" **** -exim nostaple@test.ex +exim norequire@test.ex test message. **** sleep 1 @@ -13,10 +13,19 @@ killdaemon # # # -# Client accepts good stapled info +# Client works when we don't request OCSP stapling exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp + -DOPT=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp +**** +exim nostaple@test.ex +test message. **** +millisleep 500 +# +# +# +# +# Client accepts good stapled info exim CALLER@test.ex test message. **** @@ -25,8 +34,8 @@ killdaemon # # # -# Client fails on lack of requested stapled info -exim -bd -oX PORT_D -DSERVER=server -DOCSP="" +# Client fails on lack of required stapled info +exim -bd -oX PORT_D -DSERVER=server -DOPT="" **** exim CALLER@test.ex test message. @@ -38,8 +47,9 @@ no_msglog_check # # # Client fails on revoked stapled info +sudo rm DIR/spool/db/retry EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp + -DOPT=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp **** exim CALLER@test.ex test message. @@ -51,8 +61,9 @@ killdaemon # # # Client fails on expired stapled info +sudo rm DIR/spool/db/retry EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp + -DOPT=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp **** exim CALLER@test.ex test message.