diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2017-04-11 12:13:58 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2017-04-11 12:13:58 +0200 |
| commit | b1acd1183f1ce176a4703528d7d25b9dd3ee89f4 (patch) | |
| tree | 9339705c26123538d94ad1fc62011b02517e6e98 /src/ejabberd_auth_riak.erl | |
| parent | Use p1_utils 1.0.8 (diff) | |
Rename aux.erl as misc.erl
Thanks Microsoft Windows to not support some filenames
Diffstat (limited to 'src/ejabberd_auth_riak.erl')
| -rw-r--r-- | src/ejabberd_auth_riak.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ejabberd_auth_riak.erl b/src/ejabberd_auth_riak.erl index 2b27a81c..c41e8f63 100644 --- a/src/ejabberd_auth_riak.erl +++ b/src/ejabberd_auth_riak.erl @@ -108,7 +108,7 @@ check_password(User, AuthzId, Server, Password, Digest, end; {ok, #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 @@ -213,9 +213,9 @@ get_password(User, Server) -> Password; {ok, #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. @@ -287,9 +287,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) -> @@ -298,12 +298,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) -> |