diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-09-12 22:31:25 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-09-12 22:31:25 +0100 |
| commit | fa1559e19cb42b43dac7b27213639071cd257462 (patch) | |
| tree | 1b740492720e5c386b928514e711e90e705f5693 /core | |
| parent | 804406e5f8ae306cbb5770c38720c09cbb6c43c1 (diff) | |
| parent | f04d5613829f64ceed87e0652fcbcd6f602833d3 (diff) | |
| download | prosody-fa1559e19cb42b43dac7b27213639071cd257462.tar.gz prosody-fa1559e19cb42b43dac7b27213639071cd257462.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 11 | ||||
| -rw-r--r-- | core/statsmanager.lua | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index c286a901..3872bd9a 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -103,7 +103,16 @@ local core_defaults = { }; verifyext = { "lsec_continue", "lsec_ignore_purpose" }; curve = "secp384r1"; - ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH:!PSK:!SRP:!3DES:!aNULL"; + ciphers = { -- Enabled ciphers in order of preference: + "HIGH+kEDH", -- Ephemeral Diffie-Hellman key exchange, if a 'dhparam' file is set + "HIGH+kEECDH", -- Ephemeral Elliptic curve Diffie-Hellman key exchange + "HIGH", -- Other "High strength" ciphers + -- Disabled cipher suites: + "!PSK", -- Pre-Shared Key - not used for XMPP + "!SRP", -- Secure Remote Password - not used for XMPP + "!3DES", -- 3DES - slow and of questionable security + "!aNULL", -- Ciphers that does not authenticate the connection + }; } local path_options = { -- These we pass through resolve_path() key = true, certificate = true, cafile = true, capath = true, dhparam = true diff --git a/core/statsmanager.lua b/core/statsmanager.lua index 67702dd9..237b1dd5 100644 --- a/core/statsmanager.lua +++ b/core/statsmanager.lua @@ -6,7 +6,7 @@ local fire_event = prosody.events.fire_event; local stats_interval_config = config.get("*", "statistics_interval"); local stats_interval = tonumber(stats_interval_config); -if stats_config and not stats_interval then +if stats_interval_config and not stats_interval then log("error", "Invalid 'statistics_interval' setting, statistics will be disabled"); end |