aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-15 01:37:16 +0200
committerKim Alvefur <zash@zash.se>2013-10-15 01:37:16 +0200
commite9b5aeb4c32a14773844d2e04cbde694e9521727 (patch)
treea0ec05df566e6b2b319dd73cca74ff05e6ddfa90 /core
parentbcea13a63d02496173f418e543e731205d5c8c6a (diff)
downloadprosody-e9b5aeb4c32a14773844d2e04cbde694e9521727.tar.gz
prosody-e9b5aeb4c32a14773844d2e04cbde694e9521727.zip
certmanager: Add back single_dh_use and single_ecdh_use to default options (Zash breaks, Zash unbreaks)
Diffstat (limited to 'core')
-rw-r--r--core/certmanager.lua8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index caa4afce..0709c650 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -53,8 +53,12 @@ if ssl and not luasec_has_verifyext and ssl.x509 then
end
end
-if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= true then
- core_defaults.options[#core_defaults.options+1] = "no_compression";
+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";
+ if configmanager.get("*", "ssl_compression") ~= true then
+ core_defaults.options[#core_defaults.options+1] = "no_compression";
+ end
end
function create_context(host, mode, user_ssl_config)