crypto, public_key & ssl: Make more functions accept integer keys

7 files changed, 48 insertions, 70 deletions

diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 9d43a1d907..98ebb21f29 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -3087,7 +3087,7 @@ static ERL_NIF_TERM ec_key_to_term_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
 	    pub_key = point2term(env, group, public_key, EC_KEY_get_conv_form(obj->key));
     }
 
-    return enif_make_tuple2(env, bn2term(env, priv_key), pub_key);
+    return enif_make_tuple2(env, pub_key, bn2term(env, priv_key));
 #else
     return atom_notsup;
 #endif
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 03a46c6e03..bdccfee341 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -60,6 +60,7 @@
     <title>DATA TYPES </title>
     
     <p><code>key_value()  = integer() | binary() </code></p>
+    <p>Always <c>binary()</c> when used as return value</p>
 
     <p><code>rsa_public()  = [key_value()] = [E, N]  </code></p>
     <p> Where E is the public exponent and N is public modulus. </p>
@@ -77,7 +78,7 @@
     <p><code>dss_private() =  [key_value()] = [P, Q, G, X] </code></p>
     <p>Where P, Q and G are the dss parameters and X is the private key.</p>
 
-    <p><code>srp_public() = binary() </code></p>
+    <p><code>srp_public() = key_value() </code></p>
     <p>Where is <c>A</c> or <c>B</c> from <url href="http://srp.stanford.edu/design.html">SRP design</url></p>
 
     <p><code>srp_private() = key_value() </code></p>
@@ -88,15 +89,15 @@
     Version = '3' |  '6' |  '6a'
     </p>
 
-    <p><code>dh_public() = binary() </code></p>
+    <p><code>dh_public() = key_value() </code></p>
 
-    <p><code>dh_private() = binary() </code></p>
+    <p><code>dh_private() = key_value() </code></p>
 
     <p><code>dh_params() = [key_value()] = [P, G] </code></p>
 
-    <p><code>ecdh_public() = binary() </code></p>
+    <p><code>ecdh_public() = key_value() </code></p>
 
-    <p><code>ecdh_private() = integer() </code></p>
+    <p><code>ecdh_private() = key_value() </code></p>
 
     <p><code>ecdh_params() =  ec_named_curve() |
     {ec_field(), Prime :: key_value(), Point :: key_value(), Order :: integer(), CoFactor :: none | integer()} </code></p>
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 7067f8df10..696b182436 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -226,15 +226,14 @@
 %%-type ecdsa_digest_type() :: 'md5' | 'sha' | 'sha256' | 'sha384' | 'sha512'.
 -type data_or_digest() :: binary() | {digest, binary()}.
 -type crypto_integer() :: binary() | integer().
--type ec_key_res() :: any().		%% nif resource
--type ec_named_curve() :: atom().
--type ec_point() :: crypto_integer().
--type ec_basis() :: {tpbasis, K :: non_neg_integer()} | {ppbasis, K1 :: non_neg_integer(), K2 :: non_neg_integer(), K3 :: non_neg_integer()} | onbasis.
--type ec_field() :: {prime_field, Prime :: integer()} | {characteristic_two_field, M :: integer(), Basis :: ec_basis()}.
--type ec_prime() :: {A :: crypto_integer(), B :: crypto_integer(), Seed :: binary() | none}.
--type ec_curve_spec() :: {Field :: ec_field(), Prime :: ec_prime(), Point :: crypto_integer(), Order :: integer(), CoFactor :: none | integer()}.
--type ec_curve() :: ec_named_curve() | ec_curve_spec().
--type ec_key() :: {Curve :: ec_curve(), PrivKey :: binary() | undefined, PubKey :: ec_point() | undefined}.
+%%-type ec_named_curve() :: atom().
+%%-type ec_point() :: crypto_integer().
+%%-type ec_basis() :: {tpbasis, K :: non_neg_integer()} | {ppbasis, K1 :: non_neg_integer(), K2 :: non_neg_integer(), K3 :: non_neg_integer()} | onbasis.
+%%-type ec_field() :: {prime_field, Prime :: integer()} | {characteristic_two_field, M :: integer(), Basis :: ec_basis()}.
+%%-type ec_prime() :: {A :: crypto_integer(), B :: crypto_integer(), Seed :: binary() | none}.
+%%-type ec_curve_spec() :: {Field :: ec_field(), Prime :: ec_prime(), Point :: crypto_integer(), Order :: integer(), CoFactor :: none | integer()}.
+%%-type ec_curve() :: ec_named_curve() | ec_curve_spec().
+%%-type ec_key() :: {Curve :: ec_curve(), PrivKey :: binary() | undefined, PubKey :: ec_point() | undefined}.
 
 -define(nif_stub,nif_stub_error(?LINE)).
 
