ssl, crypto: Eliminate remaining mpint and EC resource key from API

2 files changed, 16 insertions, 14 deletions

diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 43ea1d48fd..f87644b3fe 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -855,8 +855,8 @@ verify(rsa, Type, DataOrDigest, Signature, Key) ->
     	notsup -> erlang:error(notsup);
 	Bool -> Bool
     end;
-verify(ecdsa, Type, DataOrDigest, Signature, Key) ->
-    case ecdsa_verify_nif(Type, DataOrDigest, Signature, term_to_ec_key(Key)) of
+verify(ecdsa, Type, DataOrDigest, Signature, [Key, Curve]) ->
+    case ecdsa_verify_nif(Type, DataOrDigest, Signature, term_to_ec_key({Curve, undefined, Key})) of
 	notsup -> erlang:error(notsup);
 	Bool -> Bool
     end.
@@ -901,6 +901,11 @@ map_ensure_int_as_bin([H|_]=List) when is_integer(H) ->
 map_ensure_int_as_bin(List) ->
     List.
 
+ensure_int_as_bin(Int) when is_integer(Int) ->
+    int_to_bin(Int);
+ensure_int_as_bin(Bin) ->
+    Bin.
+
 map_to_norm_bin([H|_]=List) when is_integer(H) ->
     lists:map(fun(E) -> int_to_bin(E) end, List);
 map_to_norm_bin(List) ->
@@ -917,8 +922,8 @@ sign(dss, Type, DataOrDigest, Key) ->
 	error -> erlang:error(badkey, [DataOrDigest, Key]);
 	Sign -> Sign
     end;
-sign(ecdsa, Type, DataOrDigest, Key) ->
-    case ecdsa_sign_nif(Type, DataOrDigest, term_to_ec_key(Key)) of
+sign(ecdsa, Type, DataOrDigest, [Key, Curve]) ->
+    case ecdsa_sign_nif(Type, DataOrDigest, term_to_ec_key({Curve, Key, undefined})) of
 	error -> erlang:error(badkey, [Type,DataOrDigest,Key]);
 	Sign -> Sign
     end.
@@ -1228,9 +1233,9 @@ term_to_nif_prime({prime_field, Prime}) ->
 term_to_nif_prime(PrimeField) ->
     PrimeField.
 term_to_nif_curve({A, B, Seed}) ->
-    {int_to_bin(A), int_to_bin(B), Seed}.
+    {ensure_int_as_bin(A), ensure_int_as_bin(B), Seed}.
 term_to_nif_curve_parameters({PrimeField, Curve, BasePoint, Order, CoFactor}) ->
-    {term_to_nif_prime(PrimeField), term_to_nif_curve(Curve), BasePoint, int_to_bin(Order), int_to_bin(CoFactor)};
+    {term_to_nif_prime(PrimeField), term_to_nif_curve(Curve), ensure_int_as_bin(BasePoint), int_to_bin(Order), int_to_bin(CoFactor)};
 term_to_nif_curve_parameters(Curve) when is_atom(Curve) ->
     %% named curve
     Curve.
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 473609778c..3ebe10866c 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -1892,8 +1892,8 @@ ec(Config) when is_list(Config) ->
 ec_do() ->
     %% test for a name curve
     {D2_priv, D2_pub} = crypto:generate_key(ecdh, sect113r2),
-    D2 = {sect113r2, D2_priv, D2_pub},
-
+    PrivECDH = [D2_priv, sect113r2],
+    PubECDH = [D2_pub, sect113r2],
     %%TODO: find a published test case for a EC key
 
     %% test for a full specified curve and public key,
@@ -1932,14 +1932,11 @@ ec_do() ->
 			      16#f7, 16#90, 16#1e, 16#0e, 16#82, 16#97, 16#48, 16#56, 16#a7>>,
     CoFactor = 1,
     Curve = {{prime_field,P},{A,B,none},BasePoint, Order,CoFactor},
-    CsCaKey = {Curve, undefined, PubKey},
-    %%T3 = crypto:term_to_ec_key(CsCaKey),
-    %%?line CsCaKey = crypto:ec_key_to_term(T3),
 
     Msg = <<99,234,6,64,190,237,201,99,80,248,58,40,70,45,149,218,5,246,242,63>>,
-    Sign = crypto:sign(ecdsa, sha, Msg, D2),
-    ?line true = crypto:verify(ecdsa, sha, Msg, Sign, D2),
-    ?line false = crypto:verify(ecdsa, sha, Msg, <<10,20>>, D2),
+    Sign = crypto:sign(ecdsa, sha, Msg, PrivECDH),
+    ?line true = crypto:verify(ecdsa, sha, Msg, Sign, PubECDH),
+    ?line false = crypto:verify(ecdsa, sha, Msg, <<10,20>>, PubECDH),
 
     ok.