diff options
| author | Kim Alvefur <zash@zash.se> | 2013-09-03 13:40:29 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-09-03 13:40:29 +0200 |
| commit | 628910498b1d7c4710fd531cad43b2c21d0e18bb (patch) | |
| tree | bcf473d9e9d607002ea2fc763787022b9b623708 /core | |
| parent | 7f9fe6d4cd5ddd4d260b68e57a8dc378175ef627 (diff) | |
| download | prosody-628910498b1d7c4710fd531cad43b2c21d0e18bb.tar.gz prosody-628910498b1d7c4710fd531cad43b2c21d0e18bb.zip | |
certmanager: Fix dhparam callback, missing imports (Testing, pfft)0.9.1
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index c1ce468d..350fb837 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -12,6 +12,8 @@ local ssl = ssl; local ssl_newcontext = ssl and ssl.newcontext; local tostring = tostring; +local type = type; +local io_open = io.open; local prosody = prosody; local resolve_path = configmanager.resolve_relative_path; @@ -75,12 +77,12 @@ function create_context(host, mode, user_ssl_config) -- 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 type(ssl_config.dhparam) == "string" then + local f, err = io_open(resolve_path(config_path, 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 + ssl_config.dhparam = function() return dhparam; end end local ctx, err = ssl_newcontext(ssl_config); |