22 files changed, 170 insertions, 42 deletions
diff --git a/test/stdout/0275 b/test/stdout/0275
index fa02efa75..1642be115 100644
--- a/test/stdout/0275
+++ b/test/stdout/0275
@@ -1,2 +1,12 @@
 userx@test.ex
   router = r3, transport = t1
+
+**** SMTP testing session as if from host 127.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello test [127.0.0.1]
+250 OK
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/2002 b/test/stdout/2002
index 7fd17f029..7462793a3 100644
--- a/test/stdout/2002
+++ b/test/stdout/2002
@@ -137,6 +137,84 @@ Succeeded in starting TLS
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<CALLER@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> It should be sent under the RSA server cert and with an RSA cipher.
+>>> .
+??? 250
+<<< 250 OK id=10HmbA-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<CALLER@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> It should be sent under the EC server cert and with an ECDSA cipher.
+>>> .
+??? 250
+<<< 250 OK id=10HmbB-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
 
 **** SMTP testing session as if from host 10.0.0.1
 **** but without any ident (RFC 1413) callback.
diff --git a/test/stdout/2003 b/test/stdout/2003
index 3176f19e6..fbdbae47f 100644
--- a/test/stdout/2003
+++ b/test/stdout/2003
@@ -24,7 +24,7 @@ Succeeded in starting TLS
 <<< 250 OK
 >>> rcpt to:<userx@test.ex>
 ??? 550
-<<< 550 unacceptable cipher TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256
+<<< 550 unacceptable cipher TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection
diff --git a/test/stdout/2102 b/test/stdout/2102
index 2df808595..ea69fc186 100644
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
@@ -57,7 +57,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
@@ -125,7 +125,7 @@ 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 AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
@@ -144,6 +144,46 @@ Succeeded in starting TLS
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL connection using ke-ECDSA-AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<CALLER@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> It should be sent under the EC server cert and with an ECDSA cipher.
+>>> .
+??? 250
+<<< 250 OK id=10HmbA-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
 
 **** SMTP testing session as if from host 10.0.0.1
 **** but without any ident (RFC 1413) callback.
diff --git a/test/stdout/2103 b/test/stdout/2103
index f987fe59c..814a15736 100644
--- a/test/stdout/2103
+++ b/test/stdout/2103
@@ -18,14 +18,14 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<userx@test.ex>
 ??? 550
-<<< 550 unacceptable cipher TLSv1:AES256-SHA:256
+<<< 550 unacceptable cipher TLSv1:ke-RSA-AES256-SHA:xxx
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection
@@ -50,7 +50,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250
diff --git a/test/stdout/2105 b/test/stdout/2105
index 5395110c7..a5b65bb13 100644
--- a/test/stdout/2105
+++ b/test/stdout/2105
@@ -24,7 +24,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
diff --git a/test/stdout/2106 b/test/stdout/2106
index 3c6dc5d36..523f2320c 100644
--- a/test/stdout/2106
+++ b/test/stdout/2106
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 +++ 3
 End of script
diff --git a/test/stdout/2114 b/test/stdout/2114
index 7020b0c57..061134789 100644
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -41,7 +41,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250
@@ -78,7 +78,7 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
@@ -112,7 +112,7 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
@@ -171,7 +171,7 @@ Key file = aux-fixed/cert1
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
@@ -232,7 +232,7 @@ Key file = aux-fixed/cert1
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
diff --git a/test/stdout/2118 b/test/stdout/2118
index c026a063b..db04a0068 100644
--- a/test/stdout/2118
+++ b/test/stdout/2118
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
diff --git a/test/stdout/2119 b/test/stdout/2119
index 5fffd603a..fc977c562 100644
--- a/test/stdout/2119
+++ b/test/stdout/2119
@@ -1,6 +1,6 @@
 Connecting to 127.0.0.1 port 1225 ... connected
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -36,7 +36,7 @@ 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 AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 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 8fe3d56a2..e8e8cb0c2 100644
--- a/test/stdout/2122
+++ b/test/stdout/2122
@@ -18,7 +18,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> help
 ??? 214-
diff --git a/test/stdout/2128 b/test/stdout/2128
index b251b4cc4..c72135b57 100644
--- a/test/stdout/2128
+++ b/test/stdout/2128
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> quit
 ??? 221
@@ -26,7 +26,7 @@ Succeeded in starting TLS
 End of script
 Connecting to 127.0.0.1 port 1226 ... connected
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 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 64915c1fb..905dfb913 100644
--- a/test/stdout/2132
+++ b/test/stdout/2132
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
@@ -57,7 +57,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
@@ -125,7 +125,7 @@ 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 AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<CALLER@test.ex>
 ??? 250
diff --git a/test/stdout/2150 b/test/stdout/2150
index 75f7c5b54..661f6d90f 100644
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
diff --git a/test/stdout/2190 b/test/stdout/2190
index e09556e69..f3416369e 100644
--- a/test/stdout/2190
+++ b/test/stdout/2190
@@ -20,7 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
@@ -76,7 +76,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
diff --git a/test/stdout/3450 b/test/stdout/3450
index 5efba0069..d0576d0c5 100644
--- a/test/stdout/3450
+++ b/test/stdout/3450
@@ -48,7 +48,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> ehlo foobar
 ??? 250-
diff --git a/test/stdout/3454 b/test/stdout/3454
index eec5221b5..11d718c44 100644
--- a/test/stdout/3454
+++ b/test/stdout/3454
@@ -20,7 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220 TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 503
@@ -48,7 +48,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220 TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> ehlo foobar
 ??? 250-myhost
diff --git a/test/stdout/3460 b/test/stdout/3460
index 5efba0069..d0576d0c5 100644
--- a/test/stdout/3460
+++ b/test/stdout/3460
@@ -48,7 +48,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> ehlo foobar
 ??? 250-
diff --git a/test/stdout/3463 b/test/stdout/3463
index 60ba9d3a9..a7665f08c 100644
--- a/test/stdout/3463
+++ b/test/stdout/3463
@@ -20,7 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 503
@@ -54,7 +54,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 235
diff --git a/test/stdout/3464 b/test/stdout/3464
index 3668f5e8a..c070b669a 100644
--- a/test/stdout/3464
+++ b/test/stdout/3464
@@ -20,7 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 503
@@ -48,7 +48,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> ehlo foobar
 ??? 250-
diff --git a/test/stdout/5600 b/test/stdout/5600
index 9af94384a..6d8d21b32 100644
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -21,7 +21,7 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 Response verify OK
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
@@ -56,7 +56,7 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -82,7 +82,7 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -107,7 +107,7 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> ehlo rhu.barb.tls
 ??? 250-
diff --git a/test/stdout/5610 b/test/stdout/5610
index 9af94384a..6d8d21b32 100644
--- a/test/stdout/5610
+++ b/test/stdout/5610
@@ -21,7 +21,7 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 Response verify OK
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
@@ -56,7 +56,7 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -82,7 +82,7 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 no response received
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -107,7 +107,7 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> ehlo rhu.barb.tls
 ??? 250-