crypto: Add generic functions generate_key and compute_key

and remove corresponding specific functions for srp and ecdh
but leave dh_ functions for backward compatibility.

1 files changed, 30 insertions, 23 deletions

diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 384d15c68c..473609778c 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -1864,13 +1864,16 @@ dh(Config) when is_list(Config) ->
 	{param, DHPs} ->
 	    timer:sleep(100), 
 	    io:format("DHP ~p~n", [DHPs]),
-	    ?line {Pub1,Priv1} = crypto:dh_generate_key(DHPs),
+	    DHPs_mpint = lists:map(fun(E) -> sized_binary(E) end, DHPs),
+	    ?line {Pub1,Priv1} = crypto:generate_key(dh, DHPs),
 	    io:format("Key1:~n~p~n~p~n~n", [Pub1,Priv1]),
-	    ?line {Pub2,Priv2} = crypto:dh_generate_key(DHPs),
+	    ?line {Pub2,Priv2} = crypto:dh_generate_key(DHPs_mpint),
 	    io:format("Key2:~n~p~n~p~n~n", [Pub2,Priv2]),
-	    ?line A = crypto:dh_compute_key(Pub1, Priv2, DHPs),
+	    ?line A = crypto:compute_key(dh, Pub1, unsized_binary(Priv2), DHPs),
+	    ?line A = crypto:dh_compute_key(sized_binary(Pub1), Priv2, DHPs_mpint),
 	    timer:sleep(100),  %% Get another thread see if that triggers problem
-	    ?line B = crypto:dh_compute_key(Pub2, Priv1, DHPs),
+	    ?line B = crypto:compute_key(dh, unsized_binary(Pub2), Priv1, DHPs),
+	    ?line B = crypto:dh_compute_key(Pub2, sized_binary(Priv1), DHPs_mpint),
 	    io:format("A ~p~n",[A]),
 	    io:format("B ~p~n",[B]),
 	    ?line A = B
@@ -1879,6 +1882,7 @@ dh(Config) when is_list(Config) ->
 	    exit(Pid, kill)
     end.
 
+
 ec(doc) ->
     ["Test ec (Ecliptic Curve) functions."];
 ec(suite) -> [];
@@ -1887,7 +1891,7 @@ ec(Config) when is_list(Config) ->
 
 ec_do() ->
     %% test for a name curve
-    {D2_priv, D2_pub} = crypto:ecdh_generate_key(sect113r2),
+    {D2_priv, D2_pub} = crypto:generate_key(ecdh, sect113r2),
     D2 = {sect113r2, D2_priv, D2_pub},
 
     %%TODO: find a published test case for a EC key
@@ -1985,12 +1989,12 @@ srp3(Config) when is_list(Config) ->
     Verifier = crypto:mod_exp_prime(Generator, UserPassHash, Prime), 
     ClientPublic = crypto:mod_exp_prime(Generator, ClientPrivate, Prime),
 
-    {ClientPublic, ClientPrivate} = crypto:srp_generate_key(Generator, Prime, Version, ClientPrivate),
-    {ServerPublic, ServerPrivate} = crypto:srp_generate_key(Verifier, Generator, Prime, Version, ServerPrivate),
-    SessionKey = crypto:srp_compute_key(UserPassHash, Prime, Generator, ClientPublic,
-					ClientPrivate, ServerPublic, Version, Scrambler),
-    SessionKey = crypto:srp_compute_key(Verifier, Prime, ClientPublic,
-					ServerPublic, ServerPrivate, Version, Scrambler).
+    {ClientPublic, ClientPrivate} = crypto:generate_key(srp, {user, [Generator, Prime, Version]}, ClientPrivate),
+    {ServerPublic, ServerPrivate} = crypto:generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, ServerPrivate),
+    SessionKey = crypto:compute_key(srp, ServerPublic, {ClientPublic, ClientPrivate},
+				    {user, [UserPassHash, Prime, Generator, Version, Scrambler]}),
+    SessionKey = crypto:compute_key(srp, ClientPublic, {ServerPublic, ServerPrivate},
+				    {host, [Verifier, Prime, Version, Scrambler]}).
 
 srp6(doc) ->
     ["SRP-6 test vectors generated by http://srp.stanford.edu/demo/demo.html"];
