diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-20 14:46:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-20 14:46:27 +0100 |
| commit | c17ba266422cfaaf595d51e7169868b10d0c455a (patch) | |
| tree | 768406645ad3b21dc73929c51634ccca66acb7ae /plugins | |
| parent | d1035ccf21a3fcab0909b18cb46c782ee820f0b0 (diff) | |
| parent | ea765c23848bb89db85b3240b8d3a94203160e18 (diff) | |
| download | prosody-c17ba266422cfaaf595d51e7169868b10d0c455a.tar.gz prosody-c17ba266422cfaaf595d51e7169868b10d0c455a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_dialback.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 5dfd9839..f0fe949a 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 check_cert_status = module:depends"s2s".check_cert_status; local uuid_gen = require"util.uuid".generate; @@ -20,7 +21,7 @@ local xmlns_stream = "http://etherx.jabber.org/streams"; 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 @@ function module.restore(state) 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) |