diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
| commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
| tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/scripts/5650-OCSP-GnuTLS | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/scripts/5650-OCSP-GnuTLS')
| -rw-r--r-- | test/scripts/5650-OCSP-GnuTLS/5650 | 8 | ||||
| -rw-r--r-- | test/scripts/5650-OCSP-GnuTLS/5651 | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/test/scripts/5650-OCSP-GnuTLS/5650 b/test/scripts/5650-OCSP-GnuTLS/5650 index 749d87048..f67111424 100644 --- a/test/scripts/5650-OCSP-GnuTLS/5650 +++ b/test/scripts/5650-OCSP-GnuTLS/5650 @@ -6,7 +6,7 @@ exim -z '1: Server sends good staple on request' **** # 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 **** client-gnutls \ -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \ @@ -36,7 +36,7 @@ exim -z '2: Server does not staple an outdated response' **** # 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 **** # XXX test sequence might not be quite right; this is for a server refusal # and we're expecting a client refusal. @@ -62,7 +62,7 @@ exim -z '3: Server does not staple a response for a revoked cert' **** # 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 **** client-gnutls \ -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \ @@ -88,7 +88,7 @@ exim -z '4: Connection functions when server is prepared to staple but client do **** # 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 **** # client-gnutls \ diff --git a/test/scripts/5650-OCSP-GnuTLS/5651 b/test/scripts/5650-OCSP-GnuTLS/5651 index 2015d43b9..dbf802298 100644 --- a/test/scripts/5650-OCSP-GnuTLS/5651 +++ b/test/scripts/5650-OCSP-GnuTLS/5651 @@ -2,7 +2,7 @@ # # # Client works when we request but don't require OCSP stapling and none comes -exim -bd -oX PORT_D -DSERVER=server -DOCSP="" +exim -bd -oX PORT_D -DSERVER=server -DOPT="" **** exim norequire@test.ex test message. @@ -15,7 +15,7 @@ killdaemon # # 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. @@ -35,7 +35,7 @@ killdaemon # # # Client fails on lack of required stapled info -exim -bd -oX PORT_D -DSERVER=server -DOCSP="" +exim -bd -oX PORT_D -DSERVER=server -DOPT="" **** exim CALLER@test.ex test message. @@ -47,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. @@ -60,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. |