You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-09 12:50:35 +00:00
Bump mbedtls to version 2.18.1, update LICENSE.
Keep applying windows entropy patch.
Update thirdparty/README with correct version information.
(cherry picked from commit 9403a68853)
This commit is contained in:
committed by
Rémi Verschelde
parent
3f6dd33526
commit
df94010dec
9
thirdparty/mbedtls/library/timing.c
vendored
9
thirdparty/mbedtls/library/timing.c
vendored
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user