diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2011-09-05 16:53:10 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2011-09-05 16:53:10 +1000 |
| commit | ab2a298ebf64333fc46881c9aee704cfbbbf111f (patch) | |
| tree | 8b840932cd67f239971b8b277b556bf419327f3b /src | |
| parent | Export do_client_version/3 in order to shut up the dialyzer (diff) | |
| parent | Replace calls of OTP's Binary, since they would require R14 (diff) | |
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/scram.erl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/scram.erl b/src/scram.erl index 30bd6bb27..dc1490189 100644 --- a/src/scram.erl +++ b/src/scram.erl @@ -53,29 +53,29 @@ client_signature(StoredKey, AuthMessage) -> crypto:sha_mac(StoredKey, AuthMessage). client_key(ClientProof, ClientSignature) -> - binary:list_to_bin(lists:zipwith(fun(X, Y) -> + list_to_binary(lists:zipwith(fun(X, Y) -> X bxor Y end, - binary:bin_to_list(ClientProof), - binary:bin_to_list(ClientSignature))). + binary_to_list(ClientProof), + binary_to_list(ClientSignature))). server_signature(ServerKey, AuthMessage) -> crypto:sha_mac(ServerKey, AuthMessage). hi(Password, Salt, IterationCount) -> - U1 = crypto:sha_mac(Password, string:concat(binary:bin_to_list(Salt), [0,0,0,1])), - binary:list_to_bin(lists:zipwith(fun(X, Y) -> + U1 = crypto:sha_mac(Password, string:concat(binary_to_list(Salt), [0,0,0,1])), + list_to_binary(lists:zipwith(fun(X, Y) -> X bxor Y end, - binary:bin_to_list(U1), - binary:bin_to_list(hi_round(Password, U1, IterationCount-1)))). + binary_to_list(U1), + binary_to_list(hi_round(Password, U1, IterationCount-1)))). hi_round(Password, UPrev, 1) -> crypto:sha_mac(Password, UPrev); hi_round(Password, UPrev, IterationCount) -> U = crypto:sha_mac(Password, UPrev), - binary:list_to_bin(lists:zipwith(fun(X, Y) -> + list_to_binary(lists:zipwith(fun(X, Y) -> X bxor Y end, - binary:bin_to_list(U), - binary:bin_to_list(hi_round(Password, U, IterationCount-1)))). + binary_to_list(U), + binary_to_list(hi_round(Password, U, IterationCount-1)))). |