From f469880c611b6b3a981f78a8e4309a8f337904ff Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Sun, 16 Dec 2012 19:02:59 +0000
Subject: [PATCH] d1_lib.c,bss_dgram.c: eliminate dependency on _ftime.

---
 crypto/bio/bss_dgram.c | 14 +++++++++-----
 ssl/d1_lib.c           | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 7b87a043c4..d121386a52 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1895,11 +1895,15 @@ int BIO_dgram_non_fatal_error(int err)
 
 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;
+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
+	SYSTEMTIME st;
+	union { unsigned __int64 ul; FILETIME ft; } now;
+
+	GetSystemTime(&st);
+	SystemTimeToFileTime(&st,&now.ft);
+	now.ul -= 116444736000000000UI64;	/* re-bias to 1/1/1970 */
+	t->tv_sec  = (long)(now.ul/10000000);
+	t->tv_usec = ((int)(now.ul%10000000))/10;
 #elif defined(OPENSSL_SYS_VMS)
 	struct timeb tb;
 	ftime(&tb);
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index f61f718183..048ce3b4b0 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -452,11 +452,15 @@ 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;
+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
+	SYSTEMTIME st;
+	union { unsigned __int64 ul; FILETIME ft; } now;
+
+	GetSystemTime(&st);
+	SystemTimeToFileTime(&st,&now.ft);
+	now.ul -= 116444736000000000UI64;	/* re-bias to 1/1/1970 */
+	t->tv_sec  = (long)(now.ul/10000000);
+	t->tv_usec = ((int)(now.ul%10000000))/10;
 #elif defined(OPENSSL_SYS_VMS)
 	struct timeb tb;
 	ftime(&tb);