diff options
author | Ingela Anderton Andin <[email protected]> | 2017-10-27 11:42:00 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-10-27 11:42:00 +0200 |
commit | f3d069dd1e3978b240c0f99c5609735e72ea8e8c (patch) | |
tree | 8daeea4f2aab6df50233d2759a0ec4c9be98f323 /lib/public_key | |
parent | df44c1e1abcbb50bfe6615545cee9ae87069198a (diff) | |
parent | baec492a2ca629ec36e8586e80df6f07fea5063b (diff) | |
download | otp-f3d069dd1e3978b240c0f99c5609735e72ea8e8c.tar.gz otp-f3d069dd1e3978b240c0f99c5609735e72ea8e8c.tar.bz2 otp-f3d069dd1e3978b240c0f99c5609735e72ea8e8c.zip |
Merge branch 'ingela/public_key-test' into maint
* ingela/public_key-test:
public_key: Check that ec curve used for test is supported
Diffstat (limited to 'lib/public_key')
-rw-r--r-- | lib/public_key/test/public_key_SUITE.erl | 19 |
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); |