diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-09-03 16:00:09 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-09-03 16:00:09 +0200 |
| commit | e752dcdefda84291cf819036a600b983326dae25 (patch) | |
| tree | 3362174fe3ad7d7d5c9c98ae45b6a4a215c2adbf /lib/ssl/src/ssl_manager.erl | |
| parent | ec806e4ac537b48241530a397b839117b75708dc (diff) | |
| parent | 1798dbcd3fe62d178d2150105f8c5a8f61dcbedb (diff) | |
| download | otp-e752dcdefda84291cf819036a600b983326dae25.tar.gz otp-e752dcdefda84291cf819036a600b983326dae25.tar.bz2 otp-e752dcdefda84291cf819036a600b983326dae25.zip | |
Merge branch 'ia/ssl-DER-input/OTP-8723' into dev
* ia/ssl-DER-input/OTP-8723:
DER format in API
Diffstat (limited to 'lib/ssl/src/ssl_manager.erl')
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index 459dcefb79..0116466677 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -69,12 +69,12 @@ start_link(Opts) -> gen_server:start_link({local, ?MODULE}, ?MODULE, [Opts], []). %%-------------------------------------------------------------------- --spec connection_init(string(), client | server) -> {ok, reference(), cache_ref()}. +-spec connection_init(string()| {der, list()}, client | server) -> {ok, reference(), cache_ref()}. %% %% Description: Do necessary initializations for a new connection. %%-------------------------------------------------------------------- -connection_init(TrustedcertsFile, Role) -> - call({connection_init, TrustedcertsFile, Role}). +connection_init(Trustedcerts, Role) -> + call({connection_init, Trustedcerts, Role}). %%-------------------------------------------------------------------- -spec cache_pem_file(string()) -> {ok, term()}. %% @@ -185,13 +185,13 @@ handle_call({{connection_init, "", _Role}, Pid}, _From, Result = {ok, make_ref(), Cache}, {reply, Result, State}; -handle_call({{connection_init, TrustedcertsFile, _Role}, Pid}, _From, +handle_call({{connection_init, Trustedcerts, _Role}, Pid}, _From, #state{certificate_db = Db, session_cache = Cache} = State) -> erlang:monitor(process, Pid), Result = try - {ok, Ref} = ssl_certificate_db:add_trusted_certs(Pid, TrustedcertsFile, Db), + {ok, Ref} = ssl_certificate_db:add_trusted_certs(Pid, Trustedcerts, Db), {ok, Ref, Cache} catch _:Reason -> |