Merge remote-tracking branch 'upstream/maint'

Conflicts:
	lib/crypto/doc/src/crypto_app.xml

1 files changed, 202 insertions, 110 deletions

diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 08ecad3233..eddb6b83f9 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -76,6 +76,7 @@
 	 rsa_encrypt_decrypt/1,
 	 dh/1,
 	 srp3/1, srp6/1, srp6a/1,
+	 ec/1,
 	 exor_test/1,
 	 rc4_test/1,
 	 rc4_stream_test/1,
@@ -105,7 +106,7 @@ groups() ->
        rand_uniform_test, strong_rand_test,
        rsa_verify_test, dsa_verify_test, rsa_sign_test,
        rsa_sign_hash_test, dsa_sign_test, dsa_sign_hash_test,
-       rsa_encrypt_decrypt, dh, srp3, srp6, srp6a, exor_test,
+       rsa_encrypt_decrypt, dh, srp3, srp6, srp6a, ec, exor_test,
        rc4_test, rc4_stream_test, mod_exp_test, blowfish_cfb64,
        smp]}].
 
@@ -190,8 +191,8 @@ ldd_program() ->
  	Ldd when is_list(Ldd) -> Ldd
     end.
 
-%%
-%%
+
+
 info(doc) ->
     ["Call the info function."];
 info(suite) ->
@@ -207,10 +208,10 @@ info(Config) when is_list(Config) ->
 	    ?line [] = Info -- Exports,
 	    ?line NotInInfo = Exports -- Info,
 	    io:format("NotInInfo = ~p\n", [NotInInfo]),
-	    BlackList = lists:sort([des_ede3_cbc_decrypt, des_ede3_cbc_encrypt,
-				    dh_check, dh_generate_parameters,
-				    module_info, start, stop, version]),
-	    ?line BlackList = NotInInfo,
+	    %% BlackList = lists:sort([des_ede3_cbc_decrypt, des_ede3_cbc_encrypt,
+	    %% 			    dh_check, dh_generate_parameters,
+	    %% 			    module_info, start, stop, version]),
+	    %% ?line BlackList = NotInInfo,
 
 	    ?line InfoLib = crypto:info_lib(),
 	    ?line [_|_] = InfoLib,
@@ -221,10 +222,10 @@ info(Config) when is_list(Config) ->
 			Me(T,Me);
 		   ([],_) ->
 			ok
-		end,	    
+		end,
 	    ?line F(InfoLib,F),
 	    ?line crypto:stop()
-    end.
+     end.
 
 %%
 %%
@@ -359,7 +360,7 @@ hmac_update_sha(Config) when is_list(Config) ->
     ?line Ctx2 = crypto:hmac_update(Ctx, Data),
     ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
     ?line Mac = crypto:hmac_final(Ctx3),
-    ?line Exp = crypto:sha_mac(Key, lists:flatten([Data, Data2])), 
+    ?line Exp = crypto:hmac(sha, Key, lists:flatten([Data, Data2])),
     ?line m(Exp, Mac).
 
 hmac_update_sha256(doc) ->
@@ -381,7 +382,7 @@ hmac_update_sha256_do() ->
     ?line Ctx2 = crypto:hmac_update(Ctx, Data),
     ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
     ?line Mac = crypto:hmac_final(Ctx3),
-    ?line Exp = crypto:sha256_mac(Key, lists:flatten([Data, Data2])),
+    ?line Exp = crypto:hmac(sha256, Key, lists:flatten([Data, Data2])),
     ?line m(Exp, Mac).
 
 hmac_update_sha512(doc) ->
@@ -403,7 +404,7 @@ hmac_update_sha512_do() ->
     ?line Ctx2 = crypto:hmac_update(Ctx, Data),
     ?line Ctx3 = crypto:hmac_update(Ctx2, Data2),
     ?line Mac = crypto:hmac_final(Ctx3),
