diff options
| author | Sverker Eriksson <[email protected]> | 2013-05-16 20:08:50 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-05-24 23:30:37 +0200 |
| commit | 6518a54dbbbadb01f546e0e8c3dd3c3dfdf93e13 (patch) | |
| tree | a2c907a2418edd6dce73d77834589c5c1da3dc87 /lib/public_key/src | |
| parent | ee2d14442698039cfd1a98c7a8ce4a9331166c16 (diff) | |
| download | otp-6518a54dbbbadb01f546e0e8c3dd3c3dfdf93e13.tar.gz otp-6518a54dbbbadb01f546e0e8c3dd3c3dfdf93e13.tar.bz2 otp-6518a54dbbbadb01f546e0e8c3dd3c3dfdf93e13.zip | |
crypto, public_key & ssl: Make more functions accept integer keys
Diffstat (limited to 'lib/public_key/src')
| -rw-r--r-- | lib/public_key/src/public_key.erl | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 56e7844d5d..3eea6f6ec4 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -347,7 +347,7 @@ generate_key(#'ECParameters'{} = Params) -> compute_key(#'ECPoint'{point = Point}, #'ECPrivateKey'{privateKey = PrivKey, parameters = Param}) -> ECCurve = ec_curve_spec(Param), - crypto:compute_key(ecdh, Point, list2int(PrivKey), ECCurve). + crypto:compute_key(ecdh, Point, list_to_binary(PrivKey), ECCurve). compute_key(PubKey, PrivKey, #'DHParameter'{prime = P, base = G}) -> crypto:compute_key(dh, PubKey, PrivKey, [P, G]). @@ -402,7 +402,7 @@ sign(DigestOrPlainText, sha, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) -> sign(DigestOrPlainText, DigestType, #'ECPrivateKey'{privateKey = PrivKey, parameters = Param}) -> ECCurve = ec_curve_spec(Param), - crypto:sign(ecdsa, DigestType, DigestOrPlainText, [list2int(PrivKey), ECCurve]); + crypto:sign(ecdsa, DigestType, DigestOrPlainText, [list_to_binary(PrivKey), ECCurve]); %% Backwards compatible sign(Digest, none, #'DSAPrivateKey'{} = Key) -> @@ -880,14 +880,6 @@ ec_curve_spec({namedCurve, OID}) -> ec_key({PubKey, PrivateKey}, Params) -> #'ECPrivateKey'{version = 1, - privateKey = int2list(PrivateKey), + privateKey = binary_to_list(PrivateKey), parameters = Params, publicKey = {0, PubKey}}. - -list2int(L) -> - S = length(L) * 8, - <<R:S/integer>> = erlang:iolist_to_binary(L), - R. -int2list(I) -> - L = (length(integer_to_list(I, 16)) + 1) div 2, - binary_to_list(<<I:(L*8)>>). |