aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-11-10 18:49:34 +0000
committerMatthew Wild <mwild1@gmail.com>2013-11-10 18:49:34 +0000
commit3feb6c689eec602d087921e55ac1e5ce00f3d8a9 (patch)
tree8a24b091925a503a6c1306bba5ca3ff72abc440a /core
parent85289e8c7d1f592a65ba13d1c117d34cefc6e3ad (diff)
parent67a543adb0bd2ee6ba791ea3329bc6e1d68b6acc (diff)
downloadprosody-3feb6c689eec602d087921e55ac1e5ce00f3d8a9.tar.gz
prosody-3feb6c689eec602d087921e55ac1e5ce00f3d8a9.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
-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