Software / code / prosody
Changeset
7088:85e72077d40b
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 20 Jan 2016 14:46:27 +0100 |
| parents | 7086:6cc7c9da29ed (current diff) 7087:dd8265ca9327 (diff) |
| children | 7089:890f4b2cc444 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)
