aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-31 20:47:57 +0100
committerKim Alvefur <zash@zash.se>2013-10-31 20:47:57 +0100
commit8c121fdf945b9bcee916f5e3c14ae6e64b28d7eb (patch)
treed1ed1a9b4e6850898e24a9a5536c9a974d726c73
parent7769c9bc36dce87f4d4f51dc8578b1aa6c220b08 (diff)
parent45ecf509edc30aa6f83d87323d87b2b9c8104bb4 (diff)
downloadprosody-8c121fdf945b9bcee916f5e3c14ae6e64b28d7eb.tar.gz
prosody-8c121fdf945b9bcee916f5e3c14ae6e64b28d7eb.zip
Merge 0.9 -> 0.10
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index e8030581..dc22bb46 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", luasec_has_noticket and "no_ticket" or nil };
+ options = { "no_sslv2", "no_sslv3", luasec_has_noticket and "no_ticket" or nil };
verifyext = { "lsec_continue", "lsec_ignore_purpose" };
curve = "secp384r1";
ciphers = "HIGH:!DSS:!aNULL@STRENGTH";