From 67fff935faa625a5ee69087e7d34bce34ee03d77 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 14 Mar 2020 20:50:55 +0000 Subject: [PATCH 1/1] Testsuite: make "client" util TLS variants more similar --- test/src/client.c | 2 +- test/stdout/2102 | 4 ---- test/stdout/2103 | 2 -- test/stdout/2105 | 1 - test/stdout/2106 | 1 - test/stdout/2114 | 6 ------ test/stdout/2114.openssl_1_1_1 | 9 --------- test/stdout/2118 | 1 - test/stdout/2119 | 2 -- test/stdout/2122 | 1 - test/stdout/2124.openssl_1_1_1 | 1 - test/stdout/2128 | 2 -- test/stdout/2132 | 3 --- test/stdout/2132.openssl_1_1_1 | 4 ---- test/stdout/2150 | 1 - test/stdout/2190 | 2 -- test/stdout/3460 | 1 - test/stdout/3463 | 2 -- test/stdout/3464 | 2 -- test/stdout/3721 | 1 - test/stdout/5600 | 4 ---- test/stdout/5610 | 4 ---- 22 files changed, 1 insertion(+), 55 deletions(-) diff --git a/test/src/client.c b/test/src/client.c index 63195347f..9190af068 100644 --- a/test/src/client.c +++ b/test/src/client.c @@ -297,7 +297,7 @@ if (rc <= 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; } diff --git a/test/stdout/2102 b/test/stdout/2102 index 759281a6b..d6a9ab414 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 @@ -57,7 +56,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 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 @@ -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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 @@ -164,7 +161,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL connection using ke-ECDSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 diff --git a/test/stdout/2103 b/test/stdout/2103 index deab30078..df5777d75 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 @@ -50,7 +49,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> helo rhu.barb ??? 250 diff --git a/test/stdout/2105 b/test/stdout/2105 index b0bcf1ec5..7a0430c10 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 diff --git a/test/stdout/2106 b/test/stdout/2106 index 1dfb6d228..ba53967e0 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS +++ 3 End of script diff --git a/test/stdout/2114 b/test/stdout/2114 index 401784f3a..e4b3b5a91 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 diff --git a/test/stdout/2114.openssl_1_1_1 b/test/stdout/2114.openssl_1_1_1 index ee0af955f..215baf965 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 diff --git a/test/stdout/2118 b/test/stdout/2118 index 28b399d1a..c7a0df4c4 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 diff --git a/test/stdout/2119 b/test/stdout/2119 index f7558f0fe..b885461ed 100644 --- 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 -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 @@ -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 -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 diff --git a/test/stdout/2122 b/test/stdout/2122 index f3f08eb7d..3f280e0d5 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 d40f58a31..2f4be205e 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> noop ????554 Security failure diff --git a/test/stdout/2128 b/test/stdout/2128 index c7c4eb870..1ccd96b88 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 -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 diff --git a/test/stdout/2132 b/test/stdout/2132 index 24ffec5ba..c9a281c78 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 @@ -59,7 +58,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 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 @@ -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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 diff --git a/test/stdout/2132.openssl_1_1_1 b/test/stdout/2132.openssl_1_1_1 index a3a8ec5ef..442144356 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 @@ -59,7 +58,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 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 @@ -99,7 +97,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL connection using ke-RSA-AES256-SHAnnn 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 diff --git a/test/stdout/2150 b/test/stdout/2150 index 8636d3b00..28be7c421 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 diff --git a/test/stdout/2190 b/test/stdout/2190 index 6b09a3713..f08abd10b 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> EHLO rhu.barb ??? 250- diff --git a/test/stdout/3460 b/test/stdout/3460 index 03e1add79..1eb09c9a9 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> ehlo foobar ??? 250- diff --git a/test/stdout/3463 b/test/stdout/3463 index c4b6727de..098973d42 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> auth plain AHVzZXJ4AHNlY3JldA== ??? 235 diff --git a/test/stdout/3464 b/test/stdout/3464 index b05af4847..2268389b0 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> ehlo foobar ??? 250- diff --git a/test/stdout/3721 b/test/stdout/3721 index 210bf43d3..049c87d36 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> EHLO tester ??? 250- diff --git a/test/stdout/5600 b/test/stdout/5600 index 8a5113a9c..51def7543 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 @@ -56,7 +55,6 @@ Key file = aux-fixed/cert2 <<< 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 @@ -82,7 +80,6 @@ Key file = aux-fixed/cert2 <<< 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 @@ -107,7 +104,6 @@ Key file = aux-fixed/cert2 ??? 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- diff --git a/test/stdout/5610 b/test/stdout/5610 index 8a5113a9c..51def7543 100644 --- 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 -SSL connection using ke-RSA-AES256-SHAnnn Succeeded in starting TLS >>> mail from: ??? 250 @@ -56,7 +55,6 @@ Key file = aux-fixed/cert2 <<< 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 @@ -82,7 +80,6 @@ Key file = aux-fixed/cert2 <<< 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 @@ -107,7 +104,6 @@ Key file = aux-fixed/cert2 ??? 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- -- 2.30.2