aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-07-13 13:17:53 +0100
committerMatthew Wild <mwild1@gmail.com>2013-07-13 13:17:53 +0100
commit7a8fd288b5e7a979317e9cf6fe594c8bf1eadb6f (patch)
treeab65ee75cdd50c759cef81d78c7cb53849a36c9b
parentf7acbbc7831ab1cd8f2bcdf66d284fb47d3ff04e (diff)
parent2840e0726ad39ed0d191b15ed4aceb4eb3daa07a (diff)
downloadprosody-7a8fd288b5e7a979317e9cf6fe594c8bf1eadb6f.tar.gz
prosody-7a8fd288b5e7a979317e9cf6fe594c8bf1eadb6f.zip
Merge 0.9->trunk
-rw-r--r--core/certmanager.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 92b63ec3..dc08cb78 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -38,6 +38,7 @@ local core_defaults = {
options = { "no_sslv2", luasec_has_noticket and "no_ticket" or nil };
verifyext = { "lsec_continue", "lsec_ignore_purpose" };
curve = "secp384r1";
+ ciphers = "HIGH:!DSS:!aNULL@STRENGTH";
}
local path_options = { -- These we pass through resolve_path()
key = true, certificate = true, cafile = true, capath = true