diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-03-28 12:01:31 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-03-28 12:01:31 +0200 |
| commit | e93c9db144d3c9ffe032d0d316c31f9750b21739 (patch) | |
| tree | b42106c23a8fa10b911eeb701320e774a500f3b0 /lib/ssl/src/ssl_connection.erl | |
| parent | 40db677901d8b229773e45175bf55ebde66a7734 (diff) | |
| parent | 49acec1bbc272556f87d47faf5dbc5b8f260598e (diff) | |
| download | otp-e93c9db144d3c9ffe032d0d316c31f9750b21739.tar.gz otp-e93c9db144d3c9ffe032d0d316c31f9750b21739.tar.bz2 otp-e93c9db144d3c9ffe032d0d316c31f9750b21739.zip | |
Merge branch 'ia/ssl/dialyzer-specs' into maint
* ia/ssl/dialyzer-specs:
Corrected dialyzer specs and exported some dialyzer specs
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 59133dccf0..6c06baff98 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2011. All Rights Reserved. +%% Copyright Ericsson AB 2007-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -276,7 +276,7 @@ renegotiation(ConnectionPid) -> %%-------------------------------------------------------------------- -spec prf(pid(), binary() | 'master_secret', binary(), - binary() | ssl:prf_secret(), 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 |