diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-11-21 02:14:23 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-11-21 02:14:23 +0000 |
| commit | 234d0b83c735aa7cde49aa652191406a009acdef (patch) | |
| tree | c4aed55dd33420047293ce46e21770e67fe74b40 /core | |
| parent | f454faa15bdbccc23b805dcb110e985cb0ff0295 (diff) | |
| parent | 2565ed535e094d47a4ecec7862b1da79089a71ae (diff) | |
| download | prosody-234d0b83c735aa7cde49aa652191406a009acdef.tar.gz prosody-234d0b83c735aa7cde49aa652191406a009acdef.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 c88f7a27..9dfb8f3a 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+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 |