From c9aabc7ea5702f48994fe7c22b1975daddbdb8d8 Mon Sep 17 00:00:00 2001 From: beck <> Date: Sun, 13 Apr 2014 22:37:35 +0000 Subject: Fix the gettimeofday function that I broke with my last commit. noticed by mattheew and deraadt ok deraadt@ --- src/lib/libssl/d1_lib.c | 6 ------ src/lib/libssl/src/ssl/d1_lib.c | 6 ------ 2 files changed, 12 deletions(-) (limited to 'src/lib/libssl') diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c index ec0ff40265..750f83e04a 100644 --- a/src/lib/libssl/d1_lib.c +++ b/src/lib/libssl/d1_lib.c @@ -453,13 +453,7 @@ int dtls1_handle_timeout(SSL *s) static void get_current_time(struct timeval *t) { -#ifdef OPENSSL_SYS_WIN32 - struct _timeb tb; - _ftime(&tb); - t->tv_sec = (long)tb.time; - t->tv_usec = (long)tb.millitm * 1000; gettimeofday(t, NULL); -#endif } int dtls1_listen(SSL *s, struct sockaddr *client) diff --git a/src/lib/libssl/src/ssl/d1_lib.c b/src/lib/libssl/src/ssl/d1_lib.c index ec0ff40265..750f83e04a 100644 --- a/src/lib/libssl/src/ssl/d1_lib.c +++ b/src/lib/libssl/src/ssl/d1_lib.c @@ -453,13 +453,7 @@ int dtls1_handle_timeout(SSL *s) static void get_current_time(struct timeval *t) { -#ifdef OPENSSL_SYS_WIN32 - struct _timeb tb; - _ftime(&tb); - t->tv_sec = (long)tb.time; - t->tv_usec = (long)tb.millitm * 1000; gettimeofday(t, NULL); -#endif } int dtls1_listen(SSL *s, struct sockaddr *client) -- cgit v1.2.3-55-g6feb