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

Merge branch 'master' of github.com:wolfssl/wolfssl

Browse Source
This commit is contained in:
toddouska
2015-04-01 09:39:10 -07:00
parent 3abf1952c8 1d4187e168
commit 5ed451a29d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -335,7 +335,7 @@ AM_CONDITIONAL([BUILD_SNIFFTEST], [ test "x$ENABLED_SNIFFTEST" = "xyes" ])
# AES-GCM # AES-GCM
AC_ARG_ENABLE([aesgcm], AC_ARG_ENABLE([aesgcm],
[ --enable-aesgcm Enable wolfSSL AES-GCM support (default: disabled)], [AS_HELP_STRING([--enable-aesgcm],[Enable wolfSSL AES-GCM support (default: enabled)])],
[ ENABLED_AESGCM=$enableval ], [ ENABLED_AESGCM=$enableval ],
[ ENABLED_AESGCM=yes ] [ ENABLED_AESGCM=yes ]
) )
@@ -884,7 +884,7 @@ AM_CONDITIONAL([BUILD_RSA], [test "x$ENABLED_RSA" = "xyes"])
# DH # DH
AC_ARG_ENABLE([dh], AC_ARG_ENABLE([dh],
[ --enable-dh Enable DH (default: disabled)], [AS_HELP_STRING([--enable-dh],[Enable DH (default: enabled)])],
[ ENABLED_DH=$enableval ], [ ENABLED_DH=$enableval ],
[ ENABLED_DH=yes ] [ ENABLED_DH=yes ]
) )

22
wolfcrypt/src/asn.c
View File

@@ -2363,12 +2363,12 @@ int ValidateDate(const byte* date, byte format, int dateType)
time_t ltime; time_t ltime;
struct tm certTime; struct tm certTime;
struct tm* localTime; struct tm* localTime;
struct tm* tmpTime; struct tm* tmpTime = NULL;
int i = 0; int i = 0;
#ifdef FREESCALE_MQX #if defined(FREESCALE_MQX) || defined(TIME_OVERRIDES)
struct tm mqxTime; struct tm tmpTimeStorage;
tmpTime = &mqxTime; tmpTime = &tmpTimeStorage;
#else #else
(void)tmpTime; (void)tmpTime;
#endif #endif
@@ -2394,9 +2394,9 @@ int ValidateDate(const byte* date, byte format, int dateType)
GetTime((int*)&certTime.tm_hour, date, &i); GetTime((int*)&certTime.tm_hour, date, &i);
GetTime((int*)&certTime.tm_min, date, &i); GetTime((int*)&certTime.tm_min, date, &i);
GetTime((int*)&certTime.tm_sec, date, &i); GetTime((int*)&certTime.tm_sec, date, &i);
if (date[i] != 'Z') { /* only Zulu supported for this profile */ if (date[i] != 'Z') { /* only Zulu supported for this profile */
WOLFSSL_MSG("Only Zulu time supported for this profile"); WOLFSSL_MSG("Only Zulu time supported for this profile");
return 0; return 0;
} }
@@ -5217,13 +5217,13 @@ static int SetValidity(byte* output, int daysValid)
time_t ticks; time_t ticks;
time_t normalTime; time_t normalTime;
struct tm* now; struct tm* now;
struct tm* tmpTime; struct tm* tmpTime = NULL;
struct tm local; struct tm local;
#ifdef FREESCALE_MQX #if defined(FREESCALE_MQX) || defined(TIME_OVERRIDES)
/* for use with MQX gmtime_r */ /* for use with gmtime_r */
struct tm mqxTime; struct tm tmpTimeStorage;
tmpTime = &mqxTime; tmpTime = &tmpTimeStorage;
#else #else
(void)tmpTime; (void)tmpTime;
#endif #endif