aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-27 00:06:30 +0100
committerKim Alvefur <zash@zash.se>2016-01-27 00:06:30 +0100
commitfe3e8ec8059651e78169077158c5c889e237dab2 (patch)
treef0a00027e5736f520eed9f29085db8e8d38926ae
parent1875b4a83dd0ab0e0325b621620aa486b4e1322d (diff)
parent212db93800d6a135303d4c2e96f3f29478938bec (diff)
downloadprosody-fe3e8ec8059651e78169077158c5c889e237dab2.tar.gz
prosody-fe3e8ec8059651e78169077158c5c889e237dab2.zip
Merge0.9.10
-rw-r--r--plugins/mod_dialback.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 9dcb0ed5..dc3c3f10 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -12,6 +12,7 @@ local log = module._log;
local st = require "util.stanza";
local sha256_hash = require "util.hashes".sha256;
+local sha256_hmac = require "util.hashes".hmac_sha256;
local nameprep = require "util.encodings".stringprep.nameprep;
local xmlns_stream = "http://etherx.jabber.org/streams";
@@ -19,7 +20,7 @@ local xmlns_stream = "http://etherx.jabber.org/streams";
local dialback_requests = setmetatable({}, { __mode = 'v' });
function generate_dialback(id, to, from)
- return sha256_hash(id..to..from..hosts[from].dialback_secret, true);
+ return sha256_hmac(sha256_hash(hosts[from].dialback_secret), to .. ' ' .. from .. ' ' .. id, true);
end
function initiate_dialback(session)