OpenSSL: Fix aggregation of messages.

[exim.git] / test / scripts / 5600-OCSP-OpenSSL / 5600

diff --git a/test/scripts/5600-OCSP-OpenSSL/5600 b/test/scripts/5600-OCSP-OpenSSL/5600
index c7a700fde2e317ab734bf2b6994280724baddbe4..72fa478e32d0ed3e5cd14760f4a95c36d845b7dd 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5600
+++ b/test/scripts/5600-OCSP-OpenSSL/5600
@@ -2,9 +2,10 @@
 #
 #
 #
 #
 #
 #

-# 1: Server sends good staple on request
+# '1: Server sends good staple on request'
+#

 exim -bd -oX PORT_D -DSERVER=server \
 exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
+ -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp

 ****
 client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \
 ****
 client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \


@@ -30,9 +31,10 @@ killdaemon
 #
 #
 #
 #
 #
 #

-# 2: Server does not staple an outdated response
+# '2: Server does not staple an outdated response'
+#

 exim -bd -oX PORT_D -DSERVER=server \
 exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
+ -DRETURN=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.
 ****
 # XXX test sequence might not be quite right; this is for a server refusal
 # and we're expecting a client refusal.


@@ -54,9 +56,10 @@ killdaemon
 #
 #
 #
 #
 #
 #

-# 3: Server does not staple a response for a revoked cert
+# '3: Server does not staple a response for a revoked cert'
+#

 exim -bd -oX PORT_D -DSERVER=server \
 exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
+ -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp

 ****
 client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \
 ****
 client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \


@@ -78,3 +81,35 @@ killdaemon
 #
 #
 #
 #
 #
 #

+# '4: Connection functions when server is prepared to staple but client does not request it'
+#
+exim -bd -oX PORT_D -DSERVER=server \
+ -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
+****
+#
+client-ssl \
+ HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
+??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+ehlo rhu.barb.tls
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+quit
+****
+killdaemon
+#
+#
+#
+#
+#