aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-24 19:46:12 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-24 19:46:12 +0100
commit6dd7c1aa05116fb9a331542a67bfaf8a25946a73 (patch)
treec7a6f242f1445f958c2ab4da26fb7bab12f430fc
parente97ee0eaad41b33c15b562dadb539828e429db84 (diff)
parenta48703aa3b3006d66c7e0e685fa13fc6723c936d (diff)
downloadprosody-6dd7c1aa05116fb9a331542a67bfaf8a25946a73.tar.gz
prosody-6dd7c1aa05116fb9a331542a67bfaf8a25946a73.zip
Merge 0.7->trunk
-rw-r--r--util/sasl/scram.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index 41c7a50a..52656a89 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -164,7 +164,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
return "failure", "temporary-auth-failure";
end
elseif self.profile["scram_"..hashprep(hash_name)] then
- local salted_password, iteration_count, salt, state = self.profile["scram-"..hash_name](self.state.name, self.realm);
+ local salted_password, iteration_count, salt, state = self.profile["scram_"..hashprep(hash_name)](self.state.name, self.realm);
if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end