Merge 0.11->trunk
authorKim Alvefur <zash@zash.se>
Mon, 23 Nov 2020 21:56:26 +0100
changeset 11218 5fb6563eee1e
parent 11215 1151140fc757 (current diff)
parent 11217 992c4498a1e3 (diff)
child 11219 9ce0a899ff07
Merge 0.11->trunk
plugins/mod_saslauth.lua
--- a/plugins/mod_saslauth.lua	Mon Nov 23 20:39:47 2020 +0000
+++ b/plugins/mod_saslauth.lua	Mon Nov 23 21:56:26 2020 +0100
@@ -260,7 +260,10 @@
 			-- FIXME: would be nice to have this check only once and not for every socket
 			if sasl_handler.add_cb_handler then
 				local socket = origin.conn:socket();
-				if socket.getpeerfinished then
+				local info = socket.info and socket:info();
+				if info.protocol == "TLSv1.3" then
+					log("debug", "Channel binding 'tls-unique' undefined in context of TLS 1.3");
+				elseif socket.getpeerfinished and socket:getpeerfinished() then
 					log("debug", "Channel binding 'tls-unique' supported");
 					sasl_handler:add_cb_handler("tls-unique", tls_unique);
 				else