# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1453297587 -3600
# Node ID 85e72077d40b6449cf9b04b20ade1ebec29d7404
# Parent  6cc7c9da29ed97e8b95c58041c5f195481d74298# Parent  dd8265ca9327fa8cadf7681a058fe8faa837d649
Merge 0.10->trunk

diff -r 6cc7c9da29ed -r 85e72077d40b plugins/mod_dialback.lua
--- a/plugins/mod_dialback.lua	Wed Jan 20 14:46:06 2016 +0100
+++ b/plugins/mod_dialback.lua	Wed Jan 20 14:46:27 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 check_cert_status = module:depends"s2s".check_cert_status;
 local uuid_gen = require"util.uuid".generate;
@@ -20,7 +21,7 @@
 
 local dialback_requests = setmetatable({}, { __mode = 'v' });
 
-local dialback_secret = module.host .. module:get_option_string("dialback_secret", uuid_gen());
+local dialback_secret = sha256_hash(module:get_option_string("dialback_secret", uuid_gen()), true);
 local dwd = module:get_option_boolean("dialback_without_dialback", false);
 
 function module.save()
@@ -32,7 +33,7 @@
 end
 
 function generate_dialback(id, to, from)
-	return sha256_hash(id..to..dialback_secret, true);
+	return sha256_hmac(dialback_secret, to .. ' ' .. from .. ' ' .. id, true);
 end
 
 function initiate_dialback(session)