aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-08-25 23:12:55 +0200
committerKim Alvefur <zash@zash.se>2019-08-25 23:12:55 +0200
commitb16782257d441196d7fbab2823ba8fa878c4c056 (patch)
treed4835a0d0195d06e2ea465c9447e9b9c398b8bce /plugins
parent1295efd944da3e95e66243eab2ac4fe0b4de556e (diff)
downloadprosody-b16782257d441196d7fbab2823ba8fa878c4c056.tar.gz
prosody-b16782257d441196d7fbab2823ba8fa878c4c056.zip
Remove COMPAT with temporary luasec fork
The changes in the temporary fork were merged into mainline luasec ca 2013 and included in the 0.5 release in 2014.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_c2s.lua3
-rw-r--r--plugins/mod_s2s/mod_s2s.lua1
-rw-r--r--plugins/mod_s2s_auth_certs.lua3
3 files changed, 0 insertions, 7 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 53af34f0..02a0c5eb 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -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
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index ea19f7ad..5a0d2a49 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -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
diff --git a/plugins/mod_s2s_auth_certs.lua b/plugins/mod_s2s_auth_certs.lua
index dd0eb3cb..76e134a7 100644
--- a/plugins/mod_s2s_auth_certs.lua
+++ b/plugins/mod_s2s_auth_certs.lua
@@ -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