diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-05-23 10:43:26 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-05-23 10:43:26 +0300 |
| commit | e93762a720ee7b29d918e92e36b0ca640ed29821 (patch) | |
| tree | c9b049f461f3da3bff6b072d6e74c633191e3cc7 /src/ejabberd_auth.erl | |
| parent | Validate all certfiles on startup (diff) | |
Deprecate misc:encode_base64/1 and misc:decode_base64/1
Diffstat (limited to 'src/ejabberd_auth.erl')
| -rw-r--r-- | src/ejabberd_auth.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl index 230bd87b..251e36ff 100644 --- a/src/ejabberd_auth.erl +++ b/src/ejabberd_auth.erl @@ -645,10 +645,10 @@ is_password_scram_valid(Password, Scram) -> false; _ -> IterationCount = Scram#scram.iterationcount, - Salt = misc:decode_base64(Scram#scram.salt), + Salt = base64:decode(Scram#scram.salt), SaltedPassword = scram:salted_password(Password, Salt, IterationCount), StoredKey = scram:stored_key(scram:client_key(SaltedPassword)), - misc:decode_base64(Scram#scram.storedkey) == StoredKey + base64:decode(Scram#scram.storedkey) == StoredKey end. password_to_scram(Password) -> @@ -661,9 +661,9 @@ password_to_scram(Password, IterationCount) -> SaltedPassword = scram:salted_password(Password, Salt, IterationCount), StoredKey = scram:stored_key(scram:client_key(SaltedPassword)), ServerKey = scram:server_key(SaltedPassword), - #scram{storedkey = misc:encode_base64(StoredKey), - serverkey = misc:encode_base64(ServerKey), - salt = misc:encode_base64(Salt), + #scram{storedkey = base64:encode(StoredKey), + serverkey = base64:encode(ServerKey), + salt = base64:encode(Salt), iterationcount = IterationCount}. %%%---------------------------------------------------------------------- @@ -744,7 +744,7 @@ auth_modules(Server) -> match_passwords(Password, #scram{} = Scram, <<"">>, undefined) -> is_password_scram_valid(Password, Scram); match_passwords(Password, #scram{} = Scram, Digest, DigestFun) -> - StoredKey = misc:decode_base64(Scram#scram.storedkey), + StoredKey = base64:decode(Scram#scram.storedkey), DigRes = if Digest /= <<"">> -> Digest == DigestFun(StoredKey); true -> false |