@@ -1088,7 +1087,7 @@ verify(rsa, Type, DataOrDigest, Signature, Key) ->
 	Bool -> Bool
     end;
 verify(ecdsa, Type, DataOrDigest, Signature, [Key, Curve]) ->
-    case ecdsa_verify_nif(Type, DataOrDigest, Signature, term_to_ec_key({Curve, undefined, Key})) of
+    case ecdsa_verify_nif(Type, DataOrDigest, Signature, term_to_ec_key(Curve, undefined, Key)) of
 	notsup -> erlang:error(notsup);
 	Bool -> Bool
     end.
@@ -1155,7 +1154,7 @@ sign(dss, Type, DataOrDigest, Key) ->
 	Sign -> Sign
     end;
 sign(ecdsa, Type, DataOrDigest, [Key, Curve]) ->
-    case ecdsa_sign_nif(Type, DataOrDigest, term_to_ec_key({Curve, Key, undefined})) of
+    case ecdsa_sign_nif(Type, DataOrDigest, term_to_ec_key(Curve, Key, undefined)) of
 	error -> erlang:error(badkey, [Type,DataOrDigest,Key]);
 	Sign -> Sign
     end.
@@ -1417,7 +1416,8 @@ generate_key(Type, Params) ->
     generate_key(Type, Params, undefined).
 
 generate_key(dh, DHParameters, PrivateKey) ->
-    dh_generate_key_nif(PrivateKey,  map_ensure_int_as_bin(DHParameters), 0);
+    dh_generate_key_nif(ensure_int_as_bin(PrivateKey),
+			map_ensure_int_as_bin(DHParameters), 0);
 
 generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, PrivArg)
   when is_binary(Verifier), is_binary(Generator), is_binary(Prime), is_atom(Version) ->
@@ -1436,14 +1436,16 @@ generate_key(srp, {user, [Generator, Prime, Version]}, PrivateArg)
     user_srp_gen_key(Private, Generator, Prime);
 
 generate_key(ecdh, Curve, undefined) ->
-    ec_key_to_term(ec_key_generate(Curve)).
+    ec_key_to_term_nif(ec_key_generate(Curve)).
 
 
 ec_key_generate(_Key) -> ?nif_stub.
 
 
 compute_key(dh, OthersPublicKey, MyPrivateKey, DHParameters) ->
-    case dh_compute_key_nif(OthersPublicKey,MyPrivateKey, map_ensure_int_as_bin(DHParameters)) of
+    case dh_compute_key_nif(ensure_int_as_bin(OthersPublicKey),
+			    ensure_int_as_bin(MyPrivateKey),
+			    map_ensure_int_as_bin(DHParameters)) of
 	error -> erlang:error(computation_failed,
 			      [OthersPublicKey,MyPrivateKey,DHParameters]);
 	Ret -> Ret
@@ -1453,34 +1455,34 @@ compute_key(srp, HostPublic, {UserPublic, UserPrivate},
 	    {user, [DerivedKey, Prime, Generator, Version | ScramblerArg]}) when
       is_binary(Prime),
       is_binary(Generator),
-      is_binary(UserPublic),
       is_binary(UserPrivate),
-      is_binary(HostPublic),
       is_atom(Version) ->
+    HostPubBin = ensure_int_as_bin(HostPublic),
     Multiplier = srp_multiplier(Version, Generator, Prime),
     Scrambler = case ScramblerArg of
