diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-03-30 14:17:13 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-03-30 14:17:13 +0300 |
| commit | 7bcbea210800e67045a9a58448a2e695d073246b (patch) | |
| tree | 338585281c0893ddb776313cc240ecc2d3853cef /src/ejabberd_auth_sql.erl | |
| parent | Merge pull request #1646 from weiss/custom-headers (diff) | |
Deprecate jlib.erl in favor of aux.erl
Since the main goal of jlib.erl is lost, all auxiliary functions
are now moved to aux.erl, and the whole jlib.erl is now deprecated.
Diffstat (limited to 'src/ejabberd_auth_sql.erl')
| -rw-r--r-- | src/ejabberd_auth_sql.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ejabberd_auth_sql.erl b/src/ejabberd_auth_sql.erl index 2cc7a278a..a01b408f5 100644 --- a/src/ejabberd_auth_sql.erl +++ b/src/ejabberd_auth_sql.erl @@ -301,9 +301,9 @@ get_password(User, Server) -> LServer, LUser) of {selected, [{StoredKey, ServerKey, Salt, IterationCount}]} -> - {jlib:decode_base64(StoredKey), - jlib:decode_base64(ServerKey), - jlib:decode_base64(Salt), + {aux:decode_base64(StoredKey), + aux:decode_base64(ServerKey), + aux:decode_base64(Salt), IterationCount}; _ -> false end; @@ -423,9 +423,9 @@ password_to_scram(Password, IterationCount) -> StoredKey = scram:stored_key(scram:client_key(SaltedPassword)), ServerKey = scram:server_key(SaltedPassword), - #scram{storedkey = jlib:encode_base64(StoredKey), - serverkey = jlib:encode_base64(ServerKey), - salt = jlib:encode_base64(Salt), + #scram{storedkey = aux:encode_base64(StoredKey), + serverkey = aux:encode_base64(ServerKey), + salt = aux:encode_base64(Salt), iterationcount = IterationCount}. is_password_scram_valid_stored(Pass, {scram,Pass,<<>>,<<>>,0}, LUser, LServer) -> @@ -443,12 +443,12 @@ is_password_scram_valid(Password, Scram) -> false; _ -> IterationCount = Scram#scram.iterationcount, - Salt = jlib:decode_base64(Scram#scram.salt), + Salt = aux:decode_base64(Scram#scram.salt), SaltedPassword = scram:salted_password(Password, Salt, IterationCount), StoredKey = scram:stored_key(scram:client_key(SaltedPassword)), - jlib:decode_base64(Scram#scram.storedkey) == StoredKey + aux:decode_base64(Scram#scram.storedkey) == StoredKey end. -define(BATCH_SIZE, 1000). |