Skip to content

implement gettime_secs for Windows (_MSC_VER) in tests/api.c #6733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JacobBarthelmeh merged 6 commits into from
Sep 11, 2023
Merged

implement gettime_secs for Windows (_MSC_VER) in tests/api.c #6733

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
321f748
implement gettime_secs for Windows (_MSC_VER) in tests/api.c
Aug 26, 2023
4058dbe
Merge branch 'master' of https://github.com/wolfssl/wolfssl into wind…
Aug 28, 2023
e303f87
move TimeNowInMilliseconds from tls13.c to internal,c; now WOLFSSL_API
Aug 29, 2023
d8fe8b9
gettime_secs() in api.c now uses TimeNowInMilliseconds()
Aug 29, 2023
e74b3ec
revert to only original gettime_secs changes per code review
Sep 7, 2023
bba9add
Merge branch 'master' of https://github.com/wolfssl/wolfssl into wind…
Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66454,12 +66454,28 @@ static const char* apitest_res_string(int res)

#ifndef WOLFSSL_UNIT_TEST_NO_TIMING
static double gettime_secs(void)
{
struct timeval tv;
LIBCALL_CHECK_RET(gettimeofday(&tv, 0));
#if defined(_MSC_VER) && defined(_WIN32)
{
/* there's no gettimeofday for Windows, so we'll use system time */
#define EPOCH_DIFF 11644473600LL
FILETIME currentFileTime;
GetSystemTimePreciseAsFileTime(&currentFileTime);

return (double)tv.tv_sec + (double)tv.tv_usec / 1000000;
}
ULARGE_INTEGER uli = { 0, 0 };
uli.LowPart = currentFileTime.dwLowDateTime;
uli.HighPart = currentFileTime.dwHighDateTime;

/* Convert to seconds since Unix epoch */
return (double)((uli.QuadPart - (EPOCH_DIFF * 10000000)) / 10000000.0);
}
#else
{
struct timeval tv;
LIBCALL_CHECK_RET(gettimeofday(&tv, 0));

return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
}
#endif
#endif

int ApiTest(void)
Expand Down