diff options
| author | Matthew Wild <mwild1@gmail.com> | 2022-03-04 16:33:41 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2022-03-04 16:33:41 +0000 |
| commit | b47c7951d54d64a3a89854bb80f5d67cc2da90ab (patch) | |
| tree | 916354af1f314292b4410e1febcfe6a71e398cf0 /core | |
| parent | b6bf4788aa3d5c7ee847c690fcd0fbd9346a5dc7 (diff) | |
| parent | a6265e45a04a7f7d5ae39c5608f7a350be1410db (diff) | |
| download | prosody-b47c7951d54d64a3a89854bb80f5d67cc2da90ab.tar.gz prosody-b47c7951d54d64a3a89854bb80f5d67cc2da90ab.zip | |
Merge config-updates+check-turn from timber
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 16 | ||||
| -rw-r--r-- | core/usermanager.lua | 2 |
2 files changed, 4 insertions, 14 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index b1380ae8..c193e824 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -6,20 +6,10 @@ -- COPYING file in the source package for more information. -- -local softreq = require"util.dependencies".softreq; -local ssl = softreq"ssl"; -if not ssl then - return { - create_context = function () - return nil, "LuaSec (required for encryption) was not found"; - end; - reload_ssl_config = function () end; - } -end - +local ssl = require "ssl"; local configmanager = require "core.configmanager"; local log = require "util.logger".init("certmanager"); -local ssl_context = ssl.context or softreq"ssl.context"; +local ssl_context = ssl.context or require "ssl.context"; local ssl_newcontext = ssl.newcontext; local new_config = require"util.sslconfig".new; local stat = require "lfs".attributes; @@ -48,7 +38,7 @@ end local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)"); local luasec_version = tonumber(luasec_major) * 100 + tonumber(luasec_minor); -local luasec_has = ssl.config or softreq"ssl.config" or { +local luasec_has = ssl.config or { algorithms = { ec = luasec_version >= 5; }; diff --git a/core/usermanager.lua b/core/usermanager.lua index ca4e2baa..45f104fa 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -23,7 +23,7 @@ local hosts = prosody.hosts; local setmetatable = setmetatable; -local default_provider = "internal_plain"; +local default_provider = "internal_hashed"; local _ENV = nil; -- luacheck: std none |