Merge 0.9->0.10

diff --git a/core/certmanager.lua b/core/certmanager.lua
index d9d722f3b74f1e0855a49db9cad254251707af52..c88f7a270fb77c964a39f5fcc3fd763704d67346 100644 (file)
--- 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 89cd7cf369f0b891270f65c616958fd1f8536866..04f5f0f4f297d3d5b9d8bf3d167edebf4cf6d092 100644 (file)
--- 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);