openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

fuzz/{client,server}.c: omit _time64 "overload method". 

Approach was opportunistic in Windows context from its inception
and on top of that it was proven to be error-prone at link stage.
Correct answer is to introduce library-specific time function that
we can control in platform-neutral manner.  Meanwhile we just let
be attempts to override time on Windows.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3320)
This commit is contained in:
Andy Polyakov 2017-04-26 15:52:57 +02:00
parent 11ba87f2ff
commit b12ae4a912
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fuzz/client.c
View File

@ -31,15 +31,13 @@ static int idx;
#define TIME_IMPL(t) { if (t != NULL) *t = FUZZTIME; return FUZZTIME; }
/*
* This might not in all cases and still get the current time
* instead of the fixed time. This will just result in things
* not being fully reproducible and have a slightly different
* coverage.
* This might not work in all cases (and definitely not on Windows
* because of the way linkers are) and callees can still get the
* current time instead of the fixed time. This will just result
* in things not being fully reproducible and have a slightly
* different coverage.
*/
#if defined(_WIN32) && defined(_TIME64_T_DEFINED)
__time64_t _time64(__time64_t *t) TIME_IMPL(t)
#endif
#if !defined(_WIN32) || !defined(_MSC_VER)
#if !defined(_WIN32)
time_t time(time_t *t) TIME_IMPL(t)
#endif

14
fuzz/server.c
View File

@ -478,15 +478,13 @@ static int idx;
#define TIME_IMPL(t) { if (t != NULL) *t = FUZZTIME; return FUZZTIME; }
/*
* This might not in all cases and still get the current time
* instead of the fixed time. This will just result in things
* not being fully reproducible and have a slightly different
* coverage.
* This might not work in all cases (and definitely not on Windows
* because of the way linkers are) and callees can still get the
* current time instead of the fixed time. This will just result
* in things not being fully reproducible and have a slightly
* different coverage.
*/
#if defined(_WIN32) && defined(_TIME64_T_DEFINED)
__time64_t _time64(__time64_t *t) TIME_IMPL(t)
#endif
#if !defined(_WIN32) || !defined(_MSC_VER)
#if !defined(_WIN32)
time_t time(time_t *t) TIME_IMPL(t)
#endif