diff options
| author | Loïc Hoguin <[email protected]> | 2019-05-09 10:18:53 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2019-05-09 10:47:14 +0200 |
| commit | e92171a8f80755dad795691ad9e07807212d0d1c (patch) | |
| tree | cc3ff85ea7b057fa923219a6bf6897f16d09bfa0 /src/ranch_ssl.erl | |
| parent | 34758e99d52f45fcdf86833574ca2972c130bd4d (diff) | |
| download | ranch-e92171a8f80755dad795691ad9e07807212d0d1c.tar.gz ranch-e92171a8f80755dad795691ad9e07807212d0d1c.tar.bz2 ranch-e92171a8f80755dad795691ad9e07807212d0d1c.zip | |
Use ssl:handshake instead of ssl:ssl_accept
This makes Ranch require OTP-21+. The function ranch:accept_ack/1
was also removed in this commit.
Diffstat (limited to 'src/ranch_ssl.erl')
| -rw-r--r-- | src/ranch_ssl.erl | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl index 8ab71e7..2b246f7 100644 --- a/src/ranch_ssl.erl +++ b/src/ranch_ssl.erl @@ -15,17 +15,12 @@ -module(ranch_ssl). -behaviour(ranch_transport). --ifdef(OTP_RELEASE). --compile({nowarn_deprecated_function, [{ssl, ssl_accept, 3}]}). --endif. - -export([name/0]). -export([secure/0]). -export([messages/0]). -export([listen/1]). -export([disallowed_listen_options/0]). -export([accept/2]). --export([accept_ack/2]). -export([handshake/3]). -export([connect/3]). -export([connect/4]). @@ -131,17 +126,10 @@ disallowed_listen_options() -> accept(LSocket, Timeout) -> ssl:transport_accept(LSocket, Timeout). --spec accept_ack(ssl:sslsocket(), timeout()) -> ok. -accept_ack(CSocket, Timeout) -> - {ok, _} = handshake(CSocket, [], Timeout), - ok. - -spec handshake(inet:socket() | ssl:sslsocket(), opts(), timeout()) -> {ok, ssl:sslsocket()} | {error, any()}. handshake(CSocket, Opts, Timeout) -> - case ssl:ssl_accept(CSocket, Opts, Timeout) of - ok -> - {ok, CSocket}; + case ssl:handshake(CSocket, Opts, Timeout) of {ok, NewSocket} -> {ok, NewSocket}; Error = {error, _} -> |