diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-11-16 09:47:44 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-16 09:47:44 +0100 |
| commit | 0d3fa967fda3a3d4b302f7b89887cf034d245a47 (patch) | |
| tree | 511cea215cea89a02bfee9a02e58885a42cfc633 /lib/ssl/src/ssl_manager.erl | |
| parent | e21d0a8c944762cc31e03bf097491d446c55a6af (diff) | |
| parent | a7b8bf5b8162e9c0473213c77d17c739bdffdc35 (diff) | |
| download | otp-0d3fa967fda3a3d4b302f7b89887cf034d245a47.tar.gz otp-0d3fa967fda3a3d4b302f7b89887cf034d245a47.tar.bz2 otp-0d3fa967fda3a3d4b302f7b89887cf034d245a47.zip | |
Merge branch 'ia/ssl/ets-next-problem/OTP-9703'
* ia/ssl/ets-next-problem/OTP-9703:
Replaced ets:next traversal with ets:foldl and throw
Diffstat (limited to 'lib/ssl/src/ssl_manager.erl')
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index 21fc47a69f..6a44ef8c3e 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -29,8 +29,8 @@ %% Internal application API -export([start_link/1, start_link_dist/1, connection_init/2, cache_pem_file/2, - lookup_trusted_cert/4, issuer_candidate/2, client_session_id/4, - server_session_id/4, + lookup_trusted_cert/4, + client_session_id/4, server_session_id/4, register_session/2, register_session/3, invalidate_session/2, invalidate_session/3]). @@ -112,16 +112,7 @@ cache_pem_file(File, DbHandle) -> %% -------------------------------------------------------------------- lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer) -> ssl_certificate_db:lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer). -%%-------------------------------------------------------------------- --spec issuer_candidate(cert_key() | no_candidate, term()) -> - {cert_key(), - {der_cert(), - #'OTPCertificate'{}}} | no_more_candidates. -%% -%% Description: Return next issuer candidate. -%%-------------------------------------------------------------------- -issuer_candidate(PrevCandidateKey, DbHandle) -> - ssl_certificate_db:issuer_candidate(PrevCandidateKey, DbHandle). + %%-------------------------------------------------------------------- -spec client_session_id(host(), inet:port_number(), #ssl_options{}, der_cert() | undefined) -> session_id(). |