# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1566767575 -7200
# Node ID 77f900bbbf25989e421507fbc06a1b84aaa7b485
# Parent  9bdd9b6bf362ecb3cfd739f95edf3d4b6f69aa33
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.

diff -r 9bdd9b6bf362 -r 77f900bbbf25 core/certmanager.lua
--- a/core/certmanager.lua	Sun Aug 25 21:31:04 2019 +0200
+++ b/core/certmanager.lua	Sun Aug 25 23:12:55 2019 +0200
@@ -148,13 +148,6 @@
 	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);
diff -r 9bdd9b6bf362 -r 77f900bbbf25 plugins/mod_c2s.lua
--- a/plugins/mod_c2s.lua	Sun Aug 25 21:31:04 2019 +0200
+++ b/plugins/mod_c2s.lua	Sun Aug 25 23:12:55 2019 +0200
@@ -97,7 +97,6 @@
 			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 @@
 		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 -r 9bdd9b6bf362 -r 77f900bbbf25 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Sun Aug 25 21:31:04 2019 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Sun Aug 25 23:12:55 2019 +0200
@@ -320,7 +320,6 @@
 			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 -r 9bdd9b6bf362 -r 77f900bbbf25 plugins/mod_s2s_auth_certs.lua
--- a/plugins/mod_s2s_auth_certs.lua	Sun Aug 25 21:31:04 2019 +0200
+++ b/plugins/mod_s2s_auth_certs.lua	Sun Aug 25 23:12:55 2019 +0200
@@ -17,9 +17,6 @@
 	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