yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4211 from ccawley2011/mingw

Browse source 
Fix compilation with MinGW32
This commit is contained in:
Gilles Peskine 2022-05-16 12:30:37 +02:00 committed by GitHub
commit 9b7e29663f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog.d/mingw.txt Normal file
View file

@ -0,0 +1,4 @@
Bugfix
* Fix compilation error with mingw32. Fixed by Cameron Cawley in #4211.
* Fix compilation error when using C++ Builder on Windows. Reported by
Miroslav Mastny in #4015.

13
library/platform_util.c
View file

@ -74,6 +74,7 @@ void mbedtls_platform_zeroize( void *buf, size_t len )
#endif /* MBEDTLS_PLATFORM_ZEROIZE_ALT */ #endif /* MBEDTLS_PLATFORM_ZEROIZE_ALT */
#if defined(MBEDTLS_HAVE_TIME_DATE) && !defined(MBEDTLS_PLATFORM_GMTIME_R_ALT) #if defined(MBEDTLS_HAVE_TIME_DATE) && !defined(MBEDTLS_PLATFORM_GMTIME_R_ALT)
#define __STDC_WANT_LIB_EXT1__ 1 /* Ask for the C11 gmtime_s() if it's available */
#include <time.h> #include <time.h>
#if !defined(_WIN32) && (defined(unix) || \ #if !defined(_WIN32) && (defined(unix) || \
defined(__unix) || defined(__unix__) || (defined(__APPLE__) && \ defined(__unix) || defined(__unix__) || (defined(__APPLE__) && \
@ -92,9 +93,10 @@ void mbedtls_platform_zeroize( void *buf, size_t len )
* threading.h. However, this macro is not part of the Mbed TLS public API, so * threading.h. However, this macro is not part of the Mbed TLS public API, so
* we keep it private by only defining it in this file * we keep it private by only defining it in this file
*/ */
#if ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) #if ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) || \
( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) )
#define PLATFORM_UTIL_USE_GMTIME #define PLATFORM_UTIL_USE_GMTIME
#endif /* ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) */ #endif
#endif /* !( ( defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L ) || \ #endif /* !( ( defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L ) || \
( defined(_POSIX_THREAD_SAFE_FUNCTIONS ) && \ ( defined(_POSIX_THREAD_SAFE_FUNCTIONS ) && \
@ -103,8 +105,13 @@ void mbedtls_platform_zeroize( void *buf, size_t len )
struct tm *mbedtls_platform_gmtime_r( const mbedtls_time_t *tt, struct tm *mbedtls_platform_gmtime_r( const mbedtls_time_t *tt,
struct tm *tm_buf ) struct tm *tm_buf )
{ {
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) #if defined(_WIN32) && !defined(PLATFORM_UTIL_USE_GMTIME)
#if defined(__STDC_LIB_EXT1__)
return( ( gmtime_s( tt, tm_buf ) == 0 ) ? NULL : tm_buf );
#else
/* MSVC and mingw64 argument order and return value are inconsistent with the C11 standard */
return( ( gmtime_s( tm_buf, tt ) == 0 ) ? tm_buf : NULL ); return( ( gmtime_s( tm_buf, tt ) == 0 ) ? tm_buf : NULL );
#endif
#elif !defined(PLATFORM_UTIL_USE_GMTIME) #elif !defined(PLATFORM_UTIL_USE_GMTIME)
return( gmtime_r( tt, tm_buf ) ); return( gmtime_r( tt, tm_buf ) );
#else #else

5
tests/suites/helpers.function
View file

@ -44,9 +44,12 @@ typedef UINT32 uint32_t;
#include <string.h> #include <string.h>
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__MINGW32__)
#include <strings.h>
#endif
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#include <unistd.h> #include <unistd.h>
#include <strings.h>
#endif #endif
/* Type for Hex parameters */ /* Type for Hex parameters */