diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-08-31 11:42:07 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-08-31 11:42:07 +0200 |
| commit | e813241e103aa74d4daf025564b259f3fb9aca5a (patch) | |
| tree | 91a83b8735d66b91b382409748b398c023b5dce3 /lib/ssl/src/ssl_handshake.erl | |
| parent | 03b7d0ab7b998ab498349ebbffda01daadabab8c (diff) | |
| parent | bf8f3e3d5d928dfc63408439379d7a39880e730b (diff) | |
| download | otp-e813241e103aa74d4daf025564b259f3fb9aca5a.tar.gz otp-e813241e103aa74d4daf025564b259f3fb9aca5a.tar.bz2 otp-e813241e103aa74d4daf025564b259f3fb9aca5a.zip | |
Merge remote branch 'upstream/dev' into major
* upstream/dev:
Use inet and gen_* dialyzer specs
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index dfda3e7bc4..2dfa1741c5 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -48,7 +48,7 @@ %% Internal application API %%==================================================================== %%-------------------------------------------------------------------- --spec client_hello(host(), port_num(), #connection_states{}, +-spec client_hello(host(), inet:port_num(), #connection_states{}, #ssl_options{}, boolean(), der_cert()) -> #client_hello{}. %% %% Description: Creates a client hello message. @@ -106,7 +106,7 @@ hello_request() -> %%-------------------------------------------------------------------- -spec hello(#server_hello{} | #client_hello{}, #ssl_options{}, - #connection_states{} | {port_num(), #session{}, db_handle(), + #connection_states{} | {inet:port_num(), #session{}, db_handle(), atom(), #connection_states{}, binary()}, boolean()) -> {tls_version(), session_id(), #connection_states{}}| {tls_version(), {resumed | new, #session{}}, |