diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-05-16 20:04:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-05-22 10:51:18 +0200 |
| commit | 16d06da9fb425fe652f3826275f3f9bf87c881f0 (patch) | |
| tree | d800970cb14e172725d52b50504652864ceef008 /lib/crypto | |
| parent | 355e919653c8178b9144db9e0fa01c329e077de4 (diff) | |
| download | otp-16d06da9fb425fe652f3826275f3f9bf87c881f0.tar.gz otp-16d06da9fb425fe652f3826275f3f9bf87c881f0.tar.bz2 otp-16d06da9fb425fe652f3826275f3f9bf87c881f0.zip | |
crypto,ssh, netconf, inets: binary_to_integer -> bytes_to_integer
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 6 | ||||
| -rw-r--r-- | lib/crypto/src/crypto.erl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index 227602072e..03a46c6e03 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -180,7 +180,7 @@ </func> <func> - <name>binary_to_integer(Bin) -> Integer </name> + <name>bytes_to_integer(Bin) -> Integer </name> <fsummary>Convert binary representation, of an integer, to an Erlang integer.</fsummary> <type> <v>Bin = binary() - as returned by crypto functions</v> @@ -568,7 +568,7 @@ </type> <desc> <p>Creates a digital signature.</p> - <p>Algoritm <c>dss</c> can only be used together with digest type + <p>Algorithm <c>dss</c> can only be used together with digest type <c>sha</c>.</p> See also <seealso marker="public_key:public_key#sign/3">public_key:sign/3</seealso> </desc> @@ -697,7 +697,7 @@ </type> <desc> <p>Verifies a digital signature</p> - <p>Algoritm <c>dss</c> can only be used together with digest type + <p>Algorithm <c>dss</c> can only be used together with digest type <c>sha</c>.</p> See also <seealso marker="public_key:public_key#sign/3">public_key:verify/3</seealso> diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index ecb9f6a93e..c84d17346b 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -21,7 +21,7 @@ -module(crypto). --export([start/0, stop/0, info_lib/0, supports/0, version/0, binary_to_integer/1]). +-export([start/0, stop/0, info_lib/0, supports/0, version/0, bytes_to_integer/1]). -export([hash/2, hash_init/1, hash_update/2, hash_final/1]). -export([sign/4, verify/5]). -export([generate_key/2, generate_key/3, compute_key/4]). @@ -1618,7 +1618,7 @@ int_to_bin_neg(-1, Ds=[MSB|_]) when MSB >= 16#80 -> int_to_bin_neg(X,Ds) -> int_to_bin_neg(X bsr 8, [(X band 255)|Ds]). -binary_to_integer(Bin) -> +bytes_to_integer(Bin) -> bin_to_int(Bin). bin_to_int(Bin) when is_binary(Bin) -> |