eden-emu/mbedtls
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gmtime: Remove special treatment for IAR

Browse source 
Previous commits attempted to use `gmtime_s()` for IAR systems; however,
this attempt depends on the use of C11 extensions which lead to incompatibility
with other pieces of the library, such as the use of `memset()` which is
being deprecated in favor of `memset_s()` in C11.
This commit is contained in:
Hanno Becker 2018-09-05 13:50:22 +01:00
parent 94b540ac63
commit cfeb70c6b9
4 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/platform_util.c
View file

@ -77,7 +77,7 @@ void mbedtls_platform_zeroize( void *buf, size_t len )
#if defined(MBEDTLS_HAVE_TIME_DATE) && !defined(MBEDTLS_PLATFORM_GMTIME_ALT)
#include <time.h>
#if !defined(_WIN32) && !defined(__IAR_SYSTEMS_ICC__) && (defined(unix) || \
#if !defined(_WIN32) && (defined(unix) || \
defined(__unix) || defined(__unix__) || (defined(__APPLE__) && \
defined(__MACH__)))
#include <unistd.h>
@ -91,7 +91,7 @@ void mbedtls_platform_zeroize( void *buf, size_t len )
*/
#define PLATFORM_UTIL_USE_GMTIME
#endif /* !_POSIX_VERSION || _POSIX_C_SOURCE > _POSIX_THREAD_SAFE_FUNCTIONS */
#endif /* !_WIN32 && !__IAR_SYSTEMS_ICC__ && (unix || __unix || __unix__ ||
#endif /* !_WIN32 && (unix || __unix || __unix__ ||
* (__APPLE__ && __MACH__)) */
struct tm *mbedtls_platform_gmtime( const mbedtls_time_t *tt,
@ -99,8 +99,6 @@ struct tm *mbedtls_platform_gmtime( const mbedtls_time_t *tt,
{
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
return( ( gmtime_s( tm_buf, tt ) == 0 ) ? tm_buf : NULL );
#elif defined(__IAR_SYSTEMS_ICC__)
return( gmtime_s( tt, tm_buf ) );
#elif !defined(PLATFORM_UTIL_USE_GMTIME)
return( gmtime_r( tt, tm_buf ) );
#else