]> granicus.if.org Git - ejabberd/commitdiff
Replace calls of OTP's Binary, since they would require R14
authorBadlop <badlop@process-one.net>
Sun, 4 Sep 2011 12:56:56 +0000 (14:56 +0200)
committerBadlop <badlop@process-one.net>
Sun, 4 Sep 2011 12:56:56 +0000 (14:56 +0200)
src/scram.erl

index 30bd6bb279c4f76fdbb7039b3a575678c5875a14..dc1490189f70535e883f196e04e78b40476071d4 100644 (file)
@@ -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)))).