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

Merge pull request #6958 from embhorn/zd16866

Browse Source 
Add XGMTIME validation
This commit is contained in:
Daniel Pouzzner
2023-11-16 21:28:27 -05:00
committed by GitHub
parent 957a0ce300 a4bf774e1c
commit e395aad84b
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wolfcrypt/src/asn.c
View File

@ -14507,6 +14507,23 @@ int GetTimeString(byte* date, int format, char* buf, int len)
} }
#endif /* OPENSSL_ALL || WOLFSSL_MYSQL_COMPATIBLE || WOLFSSL_NGINX || WOLFSSL_HAPROXY */ #endif /* OPENSSL_ALL || WOLFSSL_MYSQL_COMPATIBLE || WOLFSSL_NGINX || WOLFSSL_HAPROXY */
/* Check time struct for valid values. Returns 0 for success */
static int ValidateGmtime(struct tm* inTime)
{
int ret = 1;
if ((inTime != NULL) &&
(inTime->tm_sec >= 0) && (inTime->tm_sec <= 61) &&
(inTime->tm_min >= 0) && (inTime->tm_min <= 59) &&
(inTime->tm_hour >= 0) && (inTime->tm_hour <= 23) &&
(inTime->tm_mday >= 1) && (inTime->tm_mday <= 31) &&
(inTime->tm_mon >= 0) && (inTime->tm_mon <= 11) &&
(inTime->tm_wday >= 0) && (inTime->tm_wday <= 6) &&
(inTime->tm_yday >= 0) && (inTime->tm_yday <= 365)) {
ret = 0;
}
return ret;
}
#if !defined(NO_ASN_TIME) && !defined(USER_TIME) && \ #if !defined(NO_ASN_TIME) && !defined(USER_TIME) && \
!defined(TIME_OVERRIDES) && (defined(OPENSSL_EXTRA) || defined(HAVE_PKCS7)) !defined(TIME_OVERRIDES) && (defined(OPENSSL_EXTRA) || defined(HAVE_PKCS7))
@ -14583,7 +14600,7 @@ int GetFormattedTime(void* currTime, byte* buf, word32 len)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
ts = (struct tm *)XGMTIME((time_t*)currTime, tmpTime); ts = (struct tm *)XGMTIME((time_t*)currTime, tmpTime);
if (ts == NULL) { if (ValidateGmtime(ts)) {
WOLFSSL_MSG("failed to get time data."); WOLFSSL_MSG("failed to get time data.");
return ASN_TIME_E; return ASN_TIME_E;
} }
@ -14750,7 +14767,7 @@ int wc_ValidateDate(const byte* date, byte format, int dateType)
ltime -= (time_t)timeDiff; ltime -= (time_t)timeDiff;
localTime = XGMTIME(&ltime, tmpTime); localTime = XGMTIME(&ltime, tmpTime);
if (localTime == NULL) { if (ValidateGmtime(localTime)) {
WOLFSSL_MSG("XGMTIME failed"); WOLFSSL_MSG("XGMTIME failed");
return 0; return 0;
} }
@ -28121,7 +28138,7 @@ static int SetValidity(byte* output, int daysValid)
/* subtract 1 day of seconds for more compliance */ /* subtract 1 day of seconds for more compliance */
then = now - 86400; then = now - 86400;
expandedTime = XGMTIME(&then, tmpTime); expandedTime = XGMTIME(&then, tmpTime);
if (expandedTime == NULL) { if (ValidateGmtime(expandedTime)) {
WOLFSSL_MSG("XGMTIME failed"); WOLFSSL_MSG("XGMTIME failed");
return 0; /* error */ return 0; /* error */
} }
@ -28140,7 +28157,7 @@ static int SetValidity(byte* output, int daysValid)
/* add daysValid of seconds */ /* add daysValid of seconds */
then = now + (daysValid * (time_t)86400); then = now + (daysValid * (time_t)86400);
expandedTime = XGMTIME(&then, tmpTime); expandedTime = XGMTIME(&then, tmpTime);
if (expandedTime == NULL) { if (ValidateGmtime(expandedTime)) {
WOLFSSL_MSG("XGMTIME failed"); WOLFSSL_MSG("XGMTIME failed");
return 0; /* error */ return 0; /* error */
} }
@ -28189,7 +28206,7 @@ static int SetValidity(byte* before, byte* after, int daysValid)
/* subtract 1 day of seconds for more compliance */ /* subtract 1 day of seconds for more compliance */
then = now - 86400; then = now - 86400;
expandedTime = XGMTIME(&then, tmpTime); expandedTime = XGMTIME(&then, tmpTime);
if (expandedTime == NULL) { if (ValidateGmtime(expandedTime)) {
WOLFSSL_MSG("XGMTIME failed"); WOLFSSL_MSG("XGMTIME failed");
ret = DATE_E; ret = DATE_E;
} }
@ -28205,7 +28222,7 @@ static int SetValidity(byte* before, byte* after, int daysValid)
/* add daysValid of seconds */ /* add daysValid of seconds */
then = now + (daysValid * (time_t)86400); then = now + (daysValid * (time_t)86400);
expandedTime = XGMTIME(&then, tmpTime); expandedTime = XGMTIME(&then, tmpTime);
if (expandedTime == NULL) { if (ValidateGmtime(expandedTime)) {
WOLFSSL_MSG("XGMTIME failed"); WOLFSSL_MSG("XGMTIME failed");
ret = DATE_E; ret = DATE_E;
} }