diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-06-12 09:55:50 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-06-14 12:04:03 +0200 |
| commit | e91b2afc41716557bad662e346e9f978ee3156ba (patch) | |
| tree | 5f7c62c72e5a5e6d7a43af06f39ec464dd81a62e /lib/ssl/src | |
| parent | cabbb94eab4d94f3c924f8854e3f030d7ceca9cc (diff) | |
| download | otp-e91b2afc41716557bad662e346e9f978ee3156ba.tar.gz otp-e91b2afc41716557bad662e346e9f978ee3156ba.tar.bz2 otp-e91b2afc41716557bad662e346e9f978ee3156ba.zip | |
ssl: Add handle_continue/2 and document enhancements
* deprecation of ssl:ssl_accept/[1,2,3]
* deprecation of ssl:cipher_suites/[0,1]
* More consistent naming
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 565cc9e1bc..130276accd 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -40,7 +40,7 @@ %% Socket handling -export([connect/3, connect/2, connect/4, listen/2, transport_accept/1, transport_accept/2, - handshake/1, handshake/2, handshake/3, + handshake/1, handshake/2, handshake/3, handshake_continue/2, handshake_continue/3, handshake_cancel/1, ssl_accept/1, ssl_accept/2, ssl_accept/3, controlling_process/2, peername/1, peercert/1, sockname/1, @@ -259,6 +259,16 @@ handshake(Socket, SslOptions, Timeout) when is_port(Socket), Error = {error, _Reason} -> Error end. + +%%-------------------------------------------------------------------- +-spec handshake_continue(#sslsocket{}, [ssl_option()]) -> + {ok, #sslsocket{}} | {error, reason()}. +%% +%% +%% Description: Continues the handshke possible with newly supplied options. +%%-------------------------------------------------------------------- +handshake_continue(Socket, SSLOptions) -> + handshake_continue(Socket, SSLOptions, infinity). %%-------------------------------------------------------------------- -spec handshake_continue(#sslsocket{}, [ssl_option()], timeout()) -> {ok, #sslsocket{}} | {error, reason()}. |