From 14a6570f318562faf850f842ef3ce56f54ddc890 Mon Sep 17 00:00:00 2001 From: Kurt Roeckx Date: Sun, 19 Feb 2017 16:59:25 +0100 Subject: [PATCH] Use a fixed time when fuzzing. Reviewed-by: Rich Salz Reviewed-by: Andy Polyakov GH: #2683 --- fuzz/client.c | 18 ++++++++++++++++++ fuzz/server.c | 19 ++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/fuzz/client.c b/fuzz/client.c index 9404a95a68..622d782b2c 100644 --- a/fuzz/client.c +++ b/fuzz/client.c @@ -8,6 +8,7 @@ * or in the file LICENSE in the source distribution. */ +#include #include #include #include @@ -25,6 +26,23 @@ extern int rand_predictable; /* unused, to avoid warning. */ static int idx; +#define FUZZTIME 1485898104 + +#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. + */ +#if defined(_WIN32) && defined(_TIME64_T_DEFINED) +time64_t _time64(time64_t *t) TIME_IMPL(t) +#endif +#if !defined(_WIN32) || !defined(_MSC_VER) +time_t time(time_t *t) TIME_IMPL(t) +#endif + int FuzzerInitialize(int *argc, char ***argv) { STACK_OF(SSL_COMP) *comp_methods; diff --git a/fuzz/server.c b/fuzz/server.c index 5bbba1c26a..8c5e2d8d4a 100644 --- a/fuzz/server.c +++ b/fuzz/server.c @@ -12,7 +12,7 @@ /* Test first part of SSL server handshake. */ - +#include #include #include #include @@ -473,6 +473,23 @@ extern int rand_predictable; /* unused, to avoid warning. */ static int idx; +#define FUZZTIME 1485898104 + +#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. + */ +#if defined(_WIN32) && defined(_TIME64_T_DEFINED) +time64_t _time64(time64_t *t) TIME_IMPL(t) +#endif +#if !defined(_WIN32) || !defined(_MSC_VER) +time_t time(time_t *t) TIME_IMPL(t) +#endif + int FuzzerInitialize(int *argc, char ***argv) { STACK_OF(SSL_COMP) *comp_methods; -- 2.25.1