-    ?line Exp = crypto:sha512_mac(Key, lists:flatten([Data, Data2])),
+    ?line Exp = crypto:hmac(sha512, Key, lists:flatten([Data, Data2])),
     ?line m(Exp, Mac).
     
 hmac_update_md5(doc) ->
@@ -618,68 +619,64 @@ hmac_rfc4231_sha512(suite) ->
 hmac_rfc4231_sha512(Config) when is_list(Config) ->
     if_supported(sha512, fun() -> hmac_rfc4231_sha512_do() end).
 
-hmac_rfc4231_case(Hash, HashFun, case1, Exp) ->
+hmac_rfc4231_case(Hash, case1, Exp) ->
     %% Test 1
     Key = binary:copy(<<16#0b>>, 20),
     Data = <<"Hi There">>,
-    hmac_rfc4231_case(Hash, HashFun, Key, Data, Exp);
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
 
-hmac_rfc4231_case(Hash, HashFun, case2, Exp) ->
+hmac_rfc4231_case(Hash, case2, Exp) ->
     %% Test 2
     Key = <<"Jefe">>,
     Data = <<"what do ya want for nothing?">>,
-    hmac_rfc4231_case(Hash, HashFun, Key, Data, Exp);
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
 
-hmac_rfc4231_case(Hash, HashFun, case3, Exp) ->
+hmac_rfc4231_case(Hash, case3, Exp) ->
     %% Test 3
     Key = binary:copy(<<16#aa>>, 20),
     Data = binary:copy(<<16#dd>>, 50),
-    hmac_rfc4231_case(Hash, HashFun, Key, Data, Exp);
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
 
-hmac_rfc4231_case(Hash, HashFun, case4, Exp) ->
+hmac_rfc4231_case(Hash, case4, Exp) ->
     %% Test 4
     Key = list_to_binary(lists:seq(1, 16#19)),
     Data = binary:copy(<<16#cd>>, 50),
-    hmac_rfc4231_case(Hash, HashFun, Key, Data, Exp);
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
 
-hmac_rfc4231_case(Hash, HashFun, case5, Exp) ->
+hmac_rfc4231_case(Hash, case5, Exp) ->
     %% Test 5
     Key = binary:copy(<<16#0c>>, 20),
     Data = <<"Test With Truncation">>,
-    hmac_rfc4231_case(Hash, HashFun, Key, Data, 16, Exp);
+    hmac_rfc4231_case(Hash, Key, Data, 16, Exp);
 
-hmac_rfc4231_case(Hash, HashFun, case6, Exp) ->
+hmac_rfc4231_case(Hash, case6, Exp) ->
     %% Test 6
     Key = binary:copy(<<16#aa>>, 131),
     Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
-    hmac_rfc4231_case(Hash, HashFun, Key, Data, Exp);
+    hmac_rfc4231_case(Hash, Key, Data, Exp);
 
-hmac_rfc4231_case(Hash, HashFun, case7, Exp) ->
+hmac_rfc4231_case(Hash, case7, Exp) ->
     %% Test Case 7
     Key = binary:copy(<<16#aa>>, 131),
     Data = <<"This is a test using a larger than block-size key and a larger t",
 	     "han block-size data. The key needs to be hashed before being use",
 	     "d by the HMAC algorithm.">>,
-    hmac_rfc4231_case(Hash, HashFun, Key, Data, Exp).
+    hmac_rfc4231_case(Hash, Key, Data, Exp).
 
-hmac_rfc4231_case(Hash, HashFun, Key, Data, Exp) ->
+hmac_rfc4231_case(Hash, Key, Data, Exp) ->
     ?line Ctx = crypto:hmac_init(Hash, Key),
     ?line Ctx2 = crypto:hmac_update(Ctx, Data),
     ?line Mac1 = crypto:hmac_final(Ctx2),
-    ?line Mac2 = crypto:HashFun(Key, Data),
     ?line Mac3 = crypto:hmac(Hash, Key, Data),
     ?line m(Exp, Mac1),
-    ?line m(Exp, Mac2),
     ?line m(Exp, Mac3).
 
-hmac_rfc4231_case(Hash, HashFun, Key, Data, Trunc, Exp) ->
+hmac_rfc4231_case(Hash, Key, Data, Trunc, Exp) ->
     ?line Ctx = crypto:hmac_init(Hash, Key),
     ?line Ctx2 = crypto:hmac_update(Ctx, Data),
     ?line Mac1 = crypto:hmac_final_n(Ctx2, Trunc),
-    ?line Mac2 = crypto:HashFun(Key, Data, Trunc),
     ?line Mac3 = crypto:hmac(Hash, Key, Data, Trunc),
     ?line m(Exp, Mac1),
-    ?line m(Exp, Mac2),
     ?line m(Exp, Mac3).
 
 hmac_rfc4231_sha224_do() ->
@@ -696,7 +693,7 @@ hmac_rfc4231_sha224_do() ->
 		       "d499f112f2d2b7273fa6870e"),
     Case7 = hexstr2bin("3a854166ac5d9f023f54d517d0b39dbd"
 		       "946770db9c2b95c9f6f565d1"),
-    hmac_rfc4231_cases_do(sha224, sha224_mac, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
+    hmac_rfc4231_cases_do(sha224, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
 
 hmac_rfc4231_sha256_do() ->
     Case1 = hexstr2bin("b0344c61d8db38535ca8afceaf0bf12b"
@@ -712,7 +709,7 @@ hmac_rfc4231_sha256_do() ->
 		       "8e0bc6213728c5140546040f0ee37f54"),
     Case7 = hexstr2bin("9b09ffa71b942fcb27635fbcd5b0e944"
 		       "bfdc63644f0713938a7f51535c3a35e2"),
-    hmac_rfc4231_cases_do(sha256, sha256_mac, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
+    hmac_rfc4231_cases_do(sha256, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
 
 hmac_rfc4231_sha384_do() ->
     Case1 = hexstr2bin("afd03944d84895626b0825f4ab46907f"
@@ -734,7 +731,7 @@ hmac_rfc4231_sha384_do() ->
     Case7 = hexstr2bin("6617178e941f020d351e2f254e8fd32c"
 		       "602420feb0b8fb9adccebb82461e99c5"
 		       "a678cc31e799176d3860e6110c46523e"),
-    hmac_rfc4231_cases_do(sha384, sha384_mac, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
+    hmac_rfc4231_cases_do(sha384, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
 
 hmac_rfc4231_sha512_do() ->
     Case1 = hexstr2bin("87aa7cdea5ef619d4ff0b4241a1d6cb0"
@@ -762,16 +759,16 @@ hmac_rfc4231_sha512_do() ->
 		       "debd71f8867289865df5a32d20cdc944"
 		       "b6022cac3c4982b10d5eeb55c3e4de15"
 		       "134676fb6de0446065c97440fa8c6a58"),
-    hmac_rfc4231_cases_do(sha512, sha512_mac, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
+    hmac_rfc4231_cases_do(sha512, [Case1, Case2, Case3, Case4, Case5, Case6, Case7]).
 
-hmac_rfc4231_cases_do(Hash, HashFun, CasesData) ->
-    hmac_rfc4231_cases_do(Hash, HashFun, [case1, case2, case3, case4, case5, case6, case7], CasesData).
+hmac_rfc4231_cases_do(Hash, CasesData) ->
+    hmac_rfc4231_cases_do(Hash, [case1, case2, case3, case4, case5, case6, case7], CasesData).
 
-hmac_rfc4231_cases_do(_Hash, _HashFun, _, []) ->
+hmac_rfc4231_cases_do(_Hash, _, []) ->
     ok;
-hmac_rfc4231_cases_do(Hash, HashFun, [C|Cases], [D|CasesData]) ->
-    hmac_rfc4231_case(Hash, HashFun, C, D),
-    hmac_rfc4231_cases_do(Hash, HashFun, Cases, CasesData).
+hmac_rfc4231_cases_do(Hash, [C|Cases], [D|CasesData]) ->
+    hmac_rfc4231_case(Hash, C, D),
+    hmac_rfc4231_cases_do(Hash, Cases, CasesData).
 
 hmac_update_md5_io(doc) ->
     ["Generate an MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
@@ -858,10 +855,10 @@ sha256(Config) when is_list(Config) ->
     if_supported(sha256, fun() -> sha256_do() end).
 
 sha256_do() ->
-    ?line m(crypto:sha256("abc"),
+    ?line m(crypto:hash(sha256, "abc"),
 	    hexstr2bin("BA7816BF8F01CFEA4141"
 		       "40DE5DAE2223B00361A396177A9CB410FF61F20015AD")),
-    ?line m(crypto:sha256("abcdbcdecdefdefgefghfghighijhijkijkljklmklm"
+    ?line m(crypto:hash(sha256, "abcdbcdecdefdefgefghfghighijhijkijkljklmklm"
 			  "nlmnomnopnopq"), 
 	    hexstr2bin("248D6A61D20638B8"
 		       "E5C026930C3E6039A33CE45964FF2167F6ECEDD419DB06C1")).
@@ -877,10 +874,10 @@ sha256_update(Config) when is_list(Config) ->
     if_supported(sha256, fun() -> sha256_update_do() end).
 
 sha256_update_do() ->
-    ?line Ctx = crypto:sha256_init(),
-    ?line Ctx1 = crypto:sha256_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
-    ?line Ctx2 = crypto:sha256_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
-    ?line m(crypto:sha256_final(Ctx2), 
+    ?line Ctx = crypto:hash_init(sha256),
+    ?line Ctx1 = crypto:hash_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
+    ?line Ctx2 = crypto:hash_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
+    ?line m(crypto:hash_final(Ctx2),
 	    hexstr2bin("248D6A61D20638B8"
 		       "E5C026930C3E6039A33CE45964FF2167F6ECEDD419DB06C1")).
 
@@ -896,11 +893,11 @@ sha512(Config) when is_list(Config) ->
     if_supported(sha512, fun() -> sha512_do() end).
 
 sha512_do() ->
-    ?line m(crypto:sha512("abc"),
+    ?line m(crypto:hash(sha512, "abc"),
 	    hexstr2bin("DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA2"
 		       "0A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD"
 		       "454D4423643CE80E2A9AC94FA54CA49F")),
-    ?line m(crypto:sha512("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+    ?line m(crypto:hash(sha512, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
 			  "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"), 
 	    hexstr2bin("8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA1"
 		       "7299AEADB6889018501D289E4900F7E4331B99DEC4B5433A"
@@ -917,10 +914,10 @@ sha512_update(Config) when is_list(Config) ->
     if_supported(sha512, fun() -> sha512_update_do() end).
 
 sha512_update_do() ->
-    ?line Ctx = crypto:sha512_init(),
-    ?line Ctx1 = crypto:sha512_update(Ctx, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"),
-    ?line Ctx2 = crypto:sha512_update(Ctx1, "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"),
-    ?line m(crypto:sha512_final(Ctx2), 
+    ?line Ctx = crypto:hash_init(sha512),
+    ?line Ctx1 = crypto:hash_update(Ctx, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"),
+    ?line Ctx2 = crypto:hash_update(Ctx1, "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"),
+    ?line m(crypto:hash_final(Ctx2),
 	    hexstr2bin("8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA1"
 		       "7299AEADB6889018501D289E4900F7E4331B99DEC4B5433A"
 		       "C7D329EEB6DD26545E96E55B874BE909")).
@@ -1629,8 +1626,11 @@ dsa_verify_test(Config) when is_list(Config) ->
     
     BadArg = (catch my_dss_verify(sized_binary(Msg), <<SizeErr:32, SigBlob/binary>>,
 				      ValidKey)),
-    ?line m(element(1,element(2,BadArg)), badarg),
-    
+    badarg = case element(1,element(2,BadArg)) of
+		 badarg -> badarg;
+		 function_clause -> badarg;
+		 X -> X
+	     end,
     InValidKey = [crypto:mpint(P_p), 
 		  crypto:mpint(Q_p), 
 		  crypto:mpint(G_p),
@@ -1663,20 +1663,29 @@ rsa_sign_test(Config) when is_list(Config) ->
     Msg = <<"7896345786348756234 Hejsan Svejsan, erlang crypto debugger"
 	   "09812312908312378623487263487623412039812 huagasd">>,
     
-    PrivKey = [crypto:mpint(PubEx), crypto:mpint(Mod), crypto:mpint(PrivEx)],
-    PubKey  = [crypto:mpint(PubEx), crypto:mpint(Mod)],
-    ?line Sig1 = crypto:rsa_sign(sized_binary(Msg), PrivKey),
-    ?line m(crypto:rsa_verify(sized_binary(Msg), sized_binary(Sig1),PubKey), true),
+    PrivKey = [PubEx, Mod, PrivEx],
+    PubKey  = [PubEx, Mod],
+    PubKeyMpint = map_int_to_mpint(PubKey),
+    Sig1 = crypto:rsa_sign(sized_binary(Msg), map_int_to_mpint(PrivKey)),
+    Sig1 = crypto:sign(rsa, sha, Msg, PrivKey),
+    true = crypto:rsa_verify(sized_binary(Msg), sized_binary(Sig1), PubKeyMpint),
+    true = crypto:verify(rsa, sha, Msg, Sig1, PubKey),
     
-    ?line Sig2 = crypto:rsa_sign(md5, sized_binary(Msg), PrivKey),
-    ?line m(crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig2),PubKey), true),
+    Sig2 = crypto:rsa_sign(md5, sized_binary(Msg), map_int_to_mpint(PrivKey)),
+    Sig2 = crypto:sign(rsa, md5, Msg, PrivKey),
+    true = crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig2), PubKeyMpint),
+    true = crypto:verify(rsa, md5, Msg, Sig2, PubKey),
     
-    ?line m(Sig1 =:= Sig2, false),
-    ?line m(crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig1),PubKey), false),
-    ?line m(crypto:rsa_verify(sha, sized_binary(Msg), sized_binary(Sig1),PubKey), true),
-  
+    false = (Sig1 =:= Sig2),
+    false = crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig1), PubKeyMpint),
+    false = crypto:verify(rsa, md5, Msg, Sig1, PubKey),
+    true = crypto:rsa_verify(sha, sized_binary(Msg), sized_binary(Sig1), PubKeyMpint),
+    true = crypto:verify(rsa, sha, Msg, Sig1, PubKey),
+
     ok.
-    
+map_int_to_mpint(List) ->
+    lists:map(fun(E) -> crypto:mpint(E) end, List).
+
 rsa_sign_hash_test(doc) ->
     "rsa_sign_hash testing";
 rsa_sign_hash_test(suite) ->
@@ -1774,46 +1783,65 @@ rsa_encrypt_decrypt(Config) when is_list(Config) ->
     PrivEx = 7531712708607620783801185371644749935066152052780368689827275932079815492940396744378735701395659435842364793962992309884847527234216715366607660219930945,
     Mod = 7919488123861148172698919999061127847747888703039837999377650217570191053151807772962118671509138346758471459464133273114654252861270845708312601272799123,
     
-    PrivKey = [crypto:mpint(PubEx), crypto:mpint(Mod), crypto:mpint(PrivEx)],
-    PubKey  = [crypto:mpint(PubEx), crypto:mpint(Mod)],
+    PrivKey = [PubEx, Mod, PrivEx],
+    PubKey  = [PubEx, Mod],
 
     Msg = <<"7896345786348 Asldi">>,
 
-    ?line PKCS1 = crypto:rsa_public_encrypt(Msg, PubKey, rsa_pkcs1_padding),
-    ?line PKCS1Dec = crypto:rsa_private_decrypt(PKCS1, PrivKey, rsa_pkcs1_padding),
+    ?line PKCS1 = rsa_public_encrypt(Msg, PubKey, rsa_pkcs1_padding),
+    ?line PKCS1Dec = rsa_private_decrypt(PKCS1, PrivKey, rsa_pkcs1_padding),
     io:format("PKCS1Dec ~p~n",[PKCS1Dec]),
     ?line Msg = PKCS1Dec,
     
-    ?line OAEP = crypto:rsa_public_encrypt(Msg, PubKey, rsa_pkcs1_oaep_padding),
-    ?line Msg = crypto:rsa_private_decrypt(OAEP, PrivKey, rsa_pkcs1_oaep_padding),
+    ?line OAEP = rsa_public_encrypt(Msg, PubKey, rsa_pkcs1_oaep_padding),
+    ?line Msg = rsa_private_decrypt(OAEP, PrivKey, rsa_pkcs1_oaep_padding),
 
     <<Msg2Len:32,_/binary>> = crypto:mpint(Mod),
     Msg2 = list_to_binary(lists:duplicate(Msg2Len-1, $X)),
-    ?line NoPad = crypto:rsa_public_encrypt(Msg2, PubKey, rsa_no_padding),
-    ?line NoPadDec = crypto:rsa_private_decrypt(NoPad, PrivKey, rsa_no_padding),
+    ?line NoPad = rsa_public_encrypt(Msg2, PubKey, rsa_no_padding),
+    ?line NoPadDec = rsa_private_decrypt(NoPad, PrivKey, rsa_no_padding),
     ?line NoPadDec = Msg2,
     
-    ShouldBeError = (catch crypto:rsa_public_encrypt(Msg, PubKey, rsa_no_padding)),
+    ShouldBeError = (catch rsa_public_encrypt(Msg, PubKey, rsa_no_padding)),
     ?line {'EXIT', {encrypt_failed,_}} = ShouldBeError,
     
-%%     ?line SSL = crypto:rsa_public_encrypt(Msg, PubKey, rsa_sslv23_padding),
-%%     ?line Msg = crypto:rsa_private_decrypt(SSL, PrivKey, rsa_sslv23_padding),
+%%     ?line SSL = rsa_public_encrypt(Msg, PubKey, rsa_sslv23_padding),
+%%     ?line Msg = rsa_private_decrypt(SSL, PrivKey, rsa_sslv23_padding),
 
-    ?line PKCS1_2 = crypto:rsa_private_encrypt(Msg, PrivKey, rsa_pkcs1_padding),
-    ?line PKCS1_2Dec = crypto:rsa_public_decrypt(PKCS1_2, PubKey, rsa_pkcs1_padding),
+    ?line PKCS1_2 = rsa_private_encrypt(Msg, PrivKey, rsa_pkcs1_padding),
+    ?line PKCS1_2Dec = rsa_public_decrypt(PKCS1_2, PubKey, rsa_pkcs1_padding),
     io:format("PKCS2Dec ~p~n",[PKCS1_2Dec]),
     ?line Msg = PKCS1_2Dec,
 
-    ?line PKCS1_3 = crypto:rsa_private_encrypt(Msg2, PrivKey, rsa_no_padding),
-    ?line PKCS1_3Dec = crypto:rsa_public_decrypt(PKCS1_3, PubKey, rsa_no_padding),
+    ?line PKCS1_3 = rsa_private_encrypt(Msg2, PrivKey, rsa_no_padding),
+    ?line PKCS1_3Dec = rsa_public_decrypt(PKCS1_3, PubKey, rsa_no_padding),
     io:format("PKCS2Dec ~p~n",[PKCS1_3Dec]),
     ?line Msg2 = PKCS1_3Dec,
     
     ?line {'EXIT', {encrypt_failed,_}} = 
-	(catch crypto:rsa_private_encrypt(Msg, PrivKey, rsa_no_padding)),
+	(catch rsa_private_encrypt(Msg, PrivKey, rsa_no_padding)),
     
     ok.
 
+rsa_public_encrypt(Msg, Key, Pad) ->
+    C1 = crypto:rsa_public_encrypt(Msg, Key, Pad),
+    C2 = crypto:rsa_public_encrypt(Msg, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad),
+    {C1,C2}.
+
+rsa_public_decrypt(Msg, Key, Pad) ->
+    R = crypto:rsa_public_decrypt(Msg, Key, Pad),
+    R = crypto:rsa_public_decrypt(Msg, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad).
+
+rsa_private_encrypt(Msg, Key, Pad) ->
+    R = crypto:rsa_private_encrypt(Msg, Key, Pad),
+    R = crypto:rsa_private_encrypt(Msg, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad).
+
+rsa_private_decrypt({C1,C2}, Key, Pad) ->
+    R = crypto:rsa_private_decrypt(C1, Key, Pad),
+    R = crypto:rsa_private_decrypt(C2, Key, Pad),
+    R = crypto:rsa_private_decrypt(C1, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad),
+    R = crypto:rsa_private_decrypt(C2, lists:map(fun(E) -> crypto:mpint(E) end, Key), Pad).
+
 
 dh(doc) ->
     ["Test dh (Diffie-Hellman) functions."];
@@ -1832,13 +1860,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
@@ -1847,6 +1878,64 @@ dh(Config) when is_list(Config) ->
 	    exit(Pid, kill)
     end.
 
+
+ec(doc) ->
+    ["Test ec (Ecliptic Curve) functions."];
+ec(suite) -> [];
+ec(Config) when is_list(Config) ->
+    if_supported(ec, fun() -> ec_do() end).
+
+ec_do() ->
+    %% test for a name curve
+    {D2_priv, D2_pub} = crypto:generate_key(ecdh, sect113r2),
+    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,
+    %% taken from csca-germany_013_self_signed_cer.pem
+    PubKey = <<16#04, 16#4a, 16#94, 16#49, 16#81, 16#77, 16#9d, 16#df,
+	       16#1d, 16#a5, 16#e7, 16#c5, 16#27, 16#e2, 16#7d, 16#24,
+	       16#71, 16#a9, 16#28, 16#eb, 16#4d, 16#7b, 16#67, 16#75,
+	       16#ae, 16#09, 16#0a, 16#51, 16#45, 16#19, 16#9b, 16#d4,
+	       16#7e, 16#a0, 16#81, 16#e5, 16#5e, 16#d4, 16#a4, 16#3f,
+	       16#60, 16#7c, 16#6a, 16#50, 16#ee, 16#36, 16#41, 16#8a,
+	       16#87, 16#ff, 16#cd, 16#a6, 16#10, 16#39, 16#ca, 16#95,
+	       16#76, 16#7d, 16#ae, 16#ca, 16#c3, 16#44, 16#3f, 16#e3, 16#2c>>,
+    <<P:264/integer>> = <<16#00, 16#a9, 16#fb, 16#57, 16#db, 16#a1, 16#ee, 16#a9,
+                          16#bc, 16#3e, 16#66, 16#0a, 16#90, 16#9d, 16#83, 16#8d,
+			  16#72, 16#6e, 16#3b, 16#f6, 16#23, 16#d5, 16#26, 16#20,
+			  16#28, 16#20, 16#13, 16#48, 16#1d, 16#1f, 16#6e, 16#53, 16#77>>,
+    <<A:256/integer>> = <<16#7d, 16#5a, 16#09, 16#75, 16#fc, 16#2c, 16#30, 16#57,
+			  16#ee, 16#f6, 16#75, 16#30, 16#41, 16#7a, 16#ff, 16#e7,
+			  16#fb, 16#80, 16#55, 16#c1, 16#26, 16#dc, 16#5c, 16#6c,
+			  16#e9, 16#4a, 16#4b, 16#44, 16#f3, 16#30, 16#b5, 16#d9>>,
+    <<B:256/integer>> = <<16#26, 16#dc, 16#5c, 16#6c, 16#e9, 16#4a, 16#4b, 16#44,
+			  16#f3, 16#30, 16#b5, 16#d9, 16#bb, 16#d7, 16#7c, 16#bf,
+			  16#95, 16#84, 16#16, 16#29, 16#5c, 16#f7, 16#e1, 16#ce,
+			  16#6b, 16#cc, 16#dc, 16#18, 16#ff, 16#8c, 16#07, 16#b6>>,
+    BasePoint = <<16#04, 16#8b, 16#d2, 16#ae, 16#b9, 16#cb, 16#7e, 16#57,
+		  16#cb, 16#2c, 16#4b, 16#48, 16#2f, 16#fc, 16#81, 16#b7,
+		  16#af, 16#b9, 16#de, 16#27, 16#e1, 16#e3, 16#bd, 16#23,
+		  16#c2, 16#3a, 16#44, 16#53, 16#bd, 16#9a, 16#ce, 16#32,
+		  16#62, 16#54, 16#7e, 16#f8, 16#35, 16#c3, 16#da, 16#c4,
+		  16#fd, 16#97, 16#f8, 16#46, 16#1a, 16#14, 16#61, 16#1d,
+		  16#c9, 16#c2, 16#77, 16#45, 16#13, 16#2d, 16#ed, 16#8e,
+		  16#54, 16#5c, 16#1d, 16#54, 16#c7, 16#2f, 16#04, 16#69, 16#97>>,
+    <<Order:264/integer>> = <<16#00, 16#a9, 16#fb, 16#57, 16#db, 16#a1, 16#ee, 16#a9,
+			      16#bc, 16#3e, 16#66, 16#0a, 16#90, 16#9d, 16#83, 16#8d,
+			      16#71, 16#8c, 16#39, 16#7a, 16#a3, 16#b5, 16#61, 16#a6,
+			      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},
+
+    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, PrivECDH),
+    ?line true = crypto:verify(ecdsa, sha, Msg, Sign, PubECDH),
+    ?line false = crypto:verify(ecdsa, sha, Msg, <<10,20>>, PubECDH),
+
+    ok.
+
 srp3(doc) ->
     ["SRP-3 test vectors generated by http://srp.stanford.edu/demo/demo.html"];
 srp3(suite) -> [];
@@ -1890,15 +1979,15 @@ srp3(Config) when is_list(Config) ->
 			    "9176A9192615DC0277AE7C12F1F6A7F6563FCA11675D809AF578BDE5"
 			    "2B51E05D440B63099A017A0B45044801"),
     UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
-    Verifier = crypto:mod_exp_prime(Generator, UserPassHash, Prime), 
-    ClientPublic = crypto:mod_exp_prime(Generator, ClientPrivate, Prime),
+    Verifier = crypto:mod_pow(Generator, UserPassHash, Prime), 
+    ClientPublic = crypto:mod_pow(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"];
@@ -1941,15 +2030,15 @@ srp6(Config) when is_list(Config) ->
 				 "72E992AAD89095A84B6A5FADA152369AB1E350A03693BEF044DF3EDF"
 				 "0C34741F4696C30E9F675D09F58ACBEB"),
     UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
-    Verifier = crypto:mod_exp_prime(Generator, UserPassHash, Prime), 
-    ClientPublic = crypto:mod_exp_prime(Generator, ClientPrivate, Prime),
+    Verifier = crypto:mod_pow(Generator, UserPassHash, Prime), 
+    ClientPublic = crypto:mod_pow(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."];
@@ -1992,15 +2081,15 @@ srp6a(Config) when is_list(Config) ->
 			    "3499B200210DCC1F10EB33943CD67FC88A2F39A4BE5BEC4EC0A3212D"
 			    "C346D7E474B29EDE8A469FFECA686E5A"),
     UserPassHash = crypto:sha([Salt, crypto:sha([Username, <<$:>>, Password])]),
-    Verifier = crypto:mod_exp_prime(Generator, UserPassHash, Prime), 
+    Verifier = crypto:mod_pow(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]}).
     
 %%
 %%
@@ -2195,6 +2284,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),