diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-11-10 18:49:34 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-11-10 18:49:34 +0000 |
commit | 812962fee3c19f531533e92cab7a692e265918b9 (patch) | |
tree | 8a24b091925a503a6c1306bba5ca3ff72abc440a /core | |
parent | 3186d24c03e4d940aabe4619ec0b661fb27ad11d (diff) | |
parent | 07a71ad6aaaa44203609b5a7d22bea3e5bb40a4f (diff) | |
download | prosody-812962fee3c19f531533e92cab7a692e265918b9.tar.gz prosody-812962fee3c19f531533e92cab7a692e265918b9.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 d9d722f3..c88f7a27 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -40,7 +40,7 @@ local core_defaults = { 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"; + ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL"; } local path_options = { -- These we pass through resolve_path() key = true, certificate = true, cafile = true, capath = true, dhparam = true |