Gitweb:
http://git.exim.org/exim.git/commitdiff/1508acb8629a6ac1517ab524a9f29257a2335d5e
Commit: 1508acb8629a6ac1517ab524a9f29257a2335d5e
Parent: cb66e5ee237d34f906e5b7a8907f6b0e6ad69a58
Author: Phil Pennock <pdp@???>
AuthorDate: Sun May 27 10:57:32 2012 -0400
Committer: Phil Pennock <pdp@???>
CommitDate: Sun May 27 10:57:32 2012 -0400
Test: update for new tls_dhparam
---
test/confs/2000 | 2 ++
test/confs/2102 | 1 +
test/confs/2119 | 1 +
test/log/2149 | 4 ++--
test/mail/2149.userx | 4 ++--
test/runtest | 2 ++
test/stdout/2102 | 3 +++
test/stdout/2103 | 2 ++
test/stdout/2105 | 1 +
test/stdout/2106 | 1 +
test/stdout/2114 | 8 ++++++++
test/stdout/2118 | 1 +
test/stdout/2119 | 2 ++
test/stdout/2122 | 1 +
test/stdout/2124 | 1 +
test/stdout/2128 | 2 ++
test/stdout/2150 | 1 +
test/stdout/3460 | 1 +
test/stdout/3463 | 2 ++
test/stdout/3464 | 2 ++
20 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/test/confs/2000 b/test/confs/2000
index b199912..06e5a15 100644
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -21,6 +21,8 @@ queue_only
queue_run_in_order
tls_advertise_hosts = *
+# needed to force generation
+tls_dhparam = historic
# Set certificate only if server
diff --git a/test/confs/2102 b/test/confs/2102
index 8318072..f43e5c2 100644
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -38,6 +38,7 @@ check_recipient:
AES256-GCM-SHA384 : \
IDEA-CBC-MD5 : \
DES-CBC3-SHA : \
+ DHE-RSA-AES256-GCM-SHA384 : \
DHE_RSA_AES_256_CBC_SHA1 : \
DHE_RSA_3DES_EDE_CBC_SHA
accept
diff --git a/test/confs/2119 b/test/confs/2119
index c5182a1..8cc6874 100644
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -38,6 +38,7 @@ check_recipient:
AES256-GCM-SHA384:\
IDEA-CBC-MD5:\
DES-CBC3-SHA:\
+ DHE-RSA-AES256-GCM-SHA384:\
DHE_RSA_AES_256_CBC_SHA1:\
DHE_RSA_3DES_EDE_CBC_SHA
accept
diff --git a/test/log/2149 b/test/log/2149
index 4f76c89..d0c7ac0 100644
--- a/test/log/2149
+++ b/test/log/2149
@@ -1,12 +1,12 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:DHE-RSA-AES256-SHA:256
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:DHE-RSA-AES256-SHA:256 S=sss id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 S=sss id=E10HmaX-0005vi-00@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@???> R=server T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/mail/2149.userx b/test/mail/2149.userx
index 71d9fd6..c74b8de 100644
--- a/test/mail/2149.userx
+++ b/test/mail/2149.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:DHE-RSA-AES256-SHA:256)
+ by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@???>
From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:DHE-RSA-AES256-SHA:256 peerdn=
+TLS: cipher=TLSv1:AES256-SHA:256 peerdn=
Test message
diff --git a/test/runtest b/test/runtest
index 0031cab..aa242d5 100755
--- a/test/runtest
+++ b/test/runtest
@@ -488,6 +488,7 @@ RESET_AFTER_EXTRA_LINE_READ:
# So far, have seen:
# TLSv1:AES256-SHA:256
# TLSv1.2:AES256-GCM-SHA384:256
+ # TLSv1.2:DHE-RSA-AES256-SHA:256
# TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128
# We also need to handle the ciphersuite without the TLS part present, for
# client-ssl's output. We also see some older forced ciphersuites, but
@@ -497,6 +498,7 @@ RESET_AFTER_EXTRA_LINE_READ:
s/( (?: (?:\b|\s) [\(=] ) | \s )TLSv1\.2:/$1TLSv1:/xg;
s/\bAES256-GCM-SHA384\b/AES256-SHA/g;
+ s/\bDHE-RSA-AES256-SHA\b/AES256-SHA/g;
# GnuTLS have seen:
# TLS1.2:RSA_AES_256_CBC_SHA1:256 (canonical)
diff --git a/test/stdout/2102 b/test/stdout/2102
index a163b90..d3c18a8 100644
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -23,6 +23,7 @@ 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
@@ -76,6 +77,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
@@ -115,6 +117,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
diff --git a/test/stdout/2103 b/test/stdout/2103
index 395e185..1c2f418 100644
--- a/test/stdout/2103
+++ b/test/stdout/2103
@@ -23,6 +23,7 @@ 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
@@ -69,6 +70,7 @@ 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
diff --git a/test/stdout/2105 b/test/stdout/2105
index 17016aa..a9eb350 100644
--- a/test/stdout/2105
+++ b/test/stdout/2105
@@ -29,6 +29,7 @@ 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
diff --git a/test/stdout/2106 b/test/stdout/2106
index 3f47c62..cae6e21 100644
--- a/test/stdout/2106
+++ b/test/stdout/2106
@@ -23,6 +23,7 @@ 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
diff --git a/test/stdout/2114 b/test/stdout/2114
index f7b8399..35a6969 100644
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -23,6 +23,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
@@ -60,6 +61,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
@@ -113,6 +115,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
@@ -164,6 +167,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
@@ -215,6 +219,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
@@ -255,6 +260,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
@@ -308,6 +314,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
@@ -348,6 +355,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
diff --git a/test/stdout/2118 b/test/stdout/2118
index bb30e91..1709dee 100644
--- a/test/stdout/2118
+++ b/test/stdout/2118
@@ -23,6 +23,7 @@ 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
diff --git a/test/stdout/2119 b/test/stdout/2119
index a4b4fc6..0bcff27 100644
--- a/test/stdout/2119
+++ b/test/stdout/2119
@@ -5,6 +5,7 @@ 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
@@ -55,6 +56,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
diff --git a/test/stdout/2122 b/test/stdout/2122
index b7848cb..4bb9270 100644
--- a/test/stdout/2122
+++ b/test/stdout/2122
@@ -23,6 +23,7 @@ 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
diff --git a/test/stdout/2124 b/test/stdout/2124
index f2a10b9..d2d83d5 100644
--- a/test/stdout/2124
+++ b/test/stdout/2124
@@ -25,6 +25,7 @@ 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 certificate request A
SSL info: SSLv3 read server done A
SSL info: SSLv3 write client certificate A
diff --git a/test/stdout/2128 b/test/stdout/2128
index b81d4a4..795f469 100644
--- a/test/stdout/2128
+++ b/test/stdout/2128
@@ -23,6 +23,7 @@ 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
@@ -45,6 +46,7 @@ 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
diff --git a/test/stdout/2150 b/test/stdout/2150
index d438eae..2f55964 100644
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -23,6 +23,7 @@ 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
diff --git a/test/stdout/3460 b/test/stdout/3460
index 895a5c1..92c4797 100644
--- a/test/stdout/3460
+++ b/test/stdout/3460
@@ -53,6 +53,7 @@ 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
diff --git a/test/stdout/3463 b/test/stdout/3463
index 29696a2..68b1b55 100644
--- a/test/stdout/3463
+++ b/test/stdout/3463
@@ -25,6 +25,7 @@ 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
@@ -73,6 +74,7 @@ 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
diff --git a/test/stdout/3464 b/test/stdout/3464
index 5a31618..46f1c37 100644
--- a/test/stdout/3464
+++ b/test/stdout/3464
@@ -25,6 +25,7 @@ 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
@@ -67,6 +68,7 @@ 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
