diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-11-10 18:50:01 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-11-10 18:50:01 +0000 |
| commit | ea8974d055f7f015cb01ce7a43bc381455135439 (patch) | |
| tree | 1a196c2121542744230e695837374a338944222f | |
| parent | 36c5b9e1e93fc4966b323dfb09d97ecf58b16eda (diff) | |
| parent | 3feb6c689eec602d087921e55ac1e5ce00f3d8a9 (diff) | |
| download | prosody-ea8974d055f7f015cb01ce7a43bc381455135439.tar.gz prosody-ea8974d055f7f015cb01ce7a43bc381455135439.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/certmanager.lua | 2 | ||||
| -rw-r--r-- | util/set.lua | 2 |
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); |