Gitweb:
https://git.exim.org/exim.git/commitdiff/67fff935faa625a5ee69087e7d34bce34ee03d77
Commit: 67fff935faa625a5ee69087e7d34bce34ee03d77
Parent: 48a74eea95b1bd7e69151d4f4122868a777a18a6
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Mar 14 20:50:55 2020 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sat Mar 14 20:50:55 2020 +0000
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 6319534..9190af0 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 759281a..d6a9ab4 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:<CALLER@???>
??? 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"@???>
??? 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:<CALLER@???>
??? 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:<CALLER@???>
??? 250
diff --git a/test/stdout/2103 b/test/stdout/2103
index deab300..df5777d 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:<userx@???>
??? 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 b0bcf1e..7a0430c 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:<userx@???>
??? 250
diff --git a/test/stdout/2106 b/test/stdout/2106
index 1dfb6d2..ba53967 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 401784f..e4b3b5a 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:<userx@???>
??? 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:<userx@???>
??? 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:<userx@???>
??? 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:<userx@???>
??? 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:<userx@???>
??? 250
diff --git a/test/stdout/2114.openssl_1_1_1 b/test/stdout/2114.openssl_1_1_1
index ee0af95..215baf9 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:<userx@???>
??? 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:<userx@???>
??? 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:<userx@???>
??? 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:<userx@???>
??? 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:<userx@???>
??? 250
diff --git a/test/stdout/2118 b/test/stdout/2118
index 28b399d..c7a0df4 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:<userx@???>
??? 250
diff --git a/test/stdout/2119 b/test/stdout/2119
index f7558f0..b885461 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 f3f08eb..3f280e0 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 d40f58a..2f4be20 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 c7c4eb8..1ccd96b 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 24ffec5..c9a281c 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:<CALLER@???>
??? 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"@???>
??? 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:<CALLER@???>
??? 250
diff --git a/test/stdout/2132.openssl_1_1_1 b/test/stdout/2132.openssl_1_1_1
index a3a8ec5..4421443 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:<CALLER@???>
??? 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"@???>
??? 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:<CALLER@???>
??? 250
diff --git a/test/stdout/2150 b/test/stdout/2150
index 8636d3b..28be7c4 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:<userx@???>
??? 250
diff --git a/test/stdout/2190 b/test/stdout/2190
index 6b09a37..f08abd1 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 03e1add..1eb09c9 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 c4b6727..098973d 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 b05af48..2268389 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 210bf43..049c87d 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 8a5113a..51def75 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:<userx@???>
??? 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 8a5113a..51def75 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:<userx@???>
??? 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-
