wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-30 09:32:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4761 from haydenroche5/time_cb

Browse Source 
Add time callback functionality.
This commit is contained in:
Sean Parkinson
2022-01-18 16:49:19 +10:00
committed by GitHub
parent e11d484746 1b0926a3b8
commit e745de657f
10 changed files with 154 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
wolfcrypt/src/asn.c
View File

@@ -12217,7 +12217,7 @@ int wc_ValidateDate(const byte* date, byte format, int dateType)
#endif
(void)tmpTime;
ltime = XTIME(0);
ltime = wc_Time(0);
#ifdef WOLFSSL_BEFORE_DATE_CLOCK_SKEW
if (dateType == BEFORE) {
@@ -12288,11 +12288,34 @@ int wc_GetTime(void* timePtr, word32 timeSize)
return BUFFER_E;
}
*ltime = XTIME(0);
*ltime = wc_Time(0);
return 0;
}
#ifdef TIME_OVERRIDES
#ifndef HAVE_TIME_T_TYPE
typedef long time_t;
#endif
extern time_t XTIME(time_t* t);
#endif
static wc_time_cb timeFunc = NULL;
int wc_SetTimeCb(wc_time_cb f)
{
timeFunc = f;
return 0;
}
time_t wc_Time(time_t* t)
{
if (timeFunc != NULL) {
return timeFunc(t);
}
return XTIME(t);
}
#endif /* !NO_ASN_TIME */
@@ -23457,7 +23480,7 @@ static int SetValidity(byte* output, int daysValid)
#endif
(void)tmpTime;
now = XTIME(0);
now = wc_Time(0);
/* before now */
before[0] = ASN_GENERALIZED_TIME;
@@ -23528,7 +23551,7 @@ static int SetValidity(byte* before, byte* after, int daysValid)
#endif
(void)tmpTime;
now = XTIME(0);
now = wc_Time(0);
/* subtract 1 day of seconds for more compliance */
then = now - 86400;

2
wolfcrypt/src/pkcs7.c
View File

@@ -1927,7 +1927,7 @@ static int wc_PKCS7_BuildSignedAttributes(PKCS7* pkcs7, ESD* esd,
if (signingTime == NULL || signingTimeSz == 0)
return BAD_FUNC_ARG;
tm = XTIME(0);
tm = wc_Time(0);
timeSz = GetAsnTimeString(&tm, signingTime, signingTimeSz);
if (timeSz < 0)
return timeSz;