Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ledest:erlang:23
erlang
0990-ssl-turn-off-debug-logging-in-tests.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0990-ssl-turn-off-debug-logging-in-tests.patch of Package erlang
From edaa88b5c023541aa800b68e5f3882105c1df808 Mon Sep 17 00:00:00 2001 From: Jakub Witczak <kuba@erlang.org> Date: Fri, 10 Jun 2022 15:37:01 +0200 Subject: [PATCH] ssl: turn off debug logging in tests --- lib/ssl/test/openssl_key_update_SUITE.erl | 3 +- lib/ssl/test/openssl_session_ticket_SUITE.erl | 23 ++++--- lib/ssl/test/ssl_api_SUITE.erl | 2 - lib/ssl/test/ssl_cert_SUITE.erl | 6 +- lib/ssl/test/ssl_key_update_SUITE.erl | 8 +-- lib/ssl/test/ssl_session_ticket_SUITE.erl | 64 ++++++------------- lib/ssl/test/ssl_sni_SUITE.erl | 6 +- 7 files changed, 39 insertions(+), 73 deletions(-) diff --git a/lib/ssl/test/openssl_key_update_SUITE.erl b/lib/ssl/test/openssl_key_update_SUITE.erl index 55e302dd69..e4d42d0684 100644 --- a/lib/ssl/test/openssl_key_update_SUITE.erl +++ b/lib/ssl/test/openssl_key_update_SUITE.erl @@ -92,7 +92,7 @@ openssl_client_explicit_key_update() -> openssl_client_explicit_key_update(Config) -> Data = "123456789012345", %% 15 bytes - Server = ssl_test_lib:start_server(erlang, [{log_level, debug}], Config), + Server = ssl_test_lib:start_server(erlang, [], Config), Port = ssl_test_lib:inet_port(Server), Client = ssl_test_lib:start_client(openssl, [{port, Port}], Config), @@ -120,7 +120,6 @@ openssl_server_explicit_key_update(Config) -> Port = ssl_test_lib:inet_port(Server), Client = ssl_test_lib:start_client(erlang, [{port, Port}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}],Config), ssl_test_lib:send(Server, Data), Data = ssl_test_lib:check_active_receive(Client, Data), diff --git a/lib/ssl/test/openssl_session_ticket_SUITE.erl b/lib/ssl/test/openssl_session_ticket_SUITE.erl index 5e6b32427d..31b2d4a8b2 100644 --- a/lib/ssl/test/openssl_session_ticket_SUITE.erl +++ b/lib/ssl/test/openssl_session_ticket_SUITE.erl @@ -138,7 +138,7 @@ openssl_server_basic(Config) when is_list(Config) -> {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), %% Configure session tickets - ClientOpts = [{session_tickets, auto}, {log_level, debug}, + ClientOpts = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], Server = ssl_test_lib:start_server(openssl, [], @@ -184,7 +184,7 @@ openssl_client_basic(Config) when is_list(Config) -> Data = "Hello world", %% Configure session tickets - ServerOpts = [{session_tickets, ServerTicketMode}, {log_level, debug}, + ServerOpts = [{session_tickets, ServerTicketMode}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], Server0 = @@ -231,7 +231,7 @@ openssl_server_hrr(Config) when is_list(Config) -> {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), %% Configure session tickets - ClientOpts = [{session_tickets, auto}, {log_level, debug}, + ClientOpts = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}, {supported_groups,[secp256r1, x25519]}|ClientOpts0], @@ -279,7 +279,7 @@ openssl_client_hrr(Config) when is_list(Config) -> Data = "Hello world", %% Configure session tickets - ServerOpts = [{session_tickets, ServerTicketMode}, {log_level, debug}, + ServerOpts = [{session_tickets, ServerTicketMode}, {versions, ['tlsv1.2','tlsv1.3']}, {supported_groups,[x448, x25519]}|ServerOpts0], @@ -333,7 +333,7 @@ openssl_server_hrr_multiple_tickets(Config) when is_list(Config) -> {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), %% Configure session tickets - ClientOpts = [{session_tickets, manual}, {log_level, debug}, + ClientOpts = [{session_tickets, manual}, {versions, ['tlsv1.2','tlsv1.3']}, {supported_groups,[secp256r1, x25519]}|ClientOpts0], @@ -380,7 +380,7 @@ openssl_server_early_data_basic(Config) when is_list(Config) -> {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, auto}, {log_level, debug}, + ClientOpts1 = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], ClientOpts2 = [{early_data, <<"SampleData">>}|ClientOpts1], @@ -422,7 +422,7 @@ openssl_server_early_data_big(Config) when is_list(Config) -> {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, auto}, {log_level, debug}, + ClientOpts1 = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], ClientOpts2 = [{early_data, <<"SampleData">>}|ClientOpts1], @@ -467,7 +467,7 @@ openssl_server_early_data_manual(Config) when is_list(Config) -> {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, manual}, {log_level, debug}, + ClientOpts1 = [{session_tickets, manual}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], ClientOpts2 = [{early_data, <<"SampleData">>}|ClientOpts1], @@ -516,7 +516,7 @@ openssl_server_early_data_manual_big(Config) when is_list(Config) -> {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, manual}, {log_level, debug}, + ClientOpts1 = [{session_tickets, manual}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], ClientOpts2 = [{early_data, <<"SampleData">>}|ClientOpts1], @@ -563,7 +563,7 @@ openssl_server_early_data_manual_2_tickets(Config) when is_list(Config) -> {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, manual}, {log_level, debug}, + ClientOpts1 = [{session_tickets, manual}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], ClientOpts2 = [{early_data, <<"SampleData">>}|ClientOpts1], @@ -610,7 +610,7 @@ openssl_server_early_data_manual_2_chacha_tickets(Config) when is_list(Config) - {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, manual}, {log_level, debug}, + ClientOpts1 = [{session_tickets, manual}, {ciphers, ["TLS_CHACHA20_POLY1305_SHA256"]}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], ClientOpts2 = [{early_data, <<"SampleData">>}|ClientOpts1], @@ -670,7 +670,6 @@ openssl_client_early_data_basic(Config) when is_list(Config) -> %% Configure session tickets ServerOpts = [{session_tickets, ServerTicketMode}, {early_data, enabled}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], Server0 = diff --git a/lib/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl index 1e675d5e27..dac6a30bee 100644 --- a/lib/ssl/test/ssl_api_SUITE.erl +++ b/lib/ssl/test/ssl_api_SUITE.erl @@ -837,7 +837,6 @@ handshake_continue(Config) when is_list(Config) -> {from, self()}, {mfa, {ssl_test_lib, send_recv_result_active, []}}, {options, ssl_test_lib:ssl_options([{reuseaddr, true}, - {log_level, debug}, {verify, verify_peer}, {handshake, hello} | ServerOpts ], @@ -880,7 +879,6 @@ handshake_continue_tls13_client(Config) when is_list(Config) -> {from, self()}, {mfa, {ssl_test_lib, send_recv_result_active, []}}, {options, ssl_test_lib:ssl_options([{reuseaddr, true}, - {log_level, debug}, {verify, verify_peer}, {ciphers, SCiphers}, {handshake, hello} | ServerOpts diff --git a/lib/ssl/test/ssl_cert_SUITE.erl b/lib/ssl/test/ssl_cert_SUITE.erl index 986cd0ead6..e209d025e4 100644 --- a/lib/ssl/test/ssl_cert_SUITE.erl +++ b/lib/ssl/test/ssl_cert_SUITE.erl @@ -1202,7 +1202,7 @@ signature_algorithms_bad_curve_secp256r1(Config) -> ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config), ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config), %% Set versions - ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']}, {log_level, debug}|ServerOpts0], + ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']} | ServerOpts0], ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']}, {signature_algs, [ecdsa_secp384r1_sha384, ecdsa_secp521r1_sha512, @@ -1219,7 +1219,7 @@ signature_algorithms_bad_curve_secp384r1(Config) -> ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config), ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config), %% Set versions - ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']}, {log_level, debug}|ServerOpts0], + ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']} | ServerOpts0], ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']}, {signature_algs, [ecdsa_secp256r1_sha256, ecdsa_secp521r1_sha512, @@ -1236,7 +1236,7 @@ signature_algorithms_bad_curve_secp521r1(Config) -> ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config), ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config), %% Set versions - ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']}, {log_level, debug}|ServerOpts0], + ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']} | ServerOpts0], ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']}, {signature_algs, [ecdsa_secp256r1_sha256, ecdsa_secp384r1_sha384, diff --git a/lib/ssl/test/ssl_key_update_SUITE.erl b/lib/ssl/test/ssl_key_update_SUITE.erl index aba6a02ddc..b4979c4ed3 100644 --- a/lib/ssl/test/ssl_key_update_SUITE.erl +++ b/lib/ssl/test/ssl_key_update_SUITE.erl @@ -95,11 +95,9 @@ key_update_at(Config) -> %% {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), Data = "123456789012345", %% 15 bytes - Server = ssl_test_lib:start_server(erlang, [{log_level, debug}, - {key_update_at, 15}], Config), + Server = ssl_test_lib:start_server(erlang, [{key_update_at, 15}], Config), Port = ssl_test_lib:inet_port(Server), Client = ssl_test_lib:start_client(erlang, [{port, Port}, - {log_level, debug}, {key_update_at, 15}], Config), %% Sending bytes over limit triggers key update ssl_test_lib:send(Client, Data), @@ -119,10 +117,10 @@ explicit_key_update() -> explicit_key_update(Config) -> Data = "123456789012345", %% 15 bytes - Server = ssl_test_lib:start_server(erlang, [{log_level, debug}], Config), + Server = ssl_test_lib:start_server(erlang, [], Config), Port = ssl_test_lib:inet_port(Server), - Client = ssl_test_lib:start_client(erlang, [{port, Port}, {log_level, debug}], Config), + Client = ssl_test_lib:start_client(erlang, [{port, Port}], Config), ssl_test_lib:send_recv_result_active(Client, Server, Data), ssl_test_lib:update_keys(Client, write), diff --git a/lib/ssl/test/ssl_session_ticket_SUITE.erl b/lib/ssl/test/ssl_session_ticket_SUITE.erl index 8056b40d72..444098044b 100644 --- a/lib/ssl/test/ssl_session_ticket_SUITE.erl +++ b/lib/ssl/test/ssl_session_ticket_SUITE.erl @@ -167,9 +167,9 @@ basic(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts = [{session_tickets, auto}, {log_level, debug}, + ClientOpts = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], - ServerOpts = [{session_tickets, ServerTicketMode}, {log_level, debug}, + ServerOpts = [{session_tickets, ServerTicketMode}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], Server0 = @@ -221,9 +221,9 @@ basic_anti_replay(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts = [{session_tickets, auto}, {log_level, debug}, + ClientOpts = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], - ServerOpts = [{session_tickets, ServerTicketMode}, {log_level, debug}, + ServerOpts = [{session_tickets, ServerTicketMode}, {anti_replay, '10k'}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], @@ -272,13 +272,10 @@ basic_stateful_stateless() -> basic_stateful_stateless(Config) when is_list(Config) -> do_test_mixed(Config, [{session_tickets, auto}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateful}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateless}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}]). basic_stateless_stateful() -> @@ -286,13 +283,10 @@ basic_stateless_stateful() -> basic_stateless_stateful(Config) when is_list(Config) -> do_test_mixed(Config, [{session_tickets, auto}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateless}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateful}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}]). basic_stateful_stateless_anti_replay() -> @@ -300,13 +294,10 @@ basic_stateful_stateless_anti_replay() -> basic_stateful_stateless_anti_replay(Config) when is_list(Config) -> do_test_mixed(Config, [{session_tickets, auto}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateful}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateless}, - {log_level, debug}, {anti_replay, '10k'}, {versions, ['tlsv1.2','tlsv1.3']}]). @@ -315,14 +306,11 @@ basic_stateless_stateful_anti_replay() -> basic_stateless_stateful_anti_replay(Config) when is_list(Config) -> do_test_mixed(Config, [{session_tickets, auto}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateless}, - {log_level, debug}, {anti_replay, '10k'}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateful}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}]). basic_stateful_stateless_faulty_ticket() -> @@ -330,19 +318,15 @@ basic_stateful_stateless_faulty_ticket() -> basic_stateful_stateless_faulty_ticket(Config) when is_list(Config) -> do_test_mixed(Config, [{session_tickets, auto}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, manual}, {use_ticket, [<<131,100,0,12,"faultyticket">>, <<"faulty ticket">>]}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateless}, - {log_level, debug}, {anti_replay, '10k'}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateful}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}]). basic_stateless_stateful_faulty_ticket() -> @@ -350,19 +334,15 @@ basic_stateless_stateful_faulty_ticket() -> basic_stateless_stateful_faulty_ticket(Config) when is_list(Config) -> do_test_mixed(Config, [{session_tickets, auto}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, manual}, {use_ticket, [<<"faulty ticket">>, <<131,100,0,12,"faultyticket">>]}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateless}, - {log_level, debug}, {anti_replay, '10k'}, {versions, ['tlsv1.2','tlsv1.3']}], [{session_tickets, stateful}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}]). hello_retry_request() -> @@ -374,10 +354,10 @@ hello_retry_request(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts = [{session_tickets, auto}, {log_level, debug}, + ClientOpts = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}, {supported_groups,[secp256r1, x25519]}|ClientOpts0], - ServerOpts = [{session_tickets, ServerTicketMode}, {log_level, debug}, + ServerOpts = [{session_tickets, ServerTicketMode}, {versions, ['tlsv1.2','tlsv1.3']}, {supported_groups, [x448, x25519]}|ServerOpts0], @@ -430,9 +410,9 @@ multiple_tickets(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts = [{session_tickets, manual}, {log_level, debug}, + ClientOpts = [{session_tickets, manual}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], - ServerOpts = [{session_tickets, ServerTicketMode}, {log_level, debug}, + ServerOpts = [{session_tickets, ServerTicketMode}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], Server0 = @@ -488,9 +468,9 @@ multiple_tickets_2hash(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts = [{session_tickets, manual}, {log_level, debug}, + ClientOpts = [{session_tickets, manual}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], - ServerOpts = [{session_tickets, ServerTicketMode}, {log_level, debug}, + ServerOpts = [{session_tickets, ServerTicketMode}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], Server0 = @@ -617,7 +597,7 @@ early_data_trial_decryption(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, auto}, {log_level, debug}, + ClientOpts1 = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], %% Send maximum sized early data to verify calculation of plain text size %% in the server. @@ -625,7 +605,6 @@ early_data_trial_decryption(Config) when is_list(Config) -> %% Disabled early data triggers trial decryption upon receiving early data ServerOpts = [{session_tickets, ServerTicketMode}, {early_data, disabled}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], Server0 = @@ -677,7 +656,7 @@ early_data_client_too_much_data(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, manual}, {log_level, debug}, + ClientOpts1 = [{session_tickets, manual}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], %% Send more early data than max_early_data_size to verify calculation %% of plain text size in the server. @@ -685,7 +664,6 @@ early_data_client_too_much_data(Config) when is_list(Config) -> ClientOpts2 = [{early_data, binary:copy(<<"F">>, 16384)}|ClientOpts1], ServerOpts = [{session_tickets, ServerTicketMode}, {early_data, disabled}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], application:set_env(ssl, server_session_ticket_max_early_data, MaxEarlyDataSize), @@ -739,7 +717,7 @@ early_data_trial_decryption_failure(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, manual}, {log_level, debug}, + ClientOpts1 = [{session_tickets, manual}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], %% Send more early data than max_early_data_size to verify calculation %% of plain text size in the server. @@ -756,7 +734,6 @@ early_data_trial_decryption_failure(Config) when is_list(Config) -> %% in the ticket used for the 0-RTT handshake. If more data is sent the %% client will trigger an illegal_parameter alert (too_much_early_data). ServerOpts = [{session_tickets, ServerTicketMode}, {early_data, disabled}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], application:set_env(ssl, server_session_ticket_max_early_data, MaxEarlyDataSize), @@ -812,7 +789,7 @@ early_data_decryption_failure(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, manual}, {log_level, debug}, + ClientOpts1 = [{session_tickets, manual}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], %% Send more early data than max_early_data_size to verify calculation %% of plain text size in the server. @@ -820,7 +797,6 @@ early_data_decryption_failure(Config) when is_list(Config) -> ClientOpts2 = [{early_data, binary:copy(<<"F">>, 16385)}|ClientOpts1], ServerOpts = [{session_tickets, ServerTicketMode}, {early_data, enabled}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], application:set_env(ssl, server_session_ticket_max_early_data, MaxEarlyDataSize), @@ -876,7 +852,7 @@ early_data_disabled_small_limit(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, auto}, {log_level, debug}, + ClientOpts1 = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], %% Send maximum sized early data to verify calculation of plain text size %% in the server. @@ -885,7 +861,6 @@ early_data_disabled_small_limit(Config) when is_list(Config) -> %% Disabled early data triggers trial decryption upon receiving early data ServerOpts = [{session_tickets, ServerTicketMode}, {early_data, disabled}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], application:set_env(ssl, server_session_ticket_max_early_data, MaxEarlyDataSize), Server0 = @@ -938,7 +913,7 @@ early_data_enabled_small_limit(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, auto}, {log_level, debug}, + ClientOpts1 = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], %% Send maximum sized early data to verify calculation of plain text size %% in the server. @@ -947,7 +922,6 @@ early_data_enabled_small_limit(Config) when is_list(Config) -> %% Disabled early data triggers trial decryption upon receiving early data ServerOpts = [{session_tickets, ServerTicketMode}, {early_data, enabled}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], application:set_env(ssl, server_session_ticket_max_early_data, MaxEarlyDataSize), Server0 = @@ -1000,7 +974,7 @@ early_data_basic(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, auto}, {log_level, debug}, + ClientOpts1 = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], %% Send maximum sized early data to verify calculation of plain text size %% in the server. @@ -1009,7 +983,6 @@ early_data_basic(Config) when is_list(Config) -> %% Disabled early data triggers trial decryption upon receiving early data ServerOpts = [{session_tickets, ServerTicketMode}, {early_data, enabled}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], Server0 = @@ -1061,7 +1034,7 @@ early_data_basic_auth(Config) when is_list(Config) -> ServerTicketMode = proplists:get_value(server_ticket_mode, Config), %% Configure session tickets - ClientOpts1 = [{session_tickets, auto}, {log_level, debug}, + ClientOpts1 = [{session_tickets, auto}, {versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0], %% Send maximum sized early data to verify calculation of plain text size %% in the server. @@ -1070,7 +1043,6 @@ early_data_basic_auth(Config) when is_list(Config) -> %% Disabled early data triggers trial decryption upon receiving early data ServerOpts = [{session_tickets, ServerTicketMode}, {early_data, enabled}, - {log_level, debug}, {versions, ['tlsv1.2','tlsv1.3']}|ServerOpts0], Server0 = diff --git a/lib/ssl/test/ssl_sni_SUITE.erl b/lib/ssl/test/ssl_sni_SUITE.erl index a5419e8586..ab243bc6c9 100644 --- a/lib/ssl/test/ssl_sni_SUITE.erl +++ b/lib/ssl/test/ssl_sni_SUITE.erl @@ -379,7 +379,7 @@ sni_no_trailing_dot(Config) when is_list(Config) -> Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, {from, self()}, {mfa, {ssl_test_lib, no_result, []}}, - {options, [{log_level, debug} | ServerOpts]}]), + {options, [ServerOpts]}]), Port = ssl_test_lib:inet_port(Server), @@ -387,8 +387,8 @@ sni_no_trailing_dot(Config) when is_list(Config) -> {host, Hostname}, {from, self()}, {mfa, {ssl_test_lib, no_result, []}}, - {options, [{log_level, debug}, - {server_name_indication, Hostname ++ "."} |ClientOpts]}]), + {options, + [{server_name_indication, Hostname ++ "."} | ClientOpts]}]), ssl_test_lib:check_server_alert(Server, Client, unrecognized_name). hostname_trailing_dot() -> -- 2.35.3
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
