feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for deleted USER_TIME gmtime forward declaration. Fix to make sure XGMTIME maps to gmtime just as previous code did.

Browse Source
This commit is contained in:
David Garske
2016-01-27 13:20:06 -08:00
parent fadd97de3a
commit fa64abd83e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/asn.c
View File

@@ -112,6 +112,7 @@
#elif defined(MICROCHIP_TCPIP_V5) || defined(MICROCHIP_TCPIP) #elif defined(MICROCHIP_TCPIP_V5) || defined(MICROCHIP_TCPIP)
#include <time.h> #include <time.h>
#define XTIME(t1) pic32_time((t1)) #define XTIME(t1) pic32_time((t1))
#define XGMTIME(c, t) gmtime((c))
#elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX) #elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
#define XTIME(t1) mqx_time((t1)) #define XTIME(t1) mqx_time((t1))
@@ -120,6 +121,7 @@
#elif defined(FREESCALE_KSDK_BM) || defined(FREESCALE_FREE_RTOS) #elif defined(FREESCALE_KSDK_BM) || defined(FREESCALE_FREE_RTOS)
#include <time.h> #include <time.h>
#define XTIME(t1) ksdk_time((t1)) #define XTIME(t1) ksdk_time((t1))
#define XGMTIME(c, t) gmtime((c))
#elif defined(USER_TIME) #elif defined(USER_TIME)
/* user time, and gmtime compatible functions, there is a gmtime /* user time, and gmtime compatible functions, there is a gmtime
@@ -145,6 +147,7 @@
in place of time() from <time.h> */ in place of time() from <time.h> */
#include <time.h> #include <time.h>
#define XTIME(t1) idirect_time((t1)) #define XTIME(t1) idirect_time((t1))
#define XGMTIME(c, t) gmtime((c))
#elif defined(_WIN32_WCE) #elif defined(_WIN32_WCE)
#include <windows.h> #include <windows.h>
@@ -163,11 +166,11 @@
#define XTIME(tl) time((tl)) #define XTIME(tl) time((tl))
#endif #endif
#if !defined(XGMTIME) && !defined(TIME_OVERRIDES) #if !defined(XGMTIME) && !defined(TIME_OVERRIDES)
#ifdef HAVE_GMTIME_R #if defined(WOLFSSL_GMTIME) || !defined(HAVE_GMTIME_R)
#define XGMTIME(c, t) gmtime((c))
#else
#define XGMTIME(c, t) gmtime_r((c), (t)) #define XGMTIME(c, t) gmtime_r((c), (t))
#define NEED_TMP_TIME #define NEED_TMP_TIME
#else
#define XGMTIME(c, t) gmtime((c))
#endif #endif
#endif #endif
#if !defined(XVALIDATE_DATE) && !defined(HAVE_VALIDATE_DATE) #if !defined(XVALIDATE_DATE) && !defined(HAVE_VALIDATE_DATE)
@@ -197,6 +200,7 @@
/* forward declarations */ /* forward declarations */
#if defined(USER_TIME) #if defined(USER_TIME)
struct tm* gmtime(const time_t* timer);
extern time_t XTIME(time_t * timer); extern time_t XTIME(time_t * timer);
#ifdef STACK_TRAP #ifdef STACK_TRAP