diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-07 10:36:15 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-07 10:36:15 +0100 |
| commit | 9ffec8e28809e74d44ed715ad3191c45da019c24 (patch) | |
| tree | ed3424f31eba912aa4f30e8ed5b748713e70964d /lib/ssl/src/dtls_connection.erl | |
| parent | c84f85cc31ae8f13e8a44b866b90ad51f1c676c3 (diff) | |
| parent | f258633921e7dd0bd5760281d2a26a0f937e53c4 (diff) | |
| download | otp-9ffec8e28809e74d44ed715ad3191c45da019c24.tar.gz otp-9ffec8e28809e74d44ed715ad3191c45da019c24.tar.bz2 otp-9ffec8e28809e74d44ed715ad3191c45da019c24.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/dtls_connection.erl')
| -rw-r--r-- | lib/ssl/src/dtls_connection.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl index 78662e0ea2..153d3fef48 100644 --- a/lib/ssl/src/dtls_connection.erl +++ b/lib/ssl/src/dtls_connection.erl @@ -145,7 +145,7 @@ init([Role, Host, Port, Socket, {SSLOpts0, _} = Options, User, CbInfo]) -> process_flag(trap_exit, true), State0 = initial_state(Role, Host, Port, Socket, Options, User, CbInfo), Handshake = ssl_handshake:init_handshake_history(), - TimeStamp = calendar:datetime_to_gregorian_seconds({date(), time()}), + TimeStamp = erlang:monotonic_time(), try ssl_config:init(SSLOpts0, Role) of {ok, Ref, CertDbHandle, FileRefHandle, CacheHandle, CRLDbInfo, OwnCert, Key, DHParams} -> Session = State0#state.session, |