From c47e4babacedbac46d441228b514b2e650392cf7 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 23 Apr 2013 16:54:36 +0200
Subject: crypto: Combine ec_key_new into ecdh_generate_key

and remove curve from the returned tuple.
---
 lib/crypto/src/crypto.erl | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

(limited to 'lib/crypto/src')

diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 6f4092ea74..999a65042d 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -1226,39 +1226,20 @@ srp_compute_key(Verifier, Prime, ClientPublic, ServerPublic, ServerPrivate, Vers
 %%
 %% EC
 %%
--spec ec_key_new(ec_named_curve()) -> ec_key_res().
-ec_key_new(_Curve) -> ?nif_stub.
 
-ecdh_generate_key(Curve) when is_atom(Curve) ->
-    ECKey = ec_key_new(Curve),
-    ec_key_generate(ECKey),
-    ec_key_to_term(ECKey);
-ecdh_generate_key(Key) ->
-    ECKey = term_to_ec_key(Key),
-    ec_key_generate(ECKey),
-    ec_key_to_term(ECKey).
+-spec ecdh_generate_key(ec_curve()) -> ec_key() | error.
+ecdh_generate_key(Curve) ->
+    ec_key_to_term(ec_key_generate(Curve)).
 
 
--spec ec_key_generate(ec_key_res()) -> ok | error.
 ec_key_generate(_Key) -> ?nif_stub.
 
-nif_prime_to_term({prime_field, Prime}) ->
-    {prime_field, bin_to_int(Prime)};
-nif_prime_to_term(PrimeField) ->
-    PrimeField.
-nif_curve_to_term({A, B, Seed}) ->
-    {bin_to_int(A), bin_to_int(B), Seed}.
-nif_curve_parameters_to_term({PrimeField, Curve, BasePoint, Order, CoFactor}) ->
-    {nif_prime_to_term(PrimeField), nif_curve_to_term(Curve), BasePoint, bin_to_int(Order), bin_to_int(CoFactor)};
-nif_curve_parameters_to_term(Curve) when is_atom(Curve) ->
-    %% named curve
-    Curve.
 
 -spec ec_key_to_term(ec_key_res()) -> ec_key().
 ec_key_to_term(Key) ->
     case ec_key_to_term_nif(Key) of
-        {Curve, PrivKey, PubKey} ->
-            {nif_curve_parameters_to_term(Curve), bin_to_int(PrivKey), PubKey};
+        {PrivKey, PubKey} ->
+            {bin_to_int(PrivKey), PubKey};
         _ ->
             erlang:error(conversion_failed)
     end.
-- 
cgit v1.2.3