aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-11-09 18:36:32 +0000
committerMatthew Wild <mwild1@gmail.com>2013-11-09 18:36:32 +0000
commit3186d24c03e4d940aabe4619ec0b661fb27ad11d (patch)
treeb2c5bd41f4b82635ecf2b2191687ff0f14bfb246 /core
parent999ec7ca77c56260f21908372e4dd1a29815c471 (diff)
parentdbf699af300816447cd6e2f3e28de82b2813cfa1 (diff)
downloadprosody-3186d24c03e4d940aabe4619ec0b661fb27ad11d.tar.gz
prosody-3186d24c03e4d940aabe4619ec0b661fb27ad11d.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 dc22bb46..d9d722f3 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -37,7 +37,7 @@ local core_defaults = {
capath = "/etc/ssl/certs";
protocol = "sslv23";
verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none";
- options = { "no_sslv2", "no_sslv3", luasec_has_noticket and "no_ticket" or nil };
+ 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";