diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-22 09:54:41 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-22 09:54:41 +0100 |
| commit | 01098dfa652a1cf07a4dd263f28f81a90852c254 (patch) | |
| tree | 0106d08ad77f5e028fc4e7b62166d52a116b9cd4 /lib | |
| parent | 9c8075413728e3be373d7dff2a7168b3983e0be3 (diff) | |
| parent | ae7a789b08e771bb088b9490b3ef9cf3f0277f37 (diff) | |
| download | otp-01098dfa652a1cf07a4dd263f28f81a90852c254.tar.gz otp-01098dfa652a1cf07a4dd263f28f81a90852c254.tar.bz2 otp-01098dfa652a1cf07a4dd263f28f81a90852c254.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index b8a8ef1d73..0727505dde 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -5054,20 +5054,24 @@ run_suites(Ciphers, Config, Type) -> ssl_test_lib:ssl_options(server_psk_anon_hint, Config)]}; srp -> {ssl_test_lib:ssl_options(client_srp, Config), - ssl_test_lib:ssl_options(server_srp, Config)}; + [{ciphers, Ciphers} | + ssl_test_lib:ssl_options(server_srp, Config)]}; srp_anon -> {ssl_test_lib:ssl_options(client_srp, Config), - ssl_test_lib:ssl_options(server_srp_anon, Config)}; + [{ciphers, Ciphers} | + ssl_test_lib:ssl_options(server_srp_anon, Config)]}; srp_dsa -> {ssl_test_lib:ssl_options(client_srp_dsa, Config), - ssl_test_lib:ssl_options(server_srp_dsa, Config)}; + [{ciphers, Ciphers} | + ssl_test_lib:ssl_options(server_srp_dsa, Config)]}; ecdsa -> {ssl_test_lib:ssl_options(client_ecdsa_opts, Config), [{ciphers, Ciphers} | ssl_test_lib:ssl_options(server_ecdsa_opts, Config)]}; ecdh_rsa -> {ssl_test_lib:ssl_options(client_ecdh_rsa_opts, Config), - ssl_test_lib:ssl_options(server_ecdh_rsa_opts, Config)}; + [{ciphers, Ciphers} | + ssl_test_lib:ssl_options(server_ecdh_rsa_opts, Config)]}; rc4_rsa -> {ssl_test_lib:ssl_options(client_rsa_verify_opts, Config), [{ciphers, Ciphers} | |