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

Merge pull request #1967 from kojo1/ShadowGlobal

Browse Source 
Shadowed global: min in misc.c
This commit is contained in:
David Garske
2018-12-08 09:20:56 -08:00
committed by GitHub
parent 43bc0233cb 8f3b05dd33
commit e4f60dc894
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/asn.c
View File

@@ -5216,7 +5216,7 @@ int GetAsnTimeString(void* currTime, byte* buf, word32 len)
#endif #endif
byte* data_ptr = buf; byte* data_ptr = buf;
word32 data_len = 0; word32 data_len = 0;
int year, mon, day, hour, min, sec; int year, mon, day, hour, mini, sec;
WOLFSSL_ENTER("SetAsnTimeString"); WOLFSSL_ENTER("SetAsnTimeString");
@@ -5252,10 +5252,10 @@ int GetAsnTimeString(void* currTime, byte* buf, word32 len)
mon = ts->tm_mon + 1; mon = ts->tm_mon + 1;
day = ts->tm_mday; day = ts->tm_mday;
hour = ts->tm_hour; hour = ts->tm_hour;
min = ts->tm_min; mini = ts->tm_min;
sec = ts->tm_sec; sec = ts->tm_sec;
XSNPRINTF((char *)utc_str, ASN_UTC_TIME_SIZE, XSNPRINTF((char *)utc_str, ASN_UTC_TIME_SIZE,
"%02d%02d%02d%02d%02d%02dZ", year, mon, day, hour, min, sec); "%02d%02d%02d%02d%02d%02dZ", year, mon, day, hour, mini, sec);
*data_ptr = (byte) ASN_UTC_TIME; data_ptr++; *data_ptr = (byte) ASN_UTC_TIME; data_ptr++;
/* -1 below excludes null terminator */ /* -1 below excludes null terminator */
*data_ptr = (byte) ASN_UTC_TIME_SIZE - 1; data_ptr++; *data_ptr = (byte) ASN_UTC_TIME_SIZE - 1; data_ptr++;
@@ -5273,10 +5273,10 @@ int GetAsnTimeString(void* currTime, byte* buf, word32 len)
mon = ts->tm_mon + 1; mon = ts->tm_mon + 1;
day = ts->tm_mday; day = ts->tm_mday;
hour = ts->tm_hour; hour = ts->tm_hour;
min = ts->tm_min; mini = ts->tm_min;
sec = ts->tm_sec; sec = ts->tm_sec;
XSNPRINTF((char *)gt_str, ASN_GENERALIZED_TIME_SIZE, XSNPRINTF((char *)gt_str, ASN_GENERALIZED_TIME_SIZE,
"%4d%02d%02d%02d%02d%02dZ", year, mon, day, hour, min, sec); "%4d%02d%02d%02d%02d%02dZ", year, mon, day, hour, mini, sec);
*data_ptr = (byte) ASN_GENERALIZED_TIME; data_ptr++; *data_ptr = (byte) ASN_GENERALIZED_TIME; data_ptr++;
/* -1 below excludes null terminator */ /* -1 below excludes null terminator */
*data_ptr = (byte) ASN_GENERALIZED_TIME_SIZE - 1; data_ptr++; *data_ptr = (byte) ASN_GENERALIZED_TIME_SIZE - 1; data_ptr++;