lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Use gmtime when target is not windows or posix

Browse Source
This commit is contained in:
Andres Amaya Garcia
2018-08-07 20:26:55 +01:00
parent b363382ba4
commit ce6eebb0b8
3 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
library/x509.c
View File

@ -890,6 +890,14 @@ int mbedtls_x509_key_size_helper( char *buf, size_t buf_size, const char *name )
}
#if defined(MBEDTLS_HAVE_TIME_DATE)
#if !defined(_WIN32) && (defined(__unix__) || \
(defined(__APPLE__) && defined(__MACH__)))
#include <unistd.h>
#if !defined(_POSIX_VERSION)
#define MBEDTLS_X509_USE_GMTIME
#endif /* !_POSIX_VERSION */
#endif /* !_WIN32 && (__unix__ || (__APPLE__ && __MACH__)) */
/*
* Set the time structure to the current time.
* Return 0 on success, non-zero on failure.
@ -900,11 +908,20 @@ static int x509_get_current_time( mbedtls_x509_time *now )
mbedtls_time_t tt;
int ret = 0;
(void)tm_buf;
#if defined(MBEDTLS_THREADING_C) && defined(MBEDTLS_X509_USE_GMTIME)
if( mbedtls_mutex_lock( &mbedtls_threading_gmtime_mutex ) != 0 )
return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
#endif /* MBEDTLS_THREADING_C && MBEDTLS_X509_USE_GMTIME */
tt = mbedtls_time( NULL );
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
lt = gmtime_s( &tm_buf, &tt ) == 0 ? &tm_buf : NULL;
#else
#elif defined(_POSIX_VERSION)
lt = gmtime_r( &tt, &tm_buf );
#else
lt = gmtime( &tt );
#endif
if( lt == NULL )
@ -919,6 +936,11 @@ static int x509_get_current_time( mbedtls_x509_time *now )
now->sec = lt->tm_sec;
}
#if defined(MBEDTLS_THREADING_C) && defined(MBEDTLS_X509_USE_GMTIME)
if( mbedtls_mutex_unlock( &mbedtls_threading_gmtime_mutex ) != 0 )
return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
#endif /* MBEDTLS_THREADING_C && MBEDTLS_X509_USE_GMTIME */
return( ret );
}