diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-09-05 10:46:36 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-05 10:46:36 +0200 |
| commit | 93369eec652aa136c57fecc52182fb02449d69e6 (patch) | |
| tree | c9f780e9327358cb69f42c26b4f1177be91a4eba /lib/ssl/test/ssl_test_lib.erl | |
| parent | 197ed04e8e2230fb011dc95e25089cad5141d460 (diff) | |
| parent | 66f1ea7d6bdc03240cd118ae54d80e2f07cc5047 (diff) | |
| download | otp-93369eec652aa136c57fecc52182fb02449d69e6.tar.gz otp-93369eec652aa136c57fecc52182fb02449d69e6.tar.bz2 otp-93369eec652aa136c57fecc52182fb02449d69e6.zip | |
Merge branch 'ingela/ssl/test-framework-checks' into maint
* ingela/ssl/test-framework-checks:
ssl: Test ssl v2 clients rejection depending on configuration
ssl: Add check in test framework for crypto support
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index fd8af5efaa..a92b978ca9 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -807,22 +807,24 @@ send_selected_port(_,_,_) -> rsa_suites(CounterPart) -> ECC = is_sane_ecc(CounterPart), FIPS = is_fips(CounterPart), + CryptoSupport = crypto:supports(), + Ciphers = proplists:get_value(ciphers, CryptoSupport), lists:filter(fun({rsa, des_cbc, sha}) when FIPS == true -> false; ({dhe_rsa, des_cbc, sha}) when FIPS == true -> false; - ({rsa, _, _}) -> - true; - ({dhe_rsa, _, _}) -> - true; - ({ecdhe_rsa, _, _}) when ECC == true -> - true; - ({rsa, _, _, _}) -> - true; - ({dhe_rsa, _, _,_}) -> - true; - ({ecdhe_rsa, _, _,_}) when ECC == true -> - true; + ({rsa, Cipher, _}) -> + lists:member(Cipher, Ciphers); + ({dhe_rsa, Cipher, _}) -> + lists:member(Cipher, Ciphers); + ({ecdhe_rsa, Cipher, _}) when ECC == true -> + lists:member(Cipher, Ciphers); + ({rsa, Cipher, _, _}) -> + lists:member(Cipher, Ciphers); + ({dhe_rsa, Cipher, _,_}) -> + lists:member(Cipher, Ciphers); + ({ecdhe_rsa, Cipher, _,_}) when ECC == true -> + lists:member(Cipher, Ciphers); (_) -> false end, |