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

Implement peer review feedback and leave some breadcrumbs in the event of future updates

Browse Source
This commit is contained in:
kaleb-himes
2022-05-06 07:50:39 -06:00
parent ecf449dfe0
commit 3e1ba5d4d4
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wolfcrypt/src/asn.c
View File

@@ -12211,12 +12211,18 @@ int GetAsnTimeString(void* currTime, byte* buf, word32 len)
data_len = GetUnformattedTimeString(currTime, uf_time, len); data_len = GetUnformattedTimeString(currTime, uf_time, len);
/* ensure room to add 2 bytes (ASN type and length) before proceeding */ /* ensure room to add 2 bytes (ASN type and length) before proceeding */
if (len < data_len + 2) if(data_len <= 0) {
return BUFFER_E;
if(data_len <= 0)
return ASN_TIME_E; return ASN_TIME_E;
} else if (len < data_len + 2) {
return BUFFER_E;
}
/* Increment by 1 for ASN type */ /* Increment by 1 for ASN type, it is critical that this increment occur
* prior to the check on data_len being ASN_UTC_TIME_SIZE or
* ASN_GENERALIZED_TIME_SIZE since GetUnformattedTimeString returns the
* length without NULL terminator
* (IE 13 instead of 14 for ASN_UTC_TIME_SIZE) This logic WILL NEED updated
* if ASN_UTC_TIME_SIZE or ASN_GENERALIZED_TIME_SIZE are ever modified */
data_len++; data_len++;
if (data_len == ASN_UTC_TIME_SIZE) { if (data_len == ASN_UTC_TIME_SIZE) {

9
wolfssl/wolfcrypt/asn.h
View File

@@ -156,8 +156,13 @@ enum ASN_Tags {
ASN_ASYMKEY_PUBKEY = 0x01, ASN_ASYMKEY_PUBKEY = 0x01,
}; };
#define ASN_UTC_TIME_SIZE 14 /* NOTE: If ASN_UTC_TIME_SIZE or ASN_GENERALIZED_TIME_SIZE are ever modified
#define ASN_GENERALIZED_TIME_SIZE 16 * one needs to update the logic in asn.c function GetAsnTimeString()
* which depends on the size 14 and/or 16 to determine which format to
* place in the "buf" (output)
*/
#define ASN_UTC_TIME_SIZE 14 /* Read note above before modifying */
#define ASN_GENERALIZED_TIME_SIZE 16 /* Read note above before modifying */
#define ASN_GENERALIZED_TIME_MAX 68 #define ASN_GENERALIZED_TIME_MAX 68
#ifdef WOLFSSL_ASN_TEMPLATE #ifdef WOLFSSL_ASN_TEMPLATE