# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1453849590 -3600
# Node ID 352270bc04393910a567b569ede03358dbb728b5
# Parent  301d58705667fa678cd8d1340e6390d39d14c107# Parent  5c6e78dc1864e698a33753cd1326beb311b9969b
Merge

diff -r 301d58705667 -r 352270bc0439 plugins/mod_dialback.lua
--- a/plugins/mod_dialback.lua	Tue Jan 26 00:28:07 2016 +0100
+++ b/plugins/mod_dialback.lua	Wed Jan 27 00:06:30 2016 +0100
@@ -12,6 +12,7 @@
 
 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 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)