aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVance Shipley <[email protected]>2017-07-10 10:46:10 +0530
committerVance Shipley <[email protected]>2017-07-10 10:46:10 +0530
commit1e4b7915dd529214c9ab61687cd31f9d4f7425b4 (patch)
treec6b5c20b8a34780864d178d4bb2d46b4a3001510
parent0e9e2dadbee5dfcd78fb63a0120961a3782fe9a7 (diff)
downloadotp-1e4b7915dd529214c9ab61687cd31f9d4f7425b4.tar.gz
otp-1e4b7915dd529214c9ab61687cd31f9d4f7425b4.tar.bz2
otp-1e4b7915dd529214c9ab61687cd31f9d4f7425b4.zip
Correct type specification in ssl:prf/5
Current implementation expects Seed to be a list. Correct type specification to match.
-rw-r--r--lib/ssl/src/ssl.erl2
-rw-r--r--lib/ssl/src/ssl_connection.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 75eb308ba5..801aa8f256 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -569,7 +569,7 @@ renegotiate(#sslsocket{pid = {Listen,_}}) when is_port(Listen) ->
%%--------------------------------------------------------------------
-spec prf(#sslsocket{}, binary() | 'master_secret', binary(),
- binary() | prf_random(), non_neg_integer()) ->
+ [binary() | prf_random()], non_neg_integer()) ->
{ok, binary()} | {error, reason()}.
%%
%% Description: use a ssl sessions TLS PRF to generate key material
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index fb87662c7b..f3fbe254f3 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -264,7 +264,7 @@ renegotiation(ConnectionPid) ->
%%--------------------------------------------------------------------
-spec prf(pid(), binary() | 'master_secret', binary(),
- binary() | ssl:prf_random(), non_neg_integer()) ->
+ [binary() | ssl:prf_random()], non_neg_integer()) ->
{ok, binary()} | {error, reason()} | {'EXIT', term()}.
%%
%% Description: use a ssl sessions TLS PRF to generate key material