aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Andin <[email protected]>2017-08-10 11:58:52 +0200
committerGitHub <[email protected]>2017-08-10 11:58:52 +0200
commit8689569bb3964151d3734c634ea930dae9171655 (patch)
treeb197bd7c668f8f8f2c4dd852ccb3cf003e73bdab /lib/ssl
parent2432649120fd413894b5bb60d8ac864f6632e868 (diff)
parent1e4b7915dd529214c9ab61687cd31f9d4f7425b4 (diff)
downloadotp-8689569bb3964151d3734c634ea930dae9171655.tar.gz
otp-8689569bb3964151d3734c634ea930dae9171655.tar.bz2
otp-8689569bb3964151d3734c634ea930dae9171655.zip
Merge pull request #1507 from vances/issue-erl-442
Correct type specification in ssl:prf/5
Diffstat (limited to 'lib/ssl')
-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 0163d08f2a..1afc4ad2af 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