diff options
| author | Björn Gustavsson <[email protected]> | 2017-08-10 14:16:56 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-08-10 14:16:56 +0200 |
| commit | e16195c1d675c0d929af1ad75e7f3a7838429fd8 (patch) | |
| tree | 6f3e955bee10bf7d206ab0d41a62c213fc73afff /lib/ssl | |
| parent | e56a676958b86d9190747301e032481811d61a36 (diff) | |
| parent | 49918dd747d6d949d72ca51f1323b04abd2afba5 (diff) | |
| download | otp-e16195c1d675c0d929af1ad75e7f3a7838429fd8.tar.gz otp-e16195c1d675c0d929af1ad75e7f3a7838429fd8.tar.bz2 otp-e16195c1d675c0d929af1ad75e7f3a7838429fd8.zip | |
Merge branch 'maint'
* maint:
sys_core_fold: Fix unsafe optimization of non-variable apply
Correct type specification in ssl:prf/5
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 2 |
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 72535c05cb..86b22f1572 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 |