aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-11-10 18:49:34 +0000
committerMatthew Wild <mwild1@gmail.com>2013-11-10 18:49:34 +0000
commit812962fee3c19f531533e92cab7a692e265918b9 (patch)
tree8a24b091925a503a6c1306bba5ca3ff72abc440a
parent3186d24c03e4d940aabe4619ec0b661fb27ad11d (diff)
parent07a71ad6aaaa44203609b5a7d22bea3e5bb40a4f (diff)
downloadprosody-812962fee3c19f531533e92cab7a692e265918b9.tar.gz
prosody-812962fee3c19f531533e92cab7a692e265918b9.zip
Merge 0.9->0.10
-rw-r--r--core/certmanager.lua2
-rw-r--r--util/set.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index d9d722f3..c88f7a27 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:!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
diff --git a/util/set.lua b/util/set.lua
index 89cd7cf3..04f5f0f4 100644
--- a/util/set.lua
+++ b/util/set.lua
@@ -23,7 +23,7 @@ function set_mt.__sub(set1, set2)
return _M.difference(set1, set2);
end
function set_mt.__div(set, func)
- local new_set, new_items = _M.new();
+ local new_set = _M.new();
local items, new_items = set._items, new_set._items;
for item in pairs(items) do
local new_item = func(item);