aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_auth_mnesia.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ejabberd_auth_mnesia.erl')
-rw-r--r--src/ejabberd_auth_mnesia.erl18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ejabberd_auth_mnesia.erl b/src/ejabberd_auth_mnesia.erl
index 99cf42cbf..457e4c1b8 100644
--- a/src/ejabberd_auth_mnesia.erl
+++ b/src/ejabberd_auth_mnesia.erl
@@ -129,7 +129,7 @@ check_password(User, AuthzId, Server, Password, Digest,
true -> (Passwd == Password) and (Password /= <<"">>)
end;
[#passwd{password = Scram}] when is_record(Scram, scram) ->
- Passwd = aux:decode_base64(Scram#scram.storedkey),
+ Passwd = misc:decode_base64(Scram#scram.storedkey),
DigRes = if Digest /= <<"">> ->
Digest == DigestGen(Passwd);
true -> false
@@ -294,9 +294,9 @@ get_password(User, Server) ->
Password;
[#passwd{password = Scram}]
when is_record(Scram, scram) ->
- {aux:decode_base64(Scram#scram.storedkey),
- aux:decode_base64(Scram#scram.serverkey),
- aux:decode_base64(Scram#scram.salt),
+ {misc:decode_base64(Scram#scram.storedkey),
+ misc:decode_base64(Scram#scram.serverkey),
+ misc:decode_base64(Scram#scram.salt),
Scram#scram.iterationcount};
_ -> false
end.
@@ -480,9 +480,9 @@ password_to_scram(Password, IterationCount) ->
StoredKey =
scram:stored_key(scram:client_key(SaltedPassword)),
ServerKey = scram:server_key(SaltedPassword),
- #scram{storedkey = aux:encode_base64(StoredKey),
- serverkey = aux:encode_base64(ServerKey),
- salt = aux:encode_base64(Salt),
+ #scram{storedkey = misc:encode_base64(StoredKey),
+ serverkey = misc:encode_base64(ServerKey),
+ salt = misc:encode_base64(Salt),
iterationcount = IterationCount}.
is_password_scram_valid(Password, Scram) ->
@@ -491,12 +491,12 @@ is_password_scram_valid(Password, Scram) ->
false;
_ ->
IterationCount = Scram#scram.iterationcount,
- Salt = aux:decode_base64(Scram#scram.salt),
+ Salt = misc:decode_base64(Scram#scram.salt),
SaltedPassword = scram:salted_password(Password, Salt,
IterationCount),
StoredKey =
scram:stored_key(scram:client_key(SaltedPassword)),
- aux:decode_base64(Scram#scram.storedkey) == StoredKey
+ misc:decode_base64(Scram#scram.storedkey) == StoredKey
end.
export(_Server) ->