@@ -2036,12 +2040,12 @@ srp6(Config) when is_list(Config) ->
     Verifier = crypto:mod_exp_prime(Generator, UserPassHash, Prime), 
     ClientPublic = crypto:mod_exp_prime(Generator, ClientPrivate, Prime),
 
-    {ClientPublic, ClientPrivate} = crypto:srp_generate_key(Generator, Prime, Version, ClientPrivate),
-    {ServerPublic, ServerPrivate} = crypto:srp_generate_key(Verifier, Generator, Prime, Version, ServerPrivate),
-    SessionKey = crypto:srp_compute_key(UserPassHash, Prime, Generator, ClientPublic,
-					ClientPrivate, ServerPublic, Version, Scrambler),
-    SessionKey = crypto:srp_compute_key(Verifier, Prime, ClientPublic,
-					ServerPublic, ServerPrivate, Version, Scrambler).
+    {ClientPublic, ClientPrivate} = crypto:generate_key(srp, {user, [Generator, Prime, Version]}, ClientPrivate),
+    {ServerPublic, ServerPrivate} = crypto:generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, ServerPrivate),
+    SessionKey = crypto:compute_key(srp, ServerPublic, {ClientPublic, ClientPrivate},
+				    {user, [UserPassHash, Prime, Generator, Version, Scrambler]}),
+    SessionKey = crypto:compute_key(srp, ClientPublic, {ServerPublic, ServerPrivate},
+				    {host, [Verifier, Prime, Version, Scrambler]}).
 
 srp6a(doc) ->
     ["SRP-6a test vectors from RFC5054."];
@@ -2086,13 +2090,13 @@ srp6a(Config) when is_list(Config) ->
     UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
     Verifier = crypto:mod_exp_prime(Generator, UserPassHash, Prime), 
 
-    {ClientPublic, ClientPrivate} = crypto:srp_generate_key(Generator, Prime, Version, ClientPrivate),
-    {ServerPublic, ServerPrivate} = crypto:srp_generate_key(Verifier, Generator, Prime, Version, ServerPrivate),
+    {ClientPublic, ClientPrivate} = crypto:generate_key(srp, {user, [Generator, Prime, Version]}, ClientPrivate),
+    {ServerPublic, ServerPrivate} = crypto:generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, ServerPrivate),
 
-    SessionKey = crypto:srp_compute_key(UserPassHash, Prime, Generator, ClientPublic,
-					ClientPrivate, ServerPublic, Version, Scrambler),
-    SessionKey = crypto:srp_compute_key(Verifier, Prime, ClientPublic,
-					ServerPublic, ServerPrivate, Version, Scrambler).
+    SessionKey = crypto:compute_key(srp, ServerPublic, {ClientPublic, ClientPrivate},
+				    {user, [UserPassHash, Prime, Generator, Version, Scrambler]}),
+    SessionKey = crypto:compute_key(srp, ClientPublic, {ServerPublic, ServerPrivate},
+				    {host, [Verifier, Prime, Version, Scrambler]}).
     
 %%
 %%
@@ -2287,6 +2291,9 @@ sized_binary(Binary) when is_binary(Binary) ->
 sized_binary(List) ->
     sized_binary(list_to_binary(List)).
 
+unsized_binary(<<Sz:32/integer, Binary:Sz/binary>>) ->
+    Binary.
+
 xor_bytes(Bin1, Bin2) when is_binary(Bin1), is_binary(Bin2) ->
     L1 = binary_to_list(Bin1),
     L2 = binary_to_list(Bin2),