diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-09-05 10:47:27 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-05 10:47:27 +0200 |
| commit | 5dba22121d77237edae5cf805b9da5f7e056e532 (patch) | |
| tree | 836b986285b62133f524432a0d3ed79553373a65 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 26be791d0832060de91e4d7afdf33fad379dd718 (diff) | |
| parent | 93369eec652aa136c57fecc52182fb02449d69e6 (diff) | |
| download | otp-5dba22121d77237edae5cf805b9da5f7e056e532.tar.gz otp-5dba22121d77237edae5cf805b9da5f7e056e532.tar.bz2 otp-5dba22121d77237edae5cf805b9da5f7e056e532.zip | |
Merge branch 'maint'
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, |