diff options
| author | Kim Alvefur <zash@zash.se> | 2013-10-31 20:49:03 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-10-31 20:49:03 +0100 |
| commit | d938c65ce63fcc22d915abcc5215efdc52b5cec4 (patch) | |
| tree | fc4ccb38b95ca249345023b2a6b8dc0bf1054deb /core | |
| parent | 9fde274e2174f63d3f50e38f2992b6019a106ec7 (diff) | |
| parent | edc3624d3575688943cf8953d76f0c862189408f (diff) | |
| download | prosody-d938c65ce63fcc22d915abcc5215efdc52b5cec4.tar.gz prosody-d938c65ce63fcc22d915abcc5215efdc52b5cec4.zip | |
Merge 0.10 -> trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 2 |
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"; |