commit 1abb368b8760569a53350f6d7f7cd628812f29d5
author Andres Amaya Garcia <Andres.AmayaGarcia@arm.com> Thu Aug 16 21:42:09 2018 +0100
committer Andres Amaya Garcia <Andres.AmayaGarcia@arm.com> Thu Aug 16 21:42:09 2018 +0100
tree ce8b89995991306b33598a6eda0de335790b5e0c
parent d7177435e3eb9ec7c1c34e16da9b6385003543e9

Make gmtime() configurable at compile-time

library/x509.c

diff --git a/library/x509.c b/library/x509.c
index 03c3bbe..15c0123 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -29,10 +29,6 @@
  *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
  */
 
-/* Ensure gmtime_r is available even with -std=c99; must be included before
- * config.h, which pulls in glibc's features.h. Harmless on other platforms. */
-#define _POSIX_C_SOURCE 200112L
-
 #if !defined(MBEDTLS_CONFIG_FILE)
 #include "mbedtls/config.h"
 #else
@@ -67,6 +63,7 @@
 #include "mbedtls/platform_time.h"
 #endif
 #if defined(MBEDTLS_HAVE_TIME_DATE)
+#include "mbedtls/platform_util.h"
 #include <time.h>
 #endif
 
@@ -890,14 +887,6 @@
 }
 
 #if defined(MBEDTLS_HAVE_TIME_DATE)
-#if !defined(_WIN32) && (defined(__unix__) || \
-    (defined(__APPLE__) && defined(__MACH__)))
-#include <unistd.h>
-#if !defined(_POSIX_VERSION)
-#define 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.
@@ -910,19 +899,8 @@
 
     (void)tm_buf;
 
-#if defined(MBEDTLS_THREADING_C) && defined(X509_USE_GMTIME)
-    if( mbedtls_mutex_lock( &mbedtls_threading_gmtime_mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
-#endif /* MBEDTLS_THREADING_C && X509_USE_GMTIME */
-
     tt = mbedtls_time( NULL );
-#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
-    lt = gmtime_s( &tm_buf, &tt ) == 0 ? &tm_buf : NULL;
-#elif defined(_POSIX_VERSION)
-    lt = gmtime_r( &tt, &tm_buf );
-#else
-    lt = gmtime( &tt );
-#endif
+    lt = mbedtls_platform_gmtime( &tt, &tm_buf );
 
     if( lt == NULL )
         ret = -1;
@@ -936,11 +914,6 @@
         now->sec  = lt->tm_sec;
     }
 
-#if defined(MBEDTLS_THREADING_C) && defined(X509_USE_GMTIME)
-    if( mbedtls_mutex_unlock( &mbedtls_threading_gmtime_mutex ) != 0 )
-        return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
-#endif /* MBEDTLS_THREADING_C && X509_USE_GMTIME */
-
     return( ret );
 }