aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-11-23 21:56:26 +0100
committerKim Alvefur <zash@zash.se>2020-11-23 21:56:26 +0100
commitb7a02665ea935f407fed86b54c5b429b7cbb02fb (patch)
tree6a5073b227f88cded7a57da57e1f67ad8e816f02
parent9bcc94bc0c4502370f927df83d1ad006b257153e (diff)
parent15b64ea4ff015baaac85cd2438cae3ab0a42cb19 (diff)
downloadprosody-b7a02665ea935f407fed86b54c5b429b7cbb02fb.tar.gz
prosody-b7a02665ea935f407fed86b54c5b429b7cbb02fb.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_saslauth.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 2a5edcb2..5a049e67 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -260,7 +260,10 @@ module:hook("stream-features", function(event)
-- 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