diff options
Diffstat (limited to 'lib/ssl/test/openssl_cipher_suite_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/openssl_cipher_suite_SUITE.erl | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/ssl/test/openssl_cipher_suite_SUITE.erl b/lib/ssl/test/openssl_cipher_suite_SUITE.erl index 61297a5f18..fb1f28aa4a 100644 --- a/lib/ssl/test/openssl_cipher_suite_SUITE.erl +++ b/lib/ssl/test/openssl_cipher_suite_SUITE.erl @@ -89,16 +89,19 @@ ecdhe_ecdsa_with_aes_256_ccm_8/1 ]). --define(DEFAULT_TIMEOUT, {seconds, 6}). +-define(DEFAULT_TIMEOUT, {seconds, 10}). %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- all() -> - [ - {group, openssl_server}, - {group, openssl_client} - ]. + case ssl_test_lib:working_openssl_client() of + true -> + [{group, openssl_server}, + {group, openssl_client}]; + false -> + [{group, openssl_server}] + end. all_protocol_groups() -> [ @@ -385,7 +388,7 @@ init_per_testcase(TestCase, Config) when TestCase == psk_3des_ede_cbc; SupCiphers = proplists:get_value(ciphers, crypto:supports()), case lists:member(des_ede3, SupCiphers) of true -> - ct:timetrap({seconds, 5}), + ct:timetrap({seconds, ?DEFAULT_TIMEOUT}), Config; _ -> {skip, "Missing 3DES crypto support"} @@ -955,7 +958,7 @@ cipher_suite_test(CipherSuite, Version, Config) -> [{ciphers, [CipherSuite]} | SOpts], Config); _ -> ssl_test_lib:basic_test([{versions, [Version]}, {ciphers, [CipherSuite]} | COpts], - [{ciphers, ssl:cipher_suites(all, Version)} | SOpts], Config) + [{ciphers, ssl_test_lib:openssl_ciphers()} | SOpts], Config) end. test_ciphers(Kex, Cipher, Version) -> @@ -978,3 +981,5 @@ test_ciphers(Kex, Cipher, Version) -> end, Ciphers). +openssl_suitestr_to_map(OpenSSLSuiteStrs) -> + [ssl_cipher_format:suite_openssl_str_to_map(SuiteStr) || SuiteStr <- OpenSSLSuiteStrs]. |