Merge branch '4.next'

[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 72fa478e32d0ed3e5cd14760f4a95c36d845b7dd..d8ae8eabf4d9dbe80909674bd2dac2a4dfe1a108 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5600
+++ b/test/scripts/5600-OCSP-OpenSSL/5600
@@ -11,7 +11,7 @@ client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \
  HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
-ehlo rhu.barb
+ehlo rhu1.barb
 ??? 250-
 ??? 250-
 ??? 250-
@@ -20,6 +20,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
@@ -38,9 +40,9 @@ exim -bd -oX PORT_D -DSERVER=server \
 ****
 # XXX test sequence might not be quite right; this is for a server refusal
 # and we're expecting a client refusal.
-client-ssl -ocsp aux-fixed/exim-ca/expired1.example.com/CA.pem HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
+client-ssl -ocsp aux-fixed/exim-ca/example.com/CA/CA.pem HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
-ehlo rhu.barb
+ehlo rhu2.barb
 ??? 250-
 ??? 250-
 ??? 250-
@@ -65,7 +67,7 @@ client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \
  HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
-ehlo rhu.barb
+ehlo rhu3.barb
 ??? 250-
 ??? 250-
 ??? 250-
@@ -90,7 +92,7 @@ exim -bd -oX PORT_D -DSERVER=server \
 client-ssl \
  HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
-ehlo rhu.barb
+ehlo rhu4.barb
 ??? 250-
 ??? 250-
 ??? 250-
@@ -99,7 +101,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
-ehlo rhu.barb.tls
+ehlo rhu5.barb.tls
 ??? 250-
 ??? 250-
 ??? 250-