diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-09-05 10:46:33 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-05 10:46:33 +0200 |
| commit | e0db6ad2087d1750de433b1c198ab8cc08872d79 (patch) | |
| tree | 84e99ad8379a1f0b46c8538fc1392655e1d177f2 /lib/ssl/src/ssl_handshake.erl | |
| parent | e3ea0057e30ee844076df98a8a7350ebb78754d8 (diff) | |
| parent | 7db84033da5880f2e3501865749a8c166fe2d358 (diff) | |
| download | otp-e0db6ad2087d1750de433b1c198ab8cc08872d79.tar.gz otp-e0db6ad2087d1750de433b1c198ab8cc08872d79.tar.bz2 otp-e0db6ad2087d1750de433b1c198ab8cc08872d79.zip | |
Merge remote branch 'upstream/dev' into major
* upstream/dev:
Corrected spec name errors: ip_adress -> ip_address port_num -> port_number
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 2dfa1741c5..453ea20f99 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(), inet:port_num(), #connection_states{}, +-spec client_hello(host(), inet:port_number(), #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{} | {inet:port_num(), #session{}, db_handle(), + #connection_states{} | {inet:port_number(), #session{}, db_handle(), atom(), #connection_states{}, binary()}, boolean()) -> {tls_version(), session_id(), #connection_states{}}| {tls_version(), {resumed | new, #session{}}, |