aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-13 00:46:29 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-13 00:46:29 +0100
commit33cb45ba286fcaaf218cd124421f5ae2f528aa86 (patch)
treed1f0f6d477f68bd8bbb9fef3dff9b3186ba8f881
parentd01914e9a8ddaa608f637dddd4e85b49979bd302 (diff)
parent47a2577f269c3596043abec6e0ccbe1cf201e9f2 (diff)
downloadprosody-33cb45ba286fcaaf218cd124421f5ae2f528aa86.tar.gz
prosody-33cb45ba286fcaaf218cd124421f5ae2f528aa86.zip
Merge 0.9->trunk
-rw-r--r--core/certmanager.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 472e1665..5618589b 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -44,6 +44,11 @@ if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= tr
default_options[#default_options+1] = "no_compression";
end
+if luasec_has_no_compression then -- Has no_compression? Then it has these too...
+ default_options[#default_options+1] = "single_dh_use";
+ default_options[#default_options+1] = "single_ecdh_use";
+end
+
function create_context(host, mode, user_ssl_config)
user_ssl_config = user_ssl_config or default_ssl_config;