diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-06-30 08:54:38 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-06-30 08:54:38 +0200 |
| commit | b467765e2bf4da509240a07968cfd5c51f615850 (patch) | |
| tree | 2746928c05635c83652a0a9ea0e8549394ab0468 /lib/ssl/src/ssl_session.erl | |
| parent | ee679e41535dd83aba7c8fb55fa12bdc6e89313c (diff) | |
| parent | 5f50de5893c26038933d4e1d1f91426e0f23fb15 (diff) | |
| download | otp-b467765e2bf4da509240a07968cfd5c51f615850.tar.gz otp-b467765e2bf4da509240a07968cfd5c51f615850.tar.bz2 otp-b467765e2bf4da509240a07968cfd5c51f615850.zip | |
Merge branch 'ia/ssl/remove-name-from-certifcate-table' into dev
* ia/ssl/remove-name-from-certifcate-table:
Removed global name from the certificate tabel
Diffstat (limited to 'lib/ssl/src/ssl_session.erl')
| -rw-r--r-- | lib/ssl/src/ssl_session.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_session.erl b/lib/ssl/src/ssl_session.erl index dc4b7a711c..85c9fcb61c 100644 --- a/lib/ssl/src/ssl_session.erl +++ b/lib/ssl/src/ssl_session.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2010. All Rights Reserved. +%% Copyright Ericsson AB 2007-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -48,7 +48,7 @@ is_new(_ClientSuggestion, _ServerDecision) -> true. %%-------------------------------------------------------------------- --spec id({host(), port_num(), #ssl_options{}}, cache_ref(), atom(), +-spec id({host(), port_num(), #ssl_options{}}, db_handle(), atom(), undefined | binary()) -> binary(). %% %% Description: Should be called by the client side to get an id @@ -63,7 +63,7 @@ id(ClientInfo, Cache, CacheCb, OwnCert) -> end. %%-------------------------------------------------------------------- --spec id(port_num(), binary(), #ssl_options{}, cache_ref(), +-spec id(port_num(), binary(), #ssl_options{}, db_handle(), atom(), seconds(), binary()) -> binary(). %% %% Description: Should be called by the server side to get an id |