aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2018-06-07 11:13:54 +0200
committerAnders Svensson <[email protected]>2018-06-07 12:28:42 +0200
commit79455556827bd02697d34a8ae307c543d6d93b09 (patch)
tree4502d6d625ff2f36d73503229ae49db2ce3d7476
parent928eca9c694f098d65873f4ac6ceb19b6ba13d6b (diff)
downloadotp-79455556827bd02697d34a8ae307c543d6d93b09.tar.gz
otp-79455556827bd02697d34a8ae307c543d6d93b09.tar.bz2
otp-79455556827bd02697d34a8ae307c543d6d93b09.zip
Don't use deprecated ssl:ssl_accept/1-3
-rw-r--r--lib/diameter/src/diameter.app.src2
-rw-r--r--lib/diameter/src/transport/diameter_tcp.erl4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/diameter/src/diameter.app.src b/lib/diameter/src/diameter.app.src
index 1521f3c006..5a90e89e44 100644
--- a/lib/diameter/src/diameter.app.src
+++ b/lib/diameter/src/diameter.app.src
@@ -31,7 +31,7 @@
{stdlib, "2.4"}, {kernel, "3.2"}%, {erts, "10.0"}
%% {syntax-tools, "1.6,18"}
%% {runtime-tools, "1.8.16"}
- %, {ssl, "6.0"}
+ %, {ssl, "9.0"}
]},
{env, []},
{mod, {diameter_app, []}},
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index a8639baa11..681d273d07 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -716,7 +716,7 @@ tls_handshake(_, false, S) ->
tls(connect, Sock, Opts) ->
ssl:connect(Sock, Opts);
tls(accept, Sock, Opts) ->
- ssl:ssl_accept(Sock, Opts).
+ ssl:handshake(Sock, Opts). %% assume no handshake option
%% recv/2
%%
@@ -839,7 +839,7 @@ start_fragment_timer(#transport{timeout = Tmo} = S) ->
accept(ssl, LSock) ->
case ssl:transport_accept(LSock) of
{ok, Sock} ->
- {ssl:ssl_accept(Sock), Sock};
+ ssl:handshake(Sock);
{error, _} = No ->
No
end;