wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes from review

Browse Source
This commit is contained in:
Eric Blankenhorn
2019-12-18 13:25:25 -06:00
parent 774a758f59
commit 52893877d7
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tls.c
View File

@@ -2617,7 +2617,7 @@ static int TLSX_TCA_Parse(WOLFSSL* ssl, const byte* input, word16 length,
return BUFFER_ERROR; return BUFFER_ERROR;
ato16(input + offset, &idSz); ato16(input + offset, &idSz);
offset += OPAQUE16_LEN; offset += OPAQUE16_LEN;
if (idSz > length - offset) if ((offset > length) || (idSz > length - offset))
return BUFFER_ERROR; return BUFFER_ERROR;
id = input + offset; id = input + offset;
offset += idSz; offset += idSz;

17
tests/api.c
View File

@@ -21737,7 +21737,7 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
WOLFSSL_ASN1_TIME *asn_time, *s; WOLFSSL_ASN1_TIME *asn_time, *s;
int offset_day; int offset_day;
long offset_sec; long offset_sec;
char date_str[CTC_DATE_SIZE]; char date_str[CTC_DATE_SIZE + 1];
time_t t; time_t t;
printf(testingFmt, "wolfSSL_ASN1_TIME_adj()"); printf(testingFmt, "wolfSSL_ASN1_TIME_adj()");
@@ -21752,14 +21752,16 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
/* offset_sec = -45 * min;*/ /* offset_sec = -45 * min;*/
asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec); asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec);
AssertTrue(asn_time->type == asn_utc_time); AssertTrue(asn_time->type == asn_utc_time);
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1); XSTRNCPY(date_str, (const char*)&asn_time->data, CTC_DATE_SIZE);
date_str[CTC_DATE_SIZE] = '\0';
AssertIntEQ(0, XMEMCMP(date_str, "000222211500Z", 13)); AssertIntEQ(0, XMEMCMP(date_str, "000222211500Z", 13));
/* negative offset */ /* negative offset */
offset_sec = -45 * mini; offset_sec = -45 * mini;
asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec); asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec);
AssertTrue(asn_time->type == asn_utc_time); AssertTrue(asn_time->type == asn_utc_time);
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1); XSTRNCPY(date_str, (const char*)&asn_time->data, CTC_DATE_SIZE);
date_str[CTC_DATE_SIZE] = '\0';
AssertIntEQ(0, XMEMCMP(date_str, "000222194500Z", 13)); AssertIntEQ(0, XMEMCMP(date_str, "000222194500Z", 13));
XFREE(s, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(s, NULL, DYNAMIC_TYPE_OPENSSL);
@@ -21776,7 +21778,8 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
offset_sec = 10 * mini; offset_sec = 10 * mini;
asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec); asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec);
AssertTrue(asn_time->type == asn_gen_time); AssertTrue(asn_time->type == asn_gen_time);
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1); XSTRNCPY(date_str, (const char*)&asn_time->data, CTC_DATE_SIZE);
date_str[CTC_DATE_SIZE] = '\0';
AssertIntEQ(0, XMEMCMP(date_str, "20550313091000Z", 15)); AssertIntEQ(0, XMEMCMP(date_str, "20550313091000Z", 15));
XFREE(s, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(s, NULL, DYNAMIC_TYPE_OPENSSL);
@@ -21791,13 +21794,15 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
offset_sec = 45 * mini; offset_sec = 45 * mini;
asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec); asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec);
AssertTrue(asn_time->type == asn_utc_time); AssertTrue(asn_time->type == asn_utc_time);
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1); XSTRNCPY(date_str, (const char*)&asn_time->data, CTC_DATE_SIZE);
date_str[CTC_DATE_SIZE] = '\0';
AssertIntEQ(0, XMEMCMP(date_str, "000222211515Z", 13)); AssertIntEQ(0, XMEMCMP(date_str, "000222211515Z", 13));
XFREE(asn_time, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(asn_time, NULL, DYNAMIC_TYPE_OPENSSL);
asn_time = wolfSSL_ASN1_TIME_adj(NULL, t, offset_day, offset_sec); asn_time = wolfSSL_ASN1_TIME_adj(NULL, t, offset_day, offset_sec);
AssertTrue(asn_time->type == asn_utc_time); AssertTrue(asn_time->type == asn_utc_time);
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1); XSTRNCPY(date_str, (const char*)&asn_time->data, CTC_DATE_SIZE);
date_str[CTC_DATE_SIZE] = '\0';
AssertIntEQ(0, XMEMCMP(date_str, "000222211515Z", 13)); AssertIntEQ(0, XMEMCMP(date_str, "000222211515Z", 13));
XFREE(asn_time, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(asn_time, NULL, DYNAMIC_TYPE_OPENSSL);

7
wolfcrypt/src/pkcs12.c
View File

@@ -768,10 +768,11 @@ int wc_i2d_PKCS12(WC_PKCS12* pkcs12, byte** der, int* derSz)
byte ar[MAX_LENGTH_SZ + 2]; byte ar[MAX_LENGTH_SZ + 2];
tmpSz = SetShortInt(ar, &tmpIdx, mac->itt, MAX_LENGTH_SZ + 2); tmpSz = SetShortInt(ar, &tmpIdx, mac->itt, MAX_LENGTH_SZ + 2);
if (tmpSz < 0) { if (tmpSz < 0) {
WOLFSSL_MSG("Error returned by SetShortInt"); ret = tmpSz;
return tmpSz; }
else {
XMEMCPY(&sdBuf[idx], ar, tmpSz);
} }
XMEMCPY(&sdBuf[idx], ar, tmpSz);
} }
totalSz += sdBufSz; totalSz += sdBufSz;

3
wolfcrypt/src/pkcs7.c
View File

@@ -3504,6 +3504,9 @@ static int wc_PKCS7_VerifyContentMessageDigest(PKCS7* pkcs7,
digestSz = wc_HashGetDigestSize(hashType); digestSz = wc_HashGetDigestSize(hashType);
if (digestSz < 0) { if (digestSz < 0) {
WOLFSSL_MSG("Invalid hash type"); WOLFSSL_MSG("Invalid hash type");
#ifdef WOLFSSL_SMALL_STACK
XFREE(digest, pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return digestSz; return digestSz;
} }
} else { } else {