Software /
code /
prosody
Diff
core/certmanager.lua @ 5908:081a91507e4f
Merge 0.9->0.10
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Sun, 10 Nov 2013 18:49:34 +0000 |
parent | 5904:c1bc2c20a80a |
parent | 5907:9586979058b8 |
child | 5916:1c4405f33561 |
line wrap: on
line diff
--- a/core/certmanager.lua Sat Nov 09 18:36:32 2013 +0000 +++ b/core/certmanager.lua Sun Nov 10 18:49:34 2013 +0000 @@ -40,7 +40,7 @@ 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