aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/certmanager.lua16
-rw-r--r--util/dependencies.lua2
2 files changed, 4 insertions, 14 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 684b240c..2585716f 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/util/dependencies.lua b/util/dependencies.lua
index 4cd45a05..d7836404 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -85,7 +85,7 @@ local function check_dependencies()
{ "Debian/Ubuntu", "sudo apt install lua-sec" };
{ "luarocks", "luarocks install luasec" };
{ "Source", "https://github.com/brunoos/luasec" };
- }, "SSL/TLS support will not be available", err);
+ }, nil, err);
end
local bit, err = softreq"util.bitcompat";