summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2015-05-26 10:48:46 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2015-05-26 16:47:47 +0100
commit038597d295fa0ebd48ed4c00a6dfff0f30a2353a (patch)
tree931ef51b11d17e257bd4ee95cf721178bc78d296 /test
parent089fc87a02b0c682ace3afc2f597f5e5b3b8f076 (diff)
TLS: Enable ECDHE on OpenSSL, just the NIST P-256 curve. Bug 1397
Original by Phil Pennock; tweaked by JH.
Diffstat (limited to 'test')
-rw-r--r--test/confs/21023
-rw-r--r--test/confs/21193
-rw-r--r--test/confs/21323
3 files changed, 6 insertions, 3 deletions
diff --git a/test/confs/2102 b/test/confs/2102
index 38441e9d6..293474a71 100644
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -42,7 +42,8 @@ check_recipient:
DHE-RSA-AES256-SHA : \
DHE-RSA-AES256-GCM-SHA384 : \
DHE_RSA_AES_256_CBC_SHA1 : \
- DHE_RSA_3DES_EDE_CBC_SHA
+ DHE_RSA_3DES_EDE_CBC_SHA : \
+ ECDHE-RSA-AES128-GCM-SHA256
warn logwrite = ${if def:tls_in_ourcert \
{Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
{We did not present a cert}}
diff --git a/test/confs/2119 b/test/confs/2119
index de1cd2e22..3714f97c6 100644
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -41,7 +41,8 @@ check_recipient:
DHE-RSA-AES256-SHA:\
DHE-RSA-AES256-GCM-SHA384:\
DHE_RSA_AES_256_CBC_SHA1:\
- DHE_RSA_3DES_EDE_CBC_SHA
+ DHE_RSA_3DES_EDE_CBC_SHA:\
+ ECDHE-RSA-AES128-GCM-SHA256
accept
diff --git a/test/confs/2132 b/test/confs/2132
index 2b06d6c4a..f2d67d9a7 100644
--- a/test/confs/2132
+++ b/test/confs/2132
@@ -41,7 +41,8 @@ check_recipient:
DHE-RSA-AES256-SHA : \
DHE-RSA-AES256-GCM-SHA384 : \
DHE_RSA_AES_256_CBC_SHA1 : \
- DHE_RSA_3DES_EDE_CBC_SHA
+ DHE_RSA_3DES_EDE_CBC_SHA : \
+ ECDHE-RSA-AES128-GCM-SHA256
warn logwrite = ${if def:tls_in_ourcert \
{Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
{We did not present a cert}}