yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-08 08:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hardclock with some versions of mingw64

Browse source 
Backport of 383433535 from the 1.3 branch
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-10 17:34:32 +02:00
parent a9553a8c49
commit 7e82884811
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -7,6 +7,8 @@ Security
crash it remotely (found by Caj Larsson). crash it remotely (found by Caj Larsson).
Bugfix Bugfix
* Fix hardclock() (only used in the benchmarking program) with some
versions of mingw64 (found by kxjhlele).
* Fix warnings from mingw64 in timing.c (found by kxjklele). * Fix warnings from mingw64 in timing.c (found by kxjklele).
* Fix potential unintended sign extension in asn1_get_len() on 64-bit * Fix potential unintended sign extension in asn1_get_len() on 64-bit
platforms (found with Coverity Scan). platforms (found with Coverity Scan).

4
library/timing.c
View file

@ -65,8 +65,10 @@ unsigned long hardclock( void )
} }
#endif #endif
/* some versions of mingw-64 have 32-bit longs even on x84_64 */
#if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) && \ #if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) && \
defined(__GNUC__) && defined(__i386__) defined(__GNUC__) && ( defined(__i386__) || ( \
( defined(__amd64__) || defined( __x86_64__) ) && __SIZEOF_LONG__ == 4 ) )
#define POLARSSL_HAVE_HARDCLOCK #define POLARSSL_HAVE_HARDCLOCK