Testsuite: track newer GnuTLS behaviour

[exim.git] / test / stdout / 3454

diff --git a/test/stdout/3454 b/test/stdout/3454
index 7ccebbc847cfbdec46f27d3381a9dea47d4b483f..11d718c4490aa5a01e3dc1e058264f01c1cfb7ff 100644 (file)
--- a/test/stdout/3454
+++ b/test/stdout/3454
@@ -2,37 +2,25 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo foobar
-??? 250-
+??? 250-myhost
 <<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
+??? 250-SIZE
 <<< 250-SIZE 52428800
-??? 250-
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-
+??? 250-AUTH
 <<< 250-AUTH PLAIN
-??? 250-
+??? 250-STARTTLS
 <<< 250-STARTTLS
-??? 250
+??? 250 HELP
 <<< 250 HELP
 >>> starttls
-??? 220
+??? 220 TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using DHE-RSA-AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 503
@@ -42,48 +30,38 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo foobar
-??? 250-
+??? 250-myhost
 <<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
+??? 250-SIZE
 <<< 250-SIZE 52428800
-??? 250-
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-
+??? 250-AUTH
 <<< 250-AUTH PLAIN
-??? 250-
+??? 250-STARTTLS
 <<< 250-STARTTLS
-??? 250
+??? 250 HELP
 <<< 250 HELP
 >>> starttls
-??? 220
+??? 220 TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using DHE-RSA-AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> ehlo foobar
-??? 250-
+??? 250-myhost
 <<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
+??? 250-SIZE
 <<< 250-SIZE 52428800
-??? 250-
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-
+??? 250-AUTH
 <<< 250-AUTH PLAIN
-??? 250
+??? 250 HELP
 <<< 250 HELP
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 235