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_manager.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_manager.erl')
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index b02815bfd8..56c43a16d1 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -113,7 +113,7 @@ lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer) -> issuer_candidate(PrevCandidateKey, DbHandle) -> ssl_certificate_db:issuer_candidate(PrevCandidateKey, DbHandle). %%-------------------------------------------------------------------- --spec client_session_id(host(), port_num(), #ssl_options{}, +-spec client_session_id(host(), inet:port_num(), #ssl_options{}, der_cert() | undefined) -> session_id(). %% %% Description: Select a session id for the client. @@ -122,7 +122,7 @@ client_session_id(Host, Port, SslOpts, OwnCert) -> call({client_session_id, Host, Port, SslOpts, OwnCert}). %%-------------------------------------------------------------------- --spec server_session_id(host(), port_num(), #ssl_options{}, +-spec server_session_id(host(), inet:port_num(), #ssl_options{}, der_cert()) -> session_id(). %% %% Description: Select a session id for the server. @@ -131,8 +131,8 @@ server_session_id(Port, SuggestedSessionId, SslOpts, OwnCert) -> call({server_session_id, Port, SuggestedSessionId, SslOpts, OwnCert}). %%-------------------------------------------------------------------- --spec register_session(port_num(), #session{}) -> ok. --spec register_session(host(), port_num(), #session{}) -> ok. +-spec register_session(inet:port_num(), #session{}) -> ok. +-spec register_session(host(), inet:port_num(), #session{}) -> ok. %% %% Description: Make the session available for reuse. %%-------------------------------------------------------------------- @@ -142,8 +142,8 @@ register_session(Host, Port, Session) -> register_session(Port, Session) -> cast({register_session, Port, Session}). %%-------------------------------------------------------------------- --spec invalidate_session(port_num(), #session{}) -> ok. --spec invalidate_session(host(), port_num(), #session{}) -> ok. +-spec invalidate_session(inet:port_num(), #session{}) -> ok. +-spec invalidate_session(host(), inet:port_num(), #session{}) -> ok. %% %% Description: Make the session unavailable for reuse. After %% a the session has been marked "is_resumable = false" for some while |