diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-11-09 18:36:32 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-11-09 18:36:32 +0000 |
| commit | 85289e8c7d1f592a65ba13d1c117d34cefc6e3ad (patch) | |
| tree | b2c5bd41f4b82635ecf2b2191687ff0f14bfb246 /core | |
| parent | 77355bc935b956f173dc290273f6eda0a1f69360 (diff) | |
| parent | 84ab7c5628a4c0bbb59a22250452c20c3677adc4 (diff) | |
| download | prosody-85289e8c7d1f592a65ba13d1c117d34cefc6e3ad.tar.gz prosody-85289e8c7d1f592a65ba13d1c117d34cefc6e3ad.zip | |
Merge 0.9->0.10
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 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"; |