diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-01-05 11:26:56 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-04-24 09:39:12 +0200 |
| commit | 8dcfffd4fb8520239b189357e81122d4fdacb42d (patch) | |
| tree | fc9bfcda0edead0d6593e6f5abc9c5dce660744e /lib/ssl/src/tls_connection.erl | |
| parent | c171aa54085853afe4bf7097c9b47a0fa9a72378 (diff) | |
| download | otp-8dcfffd4fb8520239b189357e81122d4fdacb42d.tar.gz otp-8dcfffd4fb8520239b189357e81122d4fdacb42d.tar.bz2 otp-8dcfffd4fb8520239b189357e81122d4fdacb42d.zip | |
ssl: Prepare to replace ssl:ssl_accept with ssl:handshake
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index c35378f18f..754eab63e0 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -80,8 +80,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker} {ok, Pid} = tls_connection_sup:start_child([Role, Host, Port, Socket, Opts, User, CbInfo]), {ok, SslSocket} = ssl_connection:socket_control(?MODULE, Socket, Pid, CbModule, Tracker), - ok = ssl_connection:handshake(SslSocket, Timeout), - {ok, SslSocket} + ssl_connection:handshake(SslSocket, Timeout) catch error:{badmatch, {error, _} = Error} -> Error @@ -94,8 +93,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_, Tracker} = {ok, Pid} = tls_connection_sup:start_child_dist([Role, Host, Port, Socket, Opts, User, CbInfo]), {ok, SslSocket} = ssl_connection:socket_control(?MODULE, Socket, Pid, CbModule, Tracker), - ok = ssl_connection:handshake(SslSocket, Timeout), - {ok, SslSocket} + ssl_connection:handshake(SslSocket, Timeout) catch error:{badmatch, {error, _} = Error} -> Error |