mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove COMPAT with temporary luasec fork

Browse source 
The changes in the temporary fork were merged into mainline luasec ca
2013 and included in the 0.5 release in 2014.
This commit is contained in:
Kim Alvefur 2019-08-25 23:12:55 +02:00
parent 1295efd944
commit b16782257d
4 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/certmanager.lua
View file

@ -148,13 +148,6 @@ local path_options = { -- These we pass through resolve_path()
key = true, certificate = true, cafile = true, capath = true, dhparam = true
}
if luasec_version < 5 and ssl_x509 then
-- COMPAT mw/luasec-hg
for i=1,#core_defaults.verifyext do -- Remove lsec_ prefix
core_defaults.verify[#core_defaults.verify+1] = core_defaults.verifyext[i]:sub(6);
end
end
local function create_context(host, mode, ...)
local cfg = new_config();
cfg:apply(core_defaults);

3
plugins/mod_c2s.lua
View file

@ -97,7 +97,6 @@ function stream_callbacks.streamopened(session, attr)
session.compressed = info.compression;
else
(session.log or log)("info", "Stream encrypted");
session.compressed = sock.compression and sock:compression(); --COMPAT mw/luasec-hg
end
end
@ -257,8 +256,6 @@ function listener.onconnect(conn)
local sock = conn:socket();
if sock.info then
session.compressed = sock:info"compression";
elseif sock.compression then
session.compressed = sock:compression(); --COMPAT mw/luasec-hg
end
end

1
plugins/mod_s2s/mod_s2s.lua
View file

@ -320,7 +320,6 @@ function stream_callbacks._streamopened(session, attr)
session.compressed = info.compression;
else
(session.log or log)("info", "Stream encrypted");
session.compressed = sock.compression and sock:compression(); --COMPAT mw/luasec-hg
end
end

3
plugins/mod_s2s_auth_certs.lua
View file

@ -17,9 +17,6 @@ module:hook("s2s-check-certificate", function(event)
local chain_valid, errors;
if conn.getpeerverification then
chain_valid, errors = conn:getpeerverification();
elseif conn.getpeerchainvalid then -- COMPAT mw/luasec-hg
chain_valid, errors = conn:getpeerchainvalid();
errors = (not chain_valid) and { { errors } } or nil;
else
chain_valid, errors = false, { { "Chain verification not supported by this version of LuaSec" } };
end