From 2c5da61c121902fcbaf9027d96b6e1246e455747 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 10 Jan 2019 10:42:55 +0100
Subject: crypto: Rename a testcase

 crypto_SUITE:generate_all_supported -> use_all_elliptic_curves
---
 lib/crypto/test/crypto_SUITE.erl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 6c6188f775..8111102a5a 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -156,7 +156,7 @@ groups() ->
                  ]},
      {dh, [], [generate_compute,
                compute_bug]},
-     {ecdh, [], [generate_all_supported, compute, generate]},
+     {ecdh, [], [use_all_elliptic_curves, compute, generate]},
      {srp, [], [generate_compute]},
      {des_cbc, [], [block]},
      {des_cfb, [], [block]},
@@ -563,9 +563,9 @@ compute(Config) when is_list(Config) ->
     Gen = proplists:get_value(compute, Config),
     lists:foreach(fun do_compute/1, Gen).
 %%--------------------------------------------------------------------
-generate_all_supported() ->
-    [{doc, " Test that all curves from crypto:ec_curves/0 returns two binaries"}].
-generate_all_supported(_Config) ->
+use_all_elliptic_curves() ->
+    [{doc, " Test that all curves from crypto:ec_curves/0"}].
+use_all_elliptic_curves(_Config) ->
     Results =
         [try
              crypto:generate_key(ecdh, C)
-- 
cgit v1.2.3


From 4bba5a53a247a14a59696a1439306f432cea9d4f Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 9 Jan 2019 15:01:11 +0100
Subject: crypto: Refresh of test case for elliptic curves

---
 lib/crypto/test/crypto_SUITE.erl | 53 ++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 8111102a5a..98de1d7700 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -566,29 +566,40 @@ compute(Config) when is_list(Config) ->
 use_all_elliptic_curves() ->
     [{doc, " Test that all curves from crypto:ec_curves/0"}].
 use_all_elliptic_curves(_Config) ->
+    Msg = <<"hello world!">>,
+    Sups = crypto:supports(),
+    Curves = proplists:get_value(curves, Sups),
+    Hashs = proplists:get_value(hashs, Sups),
+    ct:log("Lib: ~p~nFIPS: ~p~nCurves:~n~p~nHashs: ~p", [crypto:info_lib(),
+                                                         crypto:info_fips(),
+                                                         Curves,
+                                                         Hashs]),
     Results =
-        [try
-             crypto:generate_key(ecdh, C)
-         of
-             {B1,B2} when is_binary(B1) and is_binary(B2) ->
-                 %% That is, seems like it works as expected.
-                 {ok,C};
-             Err ->
-                 ct:log("ERROR: Curve ~p generated ~p", [C,Err]),
-                 {error,{C,Err}}
-         catch
-             Cls:Err:Stack ->
-                 ct:log("ERROR: Curve ~p exception ~p:~p~n~p", [C,Cls,Err,Stack]),
-                 {error,{C,{Cls,Err}}}
-         end
-         || C <- crypto:ec_curves(),
-            not lists:member(C, [ed25519, ed448])
+        [{{Curve,Hash},
+          try
+              {Pub,Priv} = crypto:generate_key(ecdh, Curve),
+              true = is_binary(Pub),
+              true = is_binary(Priv),
+              Sig = crypto:sign(ecdsa, Hash, Msg, [Priv, Curve]),
+              crypto:verify(ecdsa, Hash, Msg, Sig, [Pub, Curve])
+          catch
+              C:E ->
+                  {C,E}
+          end}
+         || Curve <- Curves -- [ed25519, ed448, x25519, x448, ipsec3, ipsec4],
+            Hash <- Hashs -- [md4, md5, ripemd160, sha3_224, sha3_256, sha3_384, sha3_512]
         ],
-    OK = [C || {ok,C} <- Results],
-    ct:log("Ok (len=~p): ~p", [length(OK), OK]),
-    false = lists:any(fun({error,_}) -> true;
-                         (_) -> false
-                      end, Results).
+    Fails =
+        lists:filter(fun({_,true}) -> false;
+                        (_) -> true
+                     end, Results),
+    case Fails of
+        [] ->
+            ok;
+        _ ->
+            ct:log("Fails:~n~p",[Fails]),
+            ct:fail("Bad curve(s)",[])
+    end.
 
 %%--------------------------------------------------------------------
 generate() ->
-- 
cgit v1.2.3