aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-05-22 20:59:01 +0200
committerKim Alvefur <zash@zash.se>2020-05-22 20:59:01 +0200
commitc4bc5d5c13d97f34f4792f595235cd8157165bf9 (patch)
tree5c4bde468165af24c102ec6ba1f786bccd3fddce /util
parentf62650ffab2ee68ba037bd1a02c57890c6ebb78d (diff)
downloadprosody-c4bc5d5c13d97f34f4792f595235cd8157165bf9.tar.gz
prosody-c4bc5d5c13d97f34f4792f595235cd8157165bf9.zip
util.sasl.scram: Apply saslprep before hashing password, fixes #1560
Diffstat (limited to 'util')
-rw-r--r--util/sasl/scram.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index 043f328b..f64feb8b 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -106,6 +106,10 @@ local function getAuthenticationDatabaseSHA1(password, salt, iteration_count)
if iteration_count < 4096 then
log("warn", "Iteration count < 4096 which is the suggested minimum according to RFC 5802.")
end
+ password = saslprep(password);
+ if not password then
+ return false, "password fails SASLprep";
+ end
local salted_password = Hi(password, salt, iteration_count);
local stored_key = sha1(hmac_sha1(salted_password, "Client Key"))
local server_key = hmac_sha1(salted_password, "Server Key");