diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-08-31 11:41:15 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-08-31 11:41:15 +0200 |
| commit | bf8f3e3d5d928dfc63408439379d7a39880e730b (patch) | |
| tree | eb555b6307076b0439994f0288f95c09974be4f2 /lib/ssl/src/ssl_handshake.erl | |
| parent | 45942fb2f521ae7e043987eedc0d6197ba7b55b0 (diff) | |
| parent | 4b0b4d1b8f61886182e93c546de59d08ff7b7caf (diff) | |
| download | otp-bf8f3e3d5d928dfc63408439379d7a39880e730b.tar.gz otp-bf8f3e3d5d928dfc63408439379d7a39880e730b.tar.bz2 otp-bf8f3e3d5d928dfc63408439379d7a39880e730b.zip | |
Merge branch 'ia/ssl/use-inet-and-gen-specs' into dev
* ia/ssl/use-inet-and-gen-specs:
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{}}, |