diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-25 12:23:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-07-25 12:23:12 +0200 |
| commit | 2dd27227836fbf0b4eb5fe97aaa5cdb8d81793fc (patch) | |
| tree | 418c10b29a802d41f52db91d2af7558a221a8972 /lib/ssl | |
| parent | f923469a39fcb48c66abc03be7cfa2061d33dfb9 (diff) | |
| parent | 22b71cc0264a1db0dd813893b883d34b7e5ee88e (diff) | |
| download | otp-2dd27227836fbf0b4eb5fe97aaa5cdb8d81793fc.tar.gz otp-2dd27227836fbf0b4eb5fe97aaa5cdb8d81793fc.tar.bz2 otp-2dd27227836fbf0b4eb5fe97aaa5cdb8d81793fc.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_api_SUITE.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl index 3db3f73adc..128832c23c 100644 --- a/lib/ssl/test/ssl_api_SUITE.erl +++ b/lib/ssl/test/ssl_api_SUITE.erl @@ -45,17 +45,17 @@ all() -> groups() -> [ %%{'tlsv1.3', [], gen_api_tests() ++ handshake_paus_tests()}, - {'tlsv1.3', [], gen_api_tests() -- [secret_connection_info, dh_params, honor_server_cipher_order, honor_client_cipher_order, - new_options_in_handshake] - ++ since_1_2()}, + {'tlsv1.3', [], (gen_api_tests() -- [secret_connection_info, dh_params, honor_server_cipher_order, honor_client_cipher_order, + new_options_in_handshake]) + ++ (since_1_2() -- [conf_signature_algs])}, {'tlsv1.2', [], gen_api_tests() ++ since_1_2() ++ handshake_paus_tests() ++ pre_1_3()}, {'tlsv1.1', [], gen_api_tests() ++ handshake_paus_tests() ++ pre_1_3()}, {'tlsv1', [], gen_api_tests() ++ handshake_paus_tests() ++ pre_1_3() ++ beast_mitigation_test()}, - {'sslv3', [], gen_api_tests() -- [new_options_in_handshake] ++ beast_mitigation_test() ++ pre_1_3()}, - {'dtlsv1.2', [], gen_api_tests() -- [invalid_keyfile, invalid_certfile, invalid_cacertfile, - invalid_options, new_options_in_handshake] ++ handshake_paus_tests() ++ pre_1_3()}, - {'dtlsv1', [], gen_api_tests() -- [invalid_keyfile, invalid_certfile, invalid_cacertfile, - invalid_options, new_options_in_handshake] ++ handshake_paus_tests() ++ pre_1_3()} + {'sslv3', [], (gen_api_tests() -- [new_options_in_handshake]) ++ beast_mitigation_test() ++ pre_1_3()}, + {'dtlsv1.2', [], (gen_api_tests() -- [invalid_keyfile, invalid_certfile, invalid_cacertfile, + invalid_options, new_options_in_handshake]) ++ handshake_paus_tests() ++ pre_1_3()}, + {'dtlsv1', [], (gen_api_tests() -- [invalid_keyfile, invalid_certfile, invalid_cacertfile, + invalid_options, new_options_in_handshake]) ++ handshake_paus_tests() ++ pre_1_3()} ]. since_1_2() -> |