aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2010-06-08 10:47:55 +0200
committerTobias Markmann <tm@ayena.de>2010-06-08 10:47:55 +0200
commit9e9c409297871c9963d69f0302e0b791ac0c4c3e (patch)
treee2f2dba96bcf06ed6a351cf21b808d6745ea54cd /util
parent1357c719b98ae25b8cc593005371d59dc5182c4d (diff)
downloadprosody-9e9c409297871c9963d69f0302e0b791ac0c4c3e.tar.gz
prosody-9e9c409297871c9963d69f0302e0b791ac0c4c3e.zip
mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Diffstat (limited to 'util')
-rw-r--r--util/sasl/scram.lua11
1 files changed, 6 insertions, 5 deletions
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index c366a152..08533b68 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -35,7 +35,7 @@ Supported Authentication Backends
scram_{MECH}:
-- MECH being a standard hash name (like those at IANA's hash registry) with '-' replaced with '_'
function(username, realm)
- return salted_password, iteration_count, salt, state;
+ return stored_key, server_key, iteration_count, salt, state;
end
]]
@@ -97,16 +97,17 @@ local function hashprep(hashname)
return hashname:lower():gsub("-", "_");
end
-function saltedPasswordSHA1(password, salt, iteration_count)
- local salted_password
+function getAuthenticationDatabaseSHA1(password, salt, iteration_count)
if type(password) ~= "string" or type(salt) ~= "string" or type(iteration_count) ~= "number" then
return false, "inappropriate argument types"
end
if iteration_count < 4096 then
log("warn", "Iteration count < 4096 which is the suggested minimum according to RFC 5802.")
end
-
- return true, Hi(hmac_sha1, password, salt, iteration_count);
+ local salted_password = Hi(hmac_sha1, password, salt, iteration_count);
+ local stored_key = sha1(hmac_sha1(salted_password, "Client Key"))
+ local server_key = hmac_sha1(salted_password, "Server Key");
+ return true, stored_key, server_key
end
local function scram_gen(hash_name, H_f, HMAC_f)