summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2012-05-27 10:57:32 -0400
committerPhil Pennock <pdp@exim.org>2012-05-27 10:57:32 -0400
commit1508acb8629a6ac1517ab524a9f29257a2335d5e (patch)
tree1dbb90a80aca10e43e947ea0bf3c54c6879bf5f5
parentcb66e5ee237d34f906e5b7a8907f6b0e6ad69a58 (diff)
downloadexim4-1508acb8629a6ac1517ab524a9f29257a2335d5e.tar.gz
Test: update for new tls_dhparam
Diffstat
-rw-r--r--test/confs/20002
-rw-r--r--test/confs/21021
-rw-r--r--test/confs/21191
-rw-r--r--test/log/21494
-rw-r--r--test/mail/2149.userx4
-rwxr-xr-xtest/runtest2
-rw-r--r--test/stdout/21023
-rw-r--r--test/stdout/21032
-rw-r--r--test/stdout/21051
-rw-r--r--test/stdout/21061
-rw-r--r--test/stdout/21148
-rw-r--r--test/stdout/21181
-rw-r--r--test/stdout/21192
-rw-r--r--test/stdout/21221
-rw-r--r--test/stdout/21241
-rw-r--r--test/stdout/21282
-rw-r--r--test/stdout/21501
-rw-r--r--test/stdout/34601
-rw-r--r--test/stdout/34632
-rw-r--r--test/stdout/34642
20 files changed, 38 insertions, 4 deletions
diff --git a/test/confs/2000 b/test/confs/2000
index b1999124e..06e5a153c 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 83180721a..f43e5c2c7 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 c5182a14e..8cc6874c3 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 4f76c8900..d0c7ac0df 100644
--- a/test/log/2149
+++ b/test/log/2149
@@ -1,12 +1,12 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex 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@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:DHE-RSA-AES256-SHA:256 S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 S=sss id=E10HmaX-0005vi-00@myhost.test.ex
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> 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 71d9fd6ea..c74b8ded8 100644
--- a/test/mail/2149.userx
+++ b/test/mail/2149.userx
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex 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@myhost.test.ex>)
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@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
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 0031cab60..aa242d589 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 a163b90e4..d3c18a8bf 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 395e1851c..1c2f41881 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 17016aab8..a9eb350be 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 3f47c6213..cae6e21c8 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 f7b83996d..35a696915 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 bb30e910b..1709dee8a 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 a4b4fc6a2..0bcff273b 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 b7848cb58..4bb927032 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 f2a10b98c..d2d83d5b6 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 b81d4a42e..795f469d1 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 d438eae7d..2f5596499 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 895a5c1f6..92c47970f 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 29696a2df..68b1b55c0 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 5a31618c6..46f1c3729 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
View Lorry Controller Status