aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2017-06-29 10:28:44 +0200
committerBadlop <badlop@process-one.net>2017-06-29 10:28:44 +0200
commitb66e369a1d696601fb0a75230bc38eb5bd72eea8 (patch)
tree23d5d45d732c92f27c86afe4b0c69dfaf156d54a
parentFix clone code in update-deps-release (diff)
Fix Salt import from prosody SCRAMmed password (#1803)
-rw-r--r--src/prosody2ejabberd.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl
index 1bd28ca82..c60f2c24b 100644
--- a/src/prosody2ejabberd.erl
+++ b/src/prosody2ejabberd.erl
@@ -115,7 +115,7 @@ maybe_get_scram_auth(Data) ->
#scram{
storedkey = misc:hex_to_base64(proplists:get_value(<<"stored_key">>, Data, <<"">>)),
serverkey = misc:hex_to_base64(proplists:get_value(<<"server_key">>, Data, <<"">>)),
- salt = misc:hex_to_base64(proplists:get_value(<<"salt">>, Data, <<"">>)),
+ salt = base64:encode(proplists:get_value(<<"salt">>, Data, <<"">>)),
iterationcount = round(IC)
};
_ -> <<"">>