Merge branch 'exim-4.96+security' into master+security

[exim.git] / test / stdout / 5600

diff --git a/test/stdout/5600 b/test/stdout/5600
index 51def7543aee60c4a3891a5323c2c095f9393ada..5493ef79a82a405bed2c319bf5ca6dd4c25fb964 100644 (file)
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -3,9 +3,9 @@ Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

->>> ehlo rhu.barb
+>>> ehlo rhu1.barb

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu1.barb [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-


@@ -20,8 +20,11 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-Response verify OK
-Succeeded in starting TLS
+OCSP status response: good signature
+Succeeded in starting TLS (with OCSP)
+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]

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


@@ -37,9 +40,9 @@ Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

->>> ehlo rhu.barb
+>>> ehlo rhu2.barb

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu2.barb [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-


@@ -54,17 +57,17 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-no response received
-Succeeded in starting TLS
+no OCSP response received
+Succeeded in starting TLS (with OCSP)

 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

->>> ehlo rhu.barb
+>>> ehlo rhu3.barb

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu3.barb [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-


@@ -79,17 +82,17 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-no response received
-Succeeded in starting TLS
+no OCSP response received
+Succeeded in starting TLS (with OCSP)

 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

->>> ehlo rhu.barb
+>>> ehlo rhu4.barb

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu4.barb [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-


@@ -105,9 +108,9 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

->>> ehlo rhu.barb.tls
+>>> ehlo rhu5.barb.tls

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb.tls [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu5.barb.tls [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-