Merge branch 'ingela/public_key-test' into maint

* ingela/public_key-test:
  public_key: Check that ec curve used for test is supported

1 files changed, 16 insertions, 3 deletions

diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 579df160bc..38e8f30a25 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -97,14 +97,27 @@ end_per_group(_GroupName, Config) ->
     Config.
 %%-------------------------------------------------------------------
 
-init_per_testcase(Case, Config) when Case == pkix_test_data_all_default;
-                                     Case == gen_ec_param ->
+init_per_testcase(pkix_test_data_all_default, Config) ->
      case crypto:ec_curves() of
          [] ->
              {skip, missing_ecc_support};
          _ ->
-               init_common_per_testcase(Config)
+             init_common_per_testcase(Config)
      end;
+
+init_per_testcase(gen_ec_param, Config) ->
+    case crypto:ec_curves() of
+         [] ->
+             {skip, missing_ecc_support};
+         Curves ->
+            case lists:member(secp521r1, Curves) of
+                true ->
+                    init_common_per_testcase(Config);
+                false ->
+                    {skip, missing_ecc_secp52r1_support}
+            end
+    end;
+
 init_per_testcase(TestCase, Config) ->
     case TestCase of
 	ssh_hostkey_fingerprint_md5_implicit -> init_fingerprint_testcase([md5], Config);