diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2022-07-18 14:48:00 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2022-07-18 14:58:08 +0200 |
| commit | 9403a68853784e542bbff51a84e6dc5c89241d2b (patch) | |
| tree | a0d2f80fc094f281648de9122138e8bebd51ab40 /thirdparty/mbedtls/library/timing.c | |
| parent | 73a67f93092239fa35adda4675187549f9c1f903 (diff) | |
Bump mbedtls to version 2.18.1, update LICENSE.
Keep applying windows entropy patch.
Update thirdparty/README with correct version information.
Diffstat (limited to 'thirdparty/mbedtls/library/timing.c')
| -rw-r--r-- | thirdparty/mbedtls/library/timing.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/thirdparty/mbedtls/library/timing.c b/thirdparty/mbedtls/library/timing.c index eb41461320..57bc9bcc12 100644 --- a/thirdparty/mbedtls/library/timing.c +++ b/thirdparty/mbedtls/library/timing.c @@ -56,15 +56,15 @@ struct _hr_time #include <unistd.h> #include <sys/types.h> -#include <sys/time.h> #include <signal.h> +/* time.h should be included independently of MBEDTLS_HAVE_TIME. If the + * platform matches the ifdefs above, it will be used. */ #include <time.h> - +#include <sys/time.h> struct _hr_time { struct timeval start; }; - #endif /* _WIN32 && !EFIX64 && !EFI32 */ #if !defined(HAVE_HARDCLOCK) && defined(MBEDTLS_HAVE_ASM) && \ @@ -364,7 +364,6 @@ int mbedtls_timing_get_delay( void *data ) return( 0 ); } -#endif /* !MBEDTLS_TIMING_ALT */ #if defined(MBEDTLS_SELF_TEST) @@ -526,5 +525,5 @@ hard_test_done: } #endif /* MBEDTLS_SELF_TEST */ - +#endif /* !MBEDTLS_TIMING_ALT */ #endif /* MBEDTLS_TIMING_C */ |