Fix mis-merge

[exim.git] / test / stdout / 3454

diff --git a/test/stdout/3454 b/test/stdout/3454
index ae2eab337cbcb479a844bb79457a9f14671272bc..11d718c4490aa5a01e3dc1e058264f01c1cfb7ff 100644 (file)
--- a/test/stdout/3454
+++ b/test/stdout/3454
@@ -20,21 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220 TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 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 AES256-SHA
+SSL connection using ke-RSA-AES256-SHA

 Succeeded in starting TLS
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 503
 Succeeded in starting TLS
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 503


@@ -62,21 +48,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220 TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 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 AES256-SHA
+SSL connection using ke-RSA-AES256-SHA

 Succeeded in starting TLS
 >>> ehlo foobar
 ??? 250-myhost
 Succeeded in starting TLS
 >>> ehlo foobar
 ??? 250-myhost