From 7a94ebccf29c6a86621db93dac964bcbbc6c039c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 3 Sep 2013 13:13:31 +0200 Subject: certmanager: Allow for specifying the dhparam option as a path to a file instead of a callback --- core/certmanager.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/certmanager.lua b/core/certmanager.lua index 5aec22b3..c1ce468d 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -72,6 +72,17 @@ function create_context(host, mode, user_ssl_config) dhparam = user_ssl_config.dhparam; }; + -- LuaSec expects dhparam to be a callback that takes two arguments. + -- We ignore those because it is mostly used for having a separate + -- set of params for EXPORT ciphers, which we don't have by default. + if type(user_ssl_config.dhparam) == "string" then + local f, err = io_open(resolve_path(user_ssl_config.dhparam)); + if not f then return nil, "Could not open DH parameters: "..err end + local dhparam = f:read("*a"); + f:close(); + user_ssl_config.dhparam = function() return dhparam; end + end + local ctx, err = ssl_newcontext(ssl_config); -- COMPAT: LuaSec 0.4.1 ignores the cipher list from the config, so we have to take -- cgit v1.2.3