diff options
author | Ingela Anderton Andin <[email protected]> | 2015-03-13 15:28:52 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-03-13 15:28:52 +0100 |
commit | d311a090908521f1a9b131c1bd12582d3ef2aaf3 (patch) | |
tree | 97a1486f4093862a0278938acdcb1317f4b944fb /lib/ssl/src/dtls_connection.erl | |
parent | 0b5ae3e554c7c1220281df138fb0cefb76860427 (diff) | |
parent | b65d8b7ba72a42cfe5df28577433e553d2c0f4ca (diff) | |
download | otp-d311a090908521f1a9b131c1bd12582d3ef2aaf3.tar.gz otp-d311a090908521f1a9b131c1bd12582d3ef2aaf3.tar.bz2 otp-d311a090908521f1a9b131c1bd12582d3ef2aaf3.zip |
Merge branch 'ia/ssl/crls-dialyzer'
* ia/ssl/crls-dialyzer:
ssl: Dialyzer fixes
Diffstat (limited to 'lib/ssl/src/dtls_connection.erl')
-rw-r--r-- | lib/ssl/src/dtls_connection.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl index 508983ddac..f177a8610d 100644 --- a/lib/ssl/src/dtls_connection.erl +++ b/lib/ssl/src/dtls_connection.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2014. All Rights Reserved. +%% Copyright Ericsson AB 2013-2015. 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 @@ -146,7 +146,7 @@ init([Role, Host, Port, Socket, {SSLOpts0, _} = Options, User, CbInfo]) -> Handshake = ssl_handshake:init_handshake_history(), TimeStamp = calendar:datetime_to_gregorian_seconds({date(), time()}), try ssl_config:init(SSLOpts0, Role) of - {ok, Ref, CertDbHandle, FileRefHandle, CacheHandle, OwnCert, Key, DHParams} -> + {ok, Ref, CertDbHandle, FileRefHandle, CacheHandle, CRLDbInfo, OwnCert, Key, DHParams} -> Session = State0#state.session, State = State0#state{ tls_handshake_history = Handshake, @@ -155,6 +155,7 @@ init([Role, Host, Port, Socket, {SSLOpts0, _} = Options, User, CbInfo]) -> file_ref_db = FileRefHandle, cert_db_ref = Ref, cert_db = CertDbHandle, + crl_db = CRLDbInfo, session_cache = CacheHandle, private_key = Key, diffie_hellman_params = DHParams}, |