Software / code / prosody
Changeset
5923:002db30661da
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 21 Nov 2013 02:15:36 +0000 |
| parents | 5920:0e5a38ba4c15 (current diff) 5922:dd11480ecd47 (diff) |
| children | 5926:4fd1e660744d |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Wed Nov 13 11:59:43 2013 +0100 +++ b/core/certmanager.lua Thu Nov 21 02:15:36 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+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL"; + ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH:!PSK:!SRP:!3DES:!aNULL"; } local path_options = { -- These we pass through resolve_path() key = true, certificate = true, cafile = true, capath = true, dhparam = true
