diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-05-17 12:03:55 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-05-21 09:11:12 +0200 |
| commit | 570c1631d35d5f08c3fa7a4074fd4421eb61f871 (patch) | |
| tree | f78cf8f102a8ab8161f43002bdcd9f4251a69e32 /lib/ssl | |
| parent | 8a89cbd2d61e4a9feffcc9f105b1cc9d484f48a0 (diff) | |
| download | otp-570c1631d35d5f08c3fa7a4074fd4421eb61f871.tar.gz otp-570c1631d35d5f08c3fa7a4074fd4421eb61f871.tar.bz2 otp-570c1631d35d5f08c3fa7a4074fd4421eb61f871.zip | |
ssl: Cuddle no delivery guarantee at application level
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index d3b13050e3..75db79aff2 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -686,11 +686,16 @@ hello_client_cancel(Config) when is_list(Config) -> {host, Hostname}, {from, self()}, {options, ssl_test_lib:ssl_options([{handshake, hello}], Config)}, - {continue_options, cancel}]), - - ssl_test_lib:check_result(Server, {error, {tls_alert, "user canceled"}}). -%%-------------------------------------------------------------------- + {continue_options, cancel}]), + receive + {Server, {error, {tls_alert, "user canceled"}}} -> + ok; + {Server, {error, closed}} -> + ct:pal("Did not receive the ALERT"), + ok + end. +%%-------------------------------------------------------------------- hello_server_cancel() -> [{doc, "Test API function ssl:handshake_cancel/1 on the server side"}]. hello_server_cancel(Config) when is_list(Config) -> @@ -5046,8 +5051,14 @@ tls_downgrade_result(Socket) -> tls_close(Socket) -> ok = ssl_test_lib:send_recv_result(Socket), - ok = ssl:close(Socket, 5000). - + case ssl:close(Socket, 5000) of + ok -> + ok; + {error, closed} -> + ok; + Other -> + ct:fail(Other) + end. %% First two clauses handles 1/n-1 splitting countermeasure Rizzo/Duong-Beast treashold(N, {3,0}) -> |