aboutsummaryrefslogtreecommitdiffstats
path: root/core/certmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-11-10 18:50:01 +0000
committerMatthew Wild <mwild1@gmail.com>2013-11-10 18:50:01 +0000
commitfd5b526846c3d031640fcd18a2bb8e421c27ea4e (patch)
tree1a196c2121542744230e695837374a338944222f /core/certmanager.lua
parenta15849cf9ac371f9c328702a0129b4f1c63b1f90 (diff)
parent812962fee3c19f531533e92cab7a692e265918b9 (diff)
downloadprosody-fd5b526846c3d031640fcd18a2bb8e421c27ea4e.tar.gz
prosody-fd5b526846c3d031640fcd18a2bb8e421c27ea4e.zip
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index d9d722f3..c88f7a27 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -40,7 +40,7 @@ local core_defaults = {
options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil };
verifyext = { "lsec_continue", "lsec_ignore_purpose" };
curve = "secp384r1";
- ciphers = "HIGH:!DSS:!aNULL@STRENGTH";
+ ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL";
}
local path_options = { -- These we pass through resolve_path()
key = true, certificate = true, cafile = true, capath = true, dhparam = true