Software / code / prosody
Diff
core/certmanager.lua @ 5922:dd11480ecd47
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 21 Nov 2013 02:14:23 +0000 |
| parent | 5916:1c4405f33561 |
| parent | 5921:f7601ce30cfc |
| child | 6073:4a1fdd72e98a |
line wrap: on
line diff
--- a/core/certmanager.lua Tue Nov 12 11:38:52 2013 +0100 +++ b/core/certmanager.lua Thu Nov 21 02:14:23 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
