projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
adfb4e1
)
mod_dialback: Follow XEP-0185 and use HMAC
author
Kim Alvefur
<zash@zash.se>
Tue, 19 Jan 2016 20:31:02 +0000
(21:31 +0100)
committer
Kim Alvefur
<zash@zash.se>
Tue, 19 Jan 2016 20:31:02 +0000
(21:31 +0100)
plugins/mod_dialback.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_dialback.lua
b/plugins/mod_dialback.lua
index 9dcb0ed53112d73f9e4d4460f1c17260b68be2d0..dc3c3f10a7a06cf8a52ec9aa8463c2039ed62ab4 100644
(file)
--- 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 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";
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)
local dialback_requests = setmetatable({}, { __mode = 'v' });
function generate_dialback(id, to, from)
- return sha256_h
ash(id..to..from..hosts[from].dialback_secret
, true);
+ return sha256_h
mac(sha256_hash(hosts[from].dialback_secret), to .. ' ' .. from .. ' ' .. id
, true);
end
function initiate_dialback(session)
end
function initiate_dialback(session)