Diff

core/certmanager.lua @ 12362:0fd58f54d653

Merge config-updates+check-turn from timber
author Matthew Wild <mwild1@gmail.com>
date Fri, 04 Mar 2022 16:33:41 +0000
parent 12305:f8b8061461e3
parent 12331:49739369dcad
child 12480:7e9ebdc75ce4
child 12507:e242a6e74424
line wrap: on
line diff
--- a/core/certmanager.lua	Wed Mar 02 16:12:28 2022 +0000
+++ b/core/certmanager.lua	Fri Mar 04 16:33:41 2022 +0000
@@ -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 @@
 
 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;
 	};