]> granicus.if.org Git - ejabberd/commitdiff
Fix Salt import from prosody SCRAMmed password (#1803)
authorBadlop <badlop@process-one.net>
Thu, 29 Jun 2017 08:28:44 +0000 (10:28 +0200)
committerBadlop <badlop@process-one.net>
Thu, 29 Jun 2017 08:28:44 +0000 (10:28 +0200)
src/prosody2ejabberd.erl

index 1bd28ca828c4d5adc16f22b3ce32a492bd4b7c78..c60f2c24b80d05aad2d61ac724211638c5e4c02b 100644 (file)
@@ -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)
            };
        _ -> <<"">>