-		    [] -> srp_scrambler(Version, UserPublic, HostPublic, Prime);
+		    [] -> srp_scrambler(Version, ensure_int_as_bin(UserPublic),
+					HostPubBin, Prime);
 		    [S] -> S
 		end,
-    srp_user_secret_nif(UserPrivate, Scrambler, HostPublic, Multiplier,
+    srp_user_secret_nif(UserPrivate, Scrambler, HostPubBin, Multiplier,
 			  Generator, DerivedKey, Prime);
 
 compute_key(srp, UserPublic, {HostPublic, HostPrivate},
 	    {host,[Verifier, Prime, Version | ScramblerArg]}) when
       is_binary(Verifier),
       is_binary(Prime),
-      is_binary(UserPublic),
-      is_binary(HostPublic),
       is_binary(HostPrivate),
       is_atom(Version) ->
+    UserPubBin = ensure_int_as_bin(UserPublic),
     Scrambler = case ScramblerArg of
-		    [] -> srp_scrambler(Version, UserPublic, HostPublic, Prime);
+		    [] -> srp_scrambler(Version, UserPubBin, ensure_int_as_bin(HostPublic), Prime);
 		    [S] -> S
 		end,
-    srp_host_secret_nif(Verifier, HostPrivate, Scrambler, UserPublic, Prime);
+    srp_host_secret_nif(Verifier, HostPrivate, Scrambler, UserPubBin, Prime);
 
 compute_key(ecdh, Others, My, Curve) ->
-    ecdh_compute_key_nif(Others, term_to_ec_key({Curve,My,undefined})).
+    ecdh_compute_key_nif(ensure_int_as_bin(Others),
+			 term_to_ec_key(Curve,My,undefined)).
 
 ecdh_compute_key_nif(_Others, _My) -> ?nif_stub.
 
@@ -1488,14 +1490,6 @@ ecdh_compute_key_nif(_Others, _My) -> ?nif_stub.
 %%
 %% EC
 %%
-ec_key_to_term(Key) ->
-    case ec_key_to_term_nif(Key) of
-        {PrivKey, PubKey} ->
-            {PubKey,  bin_to_int(PrivKey)};
-        _ ->
-            erlang:error(conversion_failed)
-    end.
-
 ec_key_to_term_nif(_Key) -> ?nif_stub.
 
 term_to_nif_prime({prime_field, Prime}) ->
@@ -1510,11 +1504,10 @@ term_to_nif_curve_parameters(Curve) when is_atom(Curve) ->
     %% named curve
     Curve.
 
--spec term_to_ec_key(ec_key()) -> ec_key_res().
-term_to_ec_key({Curve, undefined, PubKey}) ->
-    term_to_ec_key_nif(term_to_nif_curve_parameters(Curve), undefined, PubKey);
-term_to_ec_key({Curve, PrivKey, PubKey}) ->
-    term_to_ec_key_nif(term_to_nif_curve_parameters(Curve), int_to_bin(PrivKey), PubKey).
+term_to_ec_key(Curve, PrivKey, PubKey) ->
+    term_to_ec_key_nif(term_to_nif_curve_parameters(Curve),
+		       ensure_int_as_bin(PrivKey),
+		       ensure_int_as_bin(PubKey)).
 
 term_to_ec_key_nif(_Curve, _PrivKey, _PubKey) -> ?nif_stub.
 
diff --git a/lib/inets/test/erl_make_certs.erl b/lib/inets/test/erl_make_certs.erl
index 4ca2907a73..22dc951ac1 100644
--- a/lib/inets/test/erl_make_certs.erl
+++ b/lib/inets/test/erl_make_certs.erl
@@ -406,10 +406,10 @@ gen_dsa2(LSize, NSize) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 gen_ec2(CurveId) ->
-     {PrivKey, PubKey} = crypto:generate_key(ecdh, CurveId),
+     {PubKey, PrivKey} = crypto:generate_key(ecdh, CurveId),
 
     #'ECPrivateKey'{version = 1,
-		    privateKey = int2list(PrivKey),
+		    privateKey = binary_to_list(PrivKey),
 		    parameters = {namedCurve, pubkey_cert_records:namedCurves(CurveId)},
 		    publicKey = {0, PubKey}}.
 
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)>>).
diff --git a/lib/public_key/test/erl_make_certs.erl b/lib/public_key/test/erl_make_certs.erl
index b153046015..5926794ca8 100644
--- a/lib/public_key/test/erl_make_certs.erl
+++ b/lib/public_key/test/erl_make_certs.erl
@@ -403,22 +403,18 @@ gen_dsa2(LSize, NSize) ->
 	    Y = crypto:mod_pow(G, X, P), %% Calculate y = g^x mod p.
 	    
 	    #'DSAPrivateKey'{version=0, p = P, q = Q, 
-			     g = crypto:binary_to_integer(G), y = crypto:binary_to_integer(Y), x = X}
+			     g = crypto:bytes_to_integer(G), y = crypto:bytes_to_integer(Y), x = X}
     end.
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EC key generation  (OBS: for testing only)
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-int2list(I) ->
-    L = (length(integer_to_list(I, 16)) + 1) div 2,
-    binary_to_list(<<I:(L*8)>>).
-
 gen_ec2(CurveId) ->
-     {PrivKey, PubKey} = crypto:generate_key(ecdh, CurveId),
+     {PubKey, PrivKey} = crypto:generate_key(ecdh, CurveId),
 
     #'ECPrivateKey'{version = 1,
-		    privateKey = int2list(PrivKey),
+		    privateKey = binary_to_list(PrivKey),
 		    parameters = {namedCurve, pubkey_cert_records:namedCurves(CurveId)},
 		    publicKey = {0, PubKey}}.
 
@@ -451,7 +447,7 @@ is_prime(_, 0) -> true;
 is_prime(Candidate, Test) -> 
     CoPrime = odd_rand(10000, Candidate),
     Result = crypto:mod_pow(CoPrime, Candidate, Candidate) ,
-    is_prime(CoPrime, crypto:binary_to_integer(Result), Candidate, Test).
+    is_prime(CoPrime, crypto:bytes_to_integer(Result), Candidate, Test).
 
 is_prime(CoPrime, CoPrime, Candidate, Test) ->
     is_prime(Candidate, Test-1);
diff --git a/lib/ssl/test/erl_make_certs.erl b/lib/ssl/test/erl_make_certs.erl
index be46fd0d46..22dc951ac1 100644
--- a/lib/ssl/test/erl_make_certs.erl
+++ b/lib/ssl/test/erl_make_certs.erl
@@ -398,22 +398,18 @@ gen_dsa2(LSize, NSize) ->
 	    Y = crypto:mod_pow(G, X, P), %% Calculate y = g^x mod p.
 	    
 	    #'DSAPrivateKey'{version=0, p = P, q = Q, 
-			     g = crypto:binary_to_integer(G), y = crypto:binary_to_integer(Y), x = X}
+			     g = crypto:bytes_to_integer(G), y = crypto:bytes_to_integer(Y), x = X}
     end.
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EC key generation  (OBS: for testing only)
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-int2list(I) ->
-    L = (length(integer_to_list(I, 16)) + 1) div 2,
-    binary_to_list(<<I:(L*8)>>).
-
 gen_ec2(CurveId) ->
      {PubKey, PrivKey} = crypto:generate_key(ecdh, CurveId),
 
     #'ECPrivateKey'{version = 1,
-		    privateKey = int2list(PrivKey),
+		    privateKey = binary_to_list(PrivKey),
 		    parameters = {namedCurve, pubkey_cert_records:namedCurves(CurveId)},
 		    publicKey = {0, PubKey}}.
 
@@ -446,7 +442,7 @@ is_prime(_, 0) -> true;
 is_prime(Candidate, Test) -> 
     CoPrime = odd_rand(10000, Candidate),
     Result = crypto:mod_pow(CoPrime, Candidate, Candidate) ,
-    is_prime(CoPrime, crypto:binary_to_integer(Result), Candidate, Test).
+    is_prime(CoPrime, crypto:bytes_to_integer(Result), Candidate, Test).
 
 is_prime(CoPrime, CoPrime, Candidate, Test) ->
     is_prime(Candidate, Test-1);