Test: update for new tls_dhparam

diff --git a/test/confs/2000 b/test/confs/2000
index b1999124ee4c146983b73d051d0afa94be648312..06e5a153cab4558f1a2b0ea2d98e244f05d217ca 100644 (file)
--- 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 83180721a4564d18a8fa7919dfbc8d38b1f80dde..f43e5c2c7e54f9b12aec579f191cac919ba5bd40 100644 (file)
--- 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 c5182a14e6d67513a140844d8d3baae62cf46e8e..8cc6874c37437427d793780d42bc0c596d3cd510 100644 (file)
--- 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 4f76c890037480459ab4ebf2dfaa9e09fd9843a1..d0c7ac0df6840890430711c161b618bcd3781280 100644 (file)
--- 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 71d9fd6ea88d46f1bd15daa0de9a9db092da38fe..c74b8ded83f28882ff6a6d0eba61317af0c6e50c 100644 (file)
--- 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 0031cab6044fd39e03cbfc28bf07ec4071e6d975..aa242d589e27d9f42fa179ffb287be81e465b900 100755 (executable)
--- 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 a163b90e4c64766c5a23328ee1f752456f8fb6a5..d3c18a8bfeeecf96402df17ca477126060a14370 100644 (file)
--- 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 395e1851cc8dc80a180e86af1a1cc25badcbfaa2..1c2f41881d8359737c401a8da09aafe677304e95 100644 (file)
--- 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 17016aab87859f8b3e183c43b22f0ef620bfc7e3..a9eb350be725af0891096b397168c33069fe4168 100644 (file)
--- 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 3f47c6213829ea48e2577a437353c7ee525a3daf..cae6e21c84f0d61f412fdfa13c8b38a27d20d960 100644 (file)
--- 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 f7b83996d14398d48e08c2981332bdc22c22d8d1..35a69691518aae0da32afce57bba34e7f5cb8e61 100644 (file)
--- 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 bb30e910b606e0d643e3cd04629a1638aa819873..1709dee8aeca4d1d732d9a6db6593221e862dc9e 100644 (file)
--- 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 a4b4fc6a2f8a8647e65ce2ef42291a7b1706517d..0bcff273bcb087df4af4d681d99f5defbf849ca0 100644 (file)
--- 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 b7848cb5848ee6b8019b2025eb5a0f52c99b3583..4bb92703285fe1ca28c48921a39c449f8eb049e1 100644 (file)
--- 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 f2a10b98c1cb747811516268948854b0c63435bd..d2d83d5b6eb0afe6a45c8a621e3dbf516a7a2431 100644 (file)
--- 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 b81d4a42e8c4349c32eec702698437f4d13fb142..795f469d1e4614c64bba9655559723b5d1b62a73 100644 (file)
--- 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 d438eae7d7d12492f94d62049892f379cdf73ec2..2f55964999625e0fa0b4f52bc606b86977703422 100644 (file)
--- 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 895a5c1f6f178aa762cf09650bd4f2e2c84846ee..92c47970f9bbdd497181d908973c692c7ecd2413 100644 (file)
--- 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 29696a2df19894934395406c6d7a714290df94e0..68b1b55c0fe7f843f2afcacebb3adf3d276ca608 100644 (file)
--- 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 5a31618c656a4f90bf1abe225dc5e48f6eb95db2..46f1c37298bc3312fbf8df4de0fae9e817b0da88 100644 (file)
--- 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