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_handshake.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_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index ef60cac6df..2e0a3de182 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -543,7 +543,7 @@ server_key_exchange_hash(dhe_dss, Value) -> crypto:sha(Value). %%-------------------------------------------------------------------- --spec prf(tls_version(), binary(), binary(), binary(), non_neg_integer()) -> +-spec prf(tls_version(), binary(), binary(), [binary()], non_neg_integer()) -> {ok, binary()} | {error, undefined}. %% %% Description: use the TLS PRF to generate key material |