diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2021-01-27 11:02:39 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2021-02-03 08:43:31 +0100 |
| commit | 5be6bca9a98882817501f61b155e73e8811893bd (patch) | |
| tree | 77f36633f993b1ed641dd8929ac0bd9f7f5c2b2e /lib/ssl | |
| parent | 5a3d03ee2c12f4c93cf7375abdb3c04f7423f76d (diff) | |
| download | erlang-5be6bca9a98882817501f61b155e73e8811893bd.tar.gz | |
ssl: Make sure test are not skipped due to use of deprecated function
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_api_SUITE.erl | 25 |
2 files changed, 15 insertions, 14 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index f834ac4105..c628f3b6d9 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -125,7 +125,8 @@ end_per_suite(_Config) -> %%-------------------------------------------------------------------- init_per_group(GroupName, Config) -> case ssl_test_lib:is_protocol_version(GroupName) of - true -> + true -> + ct:log("Ciphers: ~p~n ", [ssl:cipher_suites(default, GroupName)]), ssl_test_lib:init_per_group(GroupName, [{client_type, erlang}, {server_type, erlang}, @@ -141,7 +142,6 @@ end_per_group(GroupName, Config) -> init_per_testcase(TestCase, Config) -> ssl_test_lib:ct_log_supported_protocol_versions(Config), - ct:log("Ciphers: ~p~n ", [ ssl:cipher_suites()]), end_per_testcase(TestCase, Config), ssl:start(), ct:timetrap({seconds, 15}), diff --git a/lib/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl index 82dc9fe3b6..236fb9535d 100644 --- a/lib/ssl/test/ssl_api_SUITE.erl +++ b/lib/ssl/test/ssl_api_SUITE.erl @@ -2554,8 +2554,8 @@ prf_ciphers_and_expected(TlsVer, PRFs, Results) -> case TlsVer of TlsVer when TlsVer == sslv3 orelse TlsVer == tlsv1 orelse TlsVer == 'tlsv1.1' orelse TlsVer == 'dtlsv1' -> - Ciphers = ssl:cipher_suites(), - {_, Expected} = lists:keyfind(md5sha, 1, Results), + Ciphers = ssl:cipher_suites(default, TlsVer), + Expected = [Expect#{prf := md5sha} || Expect <- Results], [[{tls_ver, TlsVer}, {ciphers, Ciphers}, {expected, Expected}, {prf, md5sha}]]; TlsVer when TlsVer == 'tlsv1.2' orelse TlsVer == 'dtlsv1.2'-> lists:foldl( @@ -2566,22 +2566,23 @@ prf_ciphers_and_expected(TlsVer, PRFs, Results) -> ct:log("No ciphers for PRF algorithm ~p. Skipping.", [PRF]), Acc; Ciphers -> - {_, Expected} = lists:keyfind(PRF, 1, Results), + Expected = [Expect#{prf := PRF} || Expect <- Results], [[{tls_ver, TlsVer}, {ciphers, Ciphers}, {expected, Expected}, {prf, PRF}] | Acc] end end, [], PRFs) end. -prf_get_ciphers(_, PRF) -> - lists:filter( - fun(C) when tuple_size(C) == 4 andalso - element(4, C) == PRF -> - true; - (_) -> - false - end, - ssl:cipher_suites()). +prf_get_ciphers(TlsVer, PRF) -> + PrfFilter = fun(Value) -> + case Value of + PRF -> + true; + _ -> + false + end + end, + ssl:filter_cipher_suites(ssl:cipher_suites(default, TlsVer), [{prf, PrfFilter}]). prf_run_test(_, TlsVer, [], _, Prf) -> ct:fail({error, cipher_list_empty, TlsVer, Prf}); |