Merge branch 'exim-4.96+security'

[exim.git] / test / stdout / 2014

diff --git a/test/stdout/2014 b/test/stdout/2014
index 829a86c427518b75d430ac724a18532d17fc8ad7..edd498aa84154bca7381e908e7e5faa5d51ebebe 100644 (file)
--- a/test/stdout/2014
+++ b/test/stdout/2014
@@ -19,7 +19,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-A TLS fatal alert has been received.
+gnutls_record_recv: A TLS fatal alert has been received.
 Failed to start TLS
 >>> nop
 ????554
@@ -83,6 +83,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -117,6 +120,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -150,7 +156,7 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-A TLS fatal alert has been received.
+gnutls_record_recv: A TLS fatal alert has been received.
 Failed to start TLS
 >>> nop
 ????554
@@ -179,6 +185,9 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -208,15 +217,15 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 <<< 250-STARTTLS
 ??? 250
 <<< 250 HELP
->>> starttls
+>>> STARTTLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-A TLS fatal alert has been received.
-Failed to start TLS
->>> mail from:<userx@test.ex>
-??? 554
+>>> NOP
+??? 554 Security failure
 <<< 554 Security failure
+>>> QUIT
+>>> 220
 End of script
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 Connecting to 127.0.0.1 port 1225 ... connected
@@ -242,6 +251,9 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -276,6 +288,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK