diff options
author | Holger Weiss <holger@zedat.fu-berlin.de> | 2017-03-16 23:15:08 +0100 |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2017-03-16 23:15:08 +0100 |
commit | 0ef6973457da0a6d9c85344c1b26241ea5b77954 (patch) | |
tree | 078b28bb1bc5cbcecf7ac2659b210c64be792c0a /src/prosody2ejabberd.erl | |
parent | Encode in base64 when getting scram data with import_prosody (#1549) (diff) |
prosody2ejabberd: Fix SCRAM hash conversion
Closes #1549.
Diffstat (limited to 'src/prosody2ejabberd.erl')
-rw-r--r-- | src/prosody2ejabberd.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl index 34e8ac9e..6131acab 100644 --- a/src/prosody2ejabberd.erl +++ b/src/prosody2ejabberd.erl @@ -113,9 +113,9 @@ maybe_get_scram_auth(Data) -> case proplists:get_value(<<"iteration_count">>, Data, no_ic) of IC when is_float(IC) -> %% A float like 4096.0 is read #scram{ - storedkey = jlib:encode_base64(proplists:get_value(<<"stored_key">>, Data, <<"">>)), - serverkey = jlib:encode_base64(proplists:get_value(<<"server_key">>, Data, <<"">>)), - salt = jlib:encode_base64(proplists:get_value(<<"salt">>, Data, <<"">>)), + storedkey = jlib:hex_to_base64(proplists:get_value(<<"stored_key">>, Data, <<"">>)), + serverkey = jlib:hex_to_base64(proplists:get_value(<<"server_key">>, Data, <<"">>)), + salt = jlib:hex_to_base64(proplists:get_value(<<"salt">>, Data, <<"">>)), iterationcount = round(IC) }; _ -> <<"">> |