aboutsummaryrefslogtreecommitdiffstats
path: root/core
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
commitedc3624d3575688943cf8953d76f0c862189408f (patch)
treed1ed1a9b4e6850898e24a9a5536c9a974d726c73 /core
parent9e2d18bd9872efa7abc9dec3e4c3af83d109243d (diff)
parent1527cd447a8939d9d87175bd8d4a5126227507ae (diff)
downloadprosody-edc3624d3575688943cf8953d76f0c862189408f.tar.gz
prosody-edc3624d3575688943cf8953d76f0c862189408f.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 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";