diff options
author | beck <> | 2014-04-13 22:37:35 +0000 |
---|---|---|
committer | beck <> | 2014-04-13 22:37:35 +0000 |
commit | 837d17aa9cd1d51306cb29c073f22b3d55da8bb5 (patch) | |
tree | 432601fa0950e4a9c495a3070ab353db60fa6072 /src | |
parent | 67277315c098519f5672fc94026c0d1ac9e4c8d9 (diff) | |
download | openbsd-837d17aa9cd1d51306cb29c073f22b3d55da8bb5.tar.gz openbsd-837d17aa9cd1d51306cb29c073f22b3d55da8bb5.tar.bz2 openbsd-837d17aa9cd1d51306cb29c073f22b3d55da8bb5.zip |
Fix the gettimeofday function that I broke with my last commit.
noticed by mattheew and deraadt
ok deraadt@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/d1_lib.c | 6 | ||||
-rw-r--r-- | src/lib/libssl/src/ssl/d1_lib.c | 6 |
2 files changed, 0 insertions, 12 deletions
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) | |||
453 | 453 | ||
454 | static void get_current_time(struct timeval *t) | 454 | static void get_current_time(struct timeval *t) |
455 | { | 455 | { |
456 | #ifdef OPENSSL_SYS_WIN32 | ||
457 | struct _timeb tb; | ||
458 | _ftime(&tb); | ||
459 | t->tv_sec = (long)tb.time; | ||
460 | t->tv_usec = (long)tb.millitm * 1000; | ||
461 | gettimeofday(t, NULL); | 456 | gettimeofday(t, NULL); |
462 | #endif | ||
463 | } | 457 | } |
464 | 458 | ||
465 | int dtls1_listen(SSL *s, struct sockaddr *client) | 459 | 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) | |||
453 | 453 | ||
454 | static void get_current_time(struct timeval *t) | 454 | static void get_current_time(struct timeval *t) |
455 | { | 455 | { |
456 | #ifdef OPENSSL_SYS_WIN32 | ||
457 | struct _timeb tb; | ||
458 | _ftime(&tb); | ||
459 | t->tv_sec = (long)tb.time; | ||
460 | t->tv_usec = (long)tb.millitm * 1000; | ||
461 | gettimeofday(t, NULL); | 456 | gettimeofday(t, NULL); |
462 | #endif | ||
463 | } | 457 | } |
464 | 458 | ||
465 | int dtls1_listen(SSL *s, struct sockaddr *client) | 459 | int dtls1_listen(SSL *s, struct sockaddr *client) |