diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-22 09:54:02 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-22 09:54:02 +0100 |
| commit | ae7a789b08e771bb088b9490b3ef9cf3f0277f37 (patch) | |
| tree | e375e0514bd8cc7c8e466b2e696c7a3fd03b76fc | |
| parent | a8364425a7190b65cd33e58ac3c155a77c462b74 (diff) | |
| parent | 498e9fe90cdd82569180a8713335b0ff037745df (diff) | |
| download | otp-ae7a789b08e771bb088b9490b3ef9cf3f0277f37.tar.gz otp-ae7a789b08e771bb088b9490b3ef9cf3f0277f37.tar.bz2 otp-ae7a789b08e771bb088b9490b3ef9cf3f0277f37.zip | |
Merge branch 'ingela/ssl/test-cuddle' into maint
* ingela/ssl/test-cuddle:
ssl: Correct test input
| -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 3778530a47..cfc4ec5770 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -4888,20 +4888,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} | |