diff options
Diffstat (limited to 'lib/ssl/test/tls_api_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/tls_api_SUITE.erl | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/ssl/test/tls_api_SUITE.erl b/lib/ssl/test/tls_api_SUITE.erl index ccba623861..405bb74b2d 100644 --- a/lib/ssl/test/tls_api_SUITE.erl +++ b/lib/ssl/test/tls_api_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2019-2022. All Rights Reserved. +%% Copyright Ericsson AB 2019-2023. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -296,7 +296,7 @@ tls_upgrade_new_opts_with_sni_fun() -> [{doc,"Test that you can upgrade an tcp connection to an ssl connection with new versions option provided by sni_fun"}]. tls_upgrade_new_opts_with_sni_fun(Config) when is_list(Config) -> - ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config), + ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config), ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config), {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), TcpOpts = [binary, {reuseaddr, true}], @@ -322,8 +322,7 @@ tls_upgrade_new_opts_with_sni_fun(Config) when is_list(Config) -> {from, self()}, {mfa, {?MODULE, upgrade_result, []}}, {tcp_options, [binary]}, - {ssl_options, [{verify, verify_peer}, - {versions, [Version |NewVersions]}, + {ssl_options, [{versions, [Version |NewVersions]}, {ciphers, Ciphers}, {server_name_indication, Hostname} | ClientOpts]}]), @@ -789,10 +788,10 @@ tls_reject_warning_alert_in_initial_hs() -> [{doc,"Test sending warning ALERT instead of client hello"}]. tls_reject_warning_alert_in_initial_hs(Config) when is_list(Config) -> ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config), - {_ClientNode, ServerNode, _Hostname} = ssl_test_lib:run_where(Config), + {_Clientnode, ServerNode, _Hostname} = ssl_test_lib:run_where(Config), {Major, Minor} = case ssl_test_lib:protocol_version(Config, tuple) of - {3,4} -> - {3,3}; + ?TLS_1_3 -> + ?TLS_1_2; Other -> Other end, @@ -815,8 +814,8 @@ tls_reject_fake_warning_alert_in_initial_hs(Config) when is_list(Config) -> ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config), {_ClientNode, ServerNode, _Hostname} = ssl_test_lib:run_where(Config), {Major, Minor} = case ssl_test_lib:protocol_version(Config, tuple) of - {3,4} -> - {3,3}; + ?TLS_1_3 -> + ?TLS_1_2; Other -> Other end, @@ -841,8 +840,8 @@ tls_app_data_in_initial_hs_state(Config) when is_list(Config) -> {_ClientNode, ServerNode, _Hostname} = ssl_test_lib:run_where(Config), Version = ssl_test_lib:protocol_version(Config, tuple), {Major, Minor} = case Version of - {3,4} -> - {3,3}; + ?TLS_1_3 -> + ?TLS_1_2; Other -> Other end, @@ -853,7 +852,7 @@ tls_app_data_in_initial_hs_state(Config) when is_list(Config) -> Port = ssl_test_lib:inet_port(Server), {ok, Socket} = gen_tcp:connect("localhost", Port, [{active, false}, binary]), AppData = case Version of - {3, 4} -> + ?TLS_1_3 -> <<?BYTE(?APPLICATION_DATA), ?BYTE(3), ?BYTE(3), ?UINT16(4), ?BYTE($F), ?BYTE($O), ?BYTE($O), ?BYTE(?APPLICATION_DATA)>>; _ -> |