Testsuite: make "client" util TLS variants more similar

diff --git a/test/src/client.c b/test/src/client.c
index 63195347fcc6ba8ed56563ee203879a394bda8ed..9190af0689295a1bde2a926d9118828d2a44b2b3 100644 (file)
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -297,7 +297,7 @@ if (rc <= 0)
   return 0;
   }
 
   return 0;
   }
 

-printf("SSL connection using %s\n", SSL_get_cipher (*ssl));
+/* printf("SSL connection using %s\n", SSL_get_cipher (*ssl)); */

 return 1;
 }
 
 return 1;
 }
 

diff --git a/test/stdout/2102 b/test/stdout/2102
index 759281a6b363bfc4ab8ea76fe35135d024a3e204..d6a9ab414c7f16e98b9dbbb7314a7bb6392f71bf 100644 (file)
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -18,7 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250


@@ -57,7 +56,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250


@@ -125,7 +123,6 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250


@@ -164,7 +161,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-ECDSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250

diff --git a/test/stdout/2103 b/test/stdout/2103
index deab300789526d9181a56f854aca1f72fe150b72..df5777d7505def2b95c34a884225b03f7db5133a 100644 (file)
--- a/test/stdout/2103
+++ b/test/stdout/2103
@@ -18,7 +18,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -50,7 +49,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250
 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250

diff --git a/test/stdout/2105 b/test/stdout/2105
index b0bcf1ec55f4aa0aef57fd4e197baab23db59936..7a0430c109bbc3b270e25510d56d43a4da3115a2 100644 (file)
--- a/test/stdout/2105
+++ b/test/stdout/2105
@@ -24,7 +24,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250

diff --git a/test/stdout/2106 b/test/stdout/2106
index 1dfb6d228e5f54e6e59fc312abdc886af215e8fb..ba53967e0d2ab022cbc0a17afc7adae42a18f327 100644 (file)
--- a/test/stdout/2106
+++ b/test/stdout/2106
@@ -18,7 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 +++ 3
 End of script
 Succeeded in starting TLS
 +++ 3
 End of script

diff --git a/test/stdout/2114 b/test/stdout/2114
index 401784f3ace5b9e6a44229490995bf129c34e729..e4b3b5a9103e008906f080a65d1a577ac9e04bc4 100644 (file)
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -53,7 +53,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250
 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250


@@ -91,7 +90,6 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -126,7 +124,6 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -192,7 +189,6 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -258,7 +254,6 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -293,7 +288,6 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250

diff --git a/test/stdout/2114.openssl_1_1_1 b/test/stdout/2114.openssl_1_1_1
index ee0af955f7111681380286f6c2ad9c0057722c34..215baf965b701bf5b60e81c15641366f027d1f78 100644 (file)
--- a/test/stdout/2114.openssl_1_1_1
+++ b/test/stdout/2114.openssl_1_1_1
@@ -19,7 +19,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> noop
 ????554 Security failure
 Succeeded in starting TLS
 >>> noop
 ????554 Security failure


@@ -55,7 +54,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250
 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250


@@ -93,7 +91,6 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -128,7 +125,6 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -163,7 +159,6 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> noop
 ????554 Security failure
 Succeeded in starting TLS
 >>> noop
 ????554 Security failure


@@ -196,7 +191,6 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -231,7 +225,6 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> noop
 ????554 Security failure
 Succeeded in starting TLS
 >>> noop
 ????554 Security failure


@@ -264,7 +257,6 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -299,7 +291,6 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250

diff --git a/test/stdout/2118 b/test/stdout/2118
index 28b399d1a31edb13a1abfddf1488a90aa05c6615..c7a0df4c43fbb319dc71be636622cbc8117bcf4e 100644 (file)
--- a/test/stdout/2118
+++ b/test/stdout/2118
@@ -18,7 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250

diff --git a/test/stdout/2119 b/test/stdout/2119
index f7558f0fe4b7fba08b0a4b160dd889572c00dcd8..b885461ed87f17d2edd327ec68870cfe776a0f4d 100644 (file)
--- a/test/stdout/2119
+++ b/test/stdout/2119
@@ -1,6 +1,5 @@
 Connecting to 127.0.0.1 port 1225 ... connected
 Attempting to start TLS
 Connecting to 127.0.0.1 port 1225 ... connected
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000


@@ -36,7 +35,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 Attempting to start TLS
 Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/2122 b/test/stdout/2122
index f3f08eb7d12b76389af9afba2ee000e624151073..3f280e0d54295a2f6577294dab7a8495262d24db 100644 (file)
--- a/test/stdout/2122
+++ b/test/stdout/2122
@@ -18,7 +18,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> help
 ??? 214-
 Succeeded in starting TLS
 >>> help
 ??? 214-

diff --git a/test/stdout/2124.openssl_1_1_1 b/test/stdout/2124.openssl_1_1_1
index d40f58a31a95e8b0813f3a2e86f22c4f5e0a3f0d..2f4be205e7921c33937c2bd1f17bbd533014f323 100644 (file)
--- a/test/stdout/2124.openssl_1_1_1
+++ b/test/stdout/2124.openssl_1_1_1
@@ -20,7 +20,6 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> noop
 ????554 Security failure
 Succeeded in starting TLS
 >>> noop
 ????554 Security failure

diff --git a/test/stdout/2128 b/test/stdout/2128
index c7c4eb8709d6caca00eceadf4788ddc2362b4225..1ccd96b883ba56d8c044e29da3f5ad31723fbbd4 100644 (file)
--- a/test/stdout/2128
+++ b/test/stdout/2128
@@ -18,7 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> quit
 ??? 221
 Succeeded in starting TLS
 >>> quit
 ??? 221


@@ -26,7 +25,6 @@ Succeeded in starting TLS
 End of script
 Connecting to 127.0.0.1 port 1226 ... connected
 Attempting to start TLS
 End of script
 Connecting to 127.0.0.1 port 1226 ... connected
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/2132 b/test/stdout/2132
index 24ffec5bacebddad3bfa0d2efb984f0e74a87340..c9a281c78ef751de8b40d23b1d94d7d46481d82d 100644 (file)
--- a/test/stdout/2132
+++ b/test/stdout/2132
@@ -19,7 +19,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250


@@ -59,7 +58,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250


@@ -130,7 +128,6 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.e
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250

diff --git a/test/stdout/2132.openssl_1_1_1 b/test/stdout/2132.openssl_1_1_1
index a3a8ec5efee4b4dd18c64ec3f358c986265334bb..4421443564532992f6cc4dff1fdf8da93f3ba88c 100644 (file)
--- a/test/stdout/2132.openssl_1_1_1
+++ b/test/stdout/2132.openssl_1_1_1
@@ -19,7 +19,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250


@@ -59,7 +58,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250


@@ -99,7 +97,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> noop
 ????554
 Succeeded in starting TLS
 >>> noop
 ????554


@@ -132,7 +129,6 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.e
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250

diff --git a/test/stdout/2150 b/test/stdout/2150
index 8636d3b0096da739c12da87d2d0f805abc2765d8..28be7c4215ba77b75345a7106eabb0eb950e488e 100644 (file)
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -18,7 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250

diff --git a/test/stdout/2190 b/test/stdout/2190
index 6b09a37131b431ecfea952b96d34128be4cf6426..f08abd10b1b6db2ae664056f176f22cc7037cd34 100644 (file)
--- a/test/stdout/2190
+++ b/test/stdout/2190
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-


@@ -76,7 +75,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-

diff --git a/test/stdout/3460 b/test/stdout/3460
index 03e1add79cd509dd2e32499ac9e2575fb057aa08..1eb09c9a9814c65600a6b729a67fb87e5ef5b8b5 100644 (file)
--- a/test/stdout/3460
+++ b/test/stdout/3460
@@ -48,7 +48,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

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

diff --git a/test/stdout/3463 b/test/stdout/3463
index c4b6727de64ff09da93f26f618e90ae52b109d5b..098973d425fe172d791d755b20f4faa7d3b423a8 100644 (file)
--- a/test/stdout/3463
+++ b/test/stdout/3463
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

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


@@ -54,7 +53,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

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

diff --git a/test/stdout/3464 b/test/stdout/3464
index b05af484705fd2cf748a8f2181e8fa7dee3c5bfc..2268389b02d455ba479a40d3ef117846d21ae902 100644 (file)
--- a/test/stdout/3464
+++ b/test/stdout/3464
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

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


@@ -48,7 +47,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

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

diff --git a/test/stdout/3721 b/test/stdout/3721
index 210bf43d33a4468302d7cdef5a6bf1d7c136cef6..049c87d36d00dac6fe90c3176074594884d09d76 100644 (file)
--- a/test/stdout/3721
+++ b/test/stdout/3721
@@ -20,7 +20,6 @@ Key file = TESTSUITE/aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> EHLO tester
 ??? 250-
 Succeeded in starting TLS
 >>> EHLO tester
 ??? 250-

diff --git a/test/stdout/5600 b/test/stdout/5600
index 8a5113a9c516c48373f678c0dba650d9244b07c3..51def7543aee60c4a3891a5323c2c095f9393ada 100644 (file)
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -21,7 +21,6 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 Response verify OK
 <<< 220 TLS go ahead
 Attempting to start TLS
 Response verify OK

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -56,7 +55,6 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected


@@ -82,7 +80,6 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected


@@ -107,7 +104,6 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> ehlo rhu.barb.tls
 ??? 250-
 Succeeded in starting TLS
 >>> ehlo rhu.barb.tls
 ??? 250-

diff --git a/test/stdout/5610 b/test/stdout/5610
index 8a5113a9c516c48373f678c0dba650d9244b07c3..51def7543aee60c4a3891a5323c2c095f9393ada 100644 (file)
--- a/test/stdout/5610
+++ b/test/stdout/5610
@@ -21,7 +21,6 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 Response verify OK
 <<< 220 TLS go ahead
 Attempting to start TLS
 Response verify OK

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -56,7 +55,6 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected


@@ -82,7 +80,6 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected


@@ -107,7 +104,6 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> ehlo rhu.barb.tls
 ??? 250-
 Succeeded in starting TLS
 >>> ehlo rhu.barb.tls
 ??? 250-