WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6217 from douzzer/20230321-fixes 

20230321-fixes
pull/6197/head
JacobBarthelmeh 2023-03-22 10:23:07 -06:00 committed by GitHub
parent 147395476f 49cd3ff872
commit 7e8d027a17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/internal.c
View File

@ -30727,7 +30727,6 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
case INVALID_PARAMETER: case INVALID_PARAMETER:
case HRR_COOKIE_ERROR: case HRR_COOKIE_ERROR:
return illegal_parameter; return illegal_parameter;
break;
case INCOMPLETE_DATA: case INCOMPLETE_DATA:
return missing_extension; return missing_extension;
case MATCH_SUITE_ERROR: case MATCH_SUITE_ERROR:
@ -34798,11 +34797,13 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#ifdef WOLFSSL_32BIT_MILLI_TIME #ifdef WOLFSSL_32BIT_MILLI_TIME
ato32(it->timestamp, &ssl->session->ticketSeen); ato32(it->timestamp, &ssl->session->ticketSeen);
#else #else
word32 seenHi, seenLo; {
word32 seenHi, seenLo;
ato32(it->timestamp , &seenHi); ato32(it->timestamp , &seenHi);
ato32(it->timestamp + OPAQUE32_LEN, &seenLo); ato32(it->timestamp + OPAQUE32_LEN, &seenLo);
ssl->session->ticketSeen = ((sword64)seenHi << 32) + seenLo; ssl->session->ticketSeen = ((sword64)seenHi << 32) + seenLo;
}
#endif #endif
ato32(it->ageAdd, &ssl->session->ticketAdd); ato32(it->ageAdd, &ssl->session->ticketAdd);
ssl->session->cipherSuite0 = it->suite[0]; ssl->session->cipherSuite0 = it->suite[0];

1
src/tls.c
View File

@ -4897,7 +4897,6 @@ int TLSX_SupportedCurve_Copy(TLSX* src, TLSX** dst, void* heap)
extension = TLSX_Find(src, TLSX_SUPPORTED_GROUPS); extension = TLSX_Find(src, TLSX_SUPPORTED_GROUPS);
if (extension != NULL) { if (extension != NULL) {
SupportedCurve* curve; SupportedCurve* curve;
curve = (SupportedCurve*)extension->data;
for (curve = (SupportedCurve*)extension->data; curve != NULL; for (curve = (SupportedCurve*)extension->data; curve != NULL;
curve = curve->next) { curve = curve->next) {
ret = TLSX_UseSupportedCurve(dst, curve->name, heap); ret = TLSX_UseSupportedCurve(dst, curve->name, heap);

6
src/tls13.c
View File

@ -3351,8 +3351,10 @@ int CreateCookieExt(const WOLFSSL* ssl, byte* hash, word16 hashSz,
/* Cookie Data = Hash Len | Hash | CS | KeyShare Group */ /* Cookie Data = Hash Len | Hash | CS | KeyShare Group */
cookie[cookieSz++] = (byte)hashSz; cookie[cookieSz++] = (byte)hashSz;
XMEMCPY(cookie + cookieSz, hash, hashSz); if (hashSz > 0) {
cookieSz += hashSz; XMEMCPY(cookie + cookieSz, hash, hashSz);
cookieSz += hashSz;
}
cookie[cookieSz++] = cipherSuite0; cookie[cookieSz++] = cipherSuite0;
cookie[cookieSz++] = cipherSuite; cookie[cookieSz++] = cipherSuite;
if ((ext = TLSX_Find(*exts, TLSX_KEY_SHARE)) != NULL) { if ((ext = TLSX_Find(*exts, TLSX_KEY_SHARE)) != NULL) {

4
tests/api.c
View File

@ -28661,8 +28661,10 @@ static int test_wc_PKCS7_VerifySignedData(void)
struct tm timearg; struct tm timearg;
time_t now; time_t now;
struct tm* nowTm = NULL; struct tm* nowTm = NULL;
#ifdef NEED_TMP_TIME
struct tm tmpTimeStorage; struct tm tmpTimeStorage;
struct tm* tmpTime = &tmpTimeStorage; struct tm* tmpTime = &tmpTimeStorage;
#endif
#endif /* !NO_ASN && !NO_ASN_TIME */ #endif /* !NO_ASN && !NO_ASN_TIME */
/* Success test with RSA certs/key */ /* Success test with RSA certs/key */
@ -31452,7 +31454,6 @@ static int test_wc_KeyPemToDer(void)
AssertIntLE(ret, cert_sz); AssertIntLE(ret, cert_sz);
free(cert_der); free(cert_der);
cert_der = NULL; cert_der = NULL;
ret = 0;
} }
} }
@ -31505,7 +31506,6 @@ static int test_wc_PubKeyPemToDer(void)
AssertIntGE(ret, 0); AssertIntGE(ret, 0);
free(cert_der); free(cert_der);
cert_der = NULL; cert_der = NULL;
ret = 0;
} }
} }

71
wolfcrypt/src/pkcs12.c
View File

@ -156,14 +156,11 @@ static void freeSafe(AuthenticatedSafe* safe, void* heap)
ContentInfo* ci = safe->CI; ContentInfo* ci = safe->CI;
safe->CI = ci->next; safe->CI = ci->next;
XFREE(ci, heap, DYNAMIC_TYPE_PKCS); XFREE(ci, heap, DYNAMIC_TYPE_PKCS);
ci = NULL;
} }
if (safe->data != NULL) { if (safe->data != NULL) {
XFREE(safe->data, heap, DYNAMIC_TYPE_PKCS); XFREE(safe->data, heap, DYNAMIC_TYPE_PKCS);
safe->data = NULL;
} }
XFREE(safe, heap, DYNAMIC_TYPE_PKCS); XFREE(safe, heap, DYNAMIC_TYPE_PKCS);
safe = NULL;
(void)heap; (void)heap;
} }
@ -188,29 +185,23 @@ void wc_PKCS12_free(WC_PKCS12* pkcs12)
if (pkcs12->signData != NULL) { if (pkcs12->signData != NULL) {
if (pkcs12->signData->digest != NULL) { if (pkcs12->signData->digest != NULL) {
XFREE(pkcs12->signData->digest, heap, DYNAMIC_TYPE_DIGEST); XFREE(pkcs12->signData->digest, heap, DYNAMIC_TYPE_DIGEST);
pkcs12->signData->digest = NULL;
} }
if (pkcs12->signData->salt != NULL) { if (pkcs12->signData->salt != NULL) {
XFREE(pkcs12->signData->salt, heap, DYNAMIC_TYPE_SALT); XFREE(pkcs12->signData->salt, heap, DYNAMIC_TYPE_SALT);
pkcs12->signData->salt = NULL;
} }
XFREE(pkcs12->signData, heap, DYNAMIC_TYPE_PKCS); XFREE(pkcs12->signData, heap, DYNAMIC_TYPE_PKCS);
pkcs12->signData = NULL;
} }
#ifdef ASN_BER_TO_DER #ifdef ASN_BER_TO_DER
if (pkcs12->der != NULL) { if (pkcs12->der != NULL) {
XFREE(pkcs12->der, pkcs12->heap, DYNAMIC_TYPE_PKCS); XFREE(pkcs12->der, pkcs12->heap, DYNAMIC_TYPE_PKCS);
pkcs12->der = NULL;
} }
if (pkcs12->safeDer != NULL) { if (pkcs12->safeDer != NULL) {
XFREE(pkcs12->safeDer, pkcs12->heap, DYNAMIC_TYPE_PKCS); XFREE(pkcs12->safeDer, pkcs12->heap, DYNAMIC_TYPE_PKCS);
pkcs12->safeDer = NULL;
} }
#endif #endif
XFREE(pkcs12, NULL, DYNAMIC_TYPE_PKCS); XFREE(pkcs12, NULL, DYNAMIC_TYPE_PKCS);
pkcs12 = NULL;
} }
@ -297,8 +288,8 @@ static int GetSafeContent(WC_PKCS12* pkcs12, const byte* input,
#ifdef ASN_BER_TO_DER #ifdef ASN_BER_TO_DER
if (pkcs12->indefinite) { if (pkcs12->indefinite) {
if ((ret = wc_BerToDer(input, safe->dataSz, NULL, if (wc_BerToDer(input, safe->dataSz, NULL,
&pkcs12->safeDersz)) != LENGTH_ONLY_E) { &pkcs12->safeDersz) != LENGTH_ONLY_E) {
WOLFSSL_MSG("Not BER sequence"); WOLFSSL_MSG("Not BER sequence");
return ASN_PARSE_E; return ASN_PARSE_E;
} }
@ -311,6 +302,10 @@ static int GetSafeContent(WC_PKCS12* pkcs12, const byte* input,
} }
ret = wc_BerToDer(input, safe->dataSz, pkcs12->safeDer, &pkcs12->safeDersz); ret = wc_BerToDer(input, safe->dataSz, pkcs12->safeDer, &pkcs12->safeDersz);
if (ret < 0) {
freeSafe(safe, pkcs12->heap);
return ret;
}
input = pkcs12->safeDer; input = pkcs12->safeDer;
} }
@ -707,36 +702,36 @@ int wc_d2i_PKCS12(const byte* der, word32 derSz, WC_PKCS12* pkcs12)
#ifdef ASN_BER_TO_DER #ifdef ASN_BER_TO_DER
if (size == 0) { if (size == 0) {
if ((ret = wc_BerToDer(der, totalSz, NULL, if (wc_BerToDer(der, totalSz, NULL,
(word32*)&size)) != LENGTH_ONLY_E) { (word32*)&size) != LENGTH_ONLY_E) {
WOLFSSL_MSG("Not BER sequence"); WOLFSSL_MSG("Not BER sequence");
return ASN_PARSE_E; return ASN_PARSE_E;
} }
pkcs12->der = (byte*)XMALLOC(size, pkcs12->heap, DYNAMIC_TYPE_PKCS); pkcs12->der = (byte*)XMALLOC(size, pkcs12->heap, DYNAMIC_TYPE_PKCS);
if (pkcs12->der == NULL) if (pkcs12->der == NULL)
return MEMORY_E; return MEMORY_E;
ret = wc_BerToDer(der, derSz, pkcs12->der, (word32*)&size); ret = wc_BerToDer(der, derSz, pkcs12->der, (word32*)&size);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
der = pkcs12->der; der = pkcs12->der;
derSz = pkcs12->derSz = size; pkcs12->derSz = size;
totalSz = size; totalSz = size;
idx = 0; idx = 0;
if ((ret = GetSequence(der, &idx, &size, totalSz)) < 0) { if (GetSequence(der, &idx, &size, totalSz) < 0) {
WOLFSSL_MSG("Failed to get PKCS12 sequence"); WOLFSSL_MSG("Failed to get PKCS12 sequence");
return ASN_PARSE_E; return ASN_PARSE_E;
} }
/* get version */ /* get version */
if ((ret = GetMyVersion(der, &idx, &version, totalSz)) < 0) { if ((ret = GetMyVersion(der, &idx, &version, totalSz)) < 0) {
return ret; return ret;
} }
pkcs12->indefinite = 1; pkcs12->indefinite = 1;
} }
else else
@ -772,7 +767,7 @@ int wc_d2i_PKCS12(const byte* der, word32 derSz, WC_PKCS12* pkcs12)
#ifdef ASN_BER_TO_DER #ifdef ASN_BER_TO_DER
/* If indef, skip EOF */ /* If indef, skip EOF */
if (pkcs12->indefinite) { if (pkcs12->indefinite) {
while(der[idx] == ASN_EOC && idx < totalSz) { while((idx < totalSz) && (der[idx] == ASN_EOC)) {
idx+=1; idx+=1;
} }
} }
@ -1280,10 +1275,12 @@ static int PKCS12_CoalesceOctetStrings(WC_PKCS12* pkcs12, byte* data,
*idx += SetLength(mergedSz, &data[*idx]); *idx += SetLength(mergedSz, &data[*idx]);
/* Copy over concatonated octet strings into data buffer */ if (mergedSz > 0) {
XMEMCPY(&data[*idx], mergedData, mergedSz); /* Copy over concatonated octet strings into data buffer */
XMEMCPY(&data[*idx], mergedData, mergedSz);
XFREE(mergedData, pkcs12->heap, DYNAMIC_TYPE_PKCS); XFREE(mergedData, pkcs12->heap, DYNAMIC_TYPE_PKCS);
}
return ret; return ret;
} }

2
wolfcrypt/src/tfm.c
View File

@ -5933,4 +5933,4 @@ void mp_memzero_check(mp_int* a)
} }
#endif /* WOLFSSL_CHECK_MEM_ZERO */ #endif /* WOLFSSL_CHECK_MEM_ZERO */
#endif /* USE_FAST_MATH */ #endif /* USE_FAST_MATH */

8
wolfssl/internal.h
View File

@ -2678,13 +2678,13 @@ WOLFSSL_LOCAL int GetEchConfigsEx(WOLFSSL_EchConfig* configs,
byte* output, word32* outputLen); byte* output, word32* outputLen);
#endif #endif
typedef struct TLSX { struct TLSX {
TLSX_Type type; /* Extension Type */ TLSX_Type type; /* Extension Type */
void* data; /* Extension Data */ void* data; /* Extension Data */
word32 val; /* Extension Value */ word32 val; /* Extension Value */
byte resp; /* IsResponse Flag */ byte resp; /* IsResponse Flag */
struct TLSX* next; /* List Behavior */ struct TLSX* next; /* List Behavior */
} TLSX; };
WOLFSSL_LOCAL TLSX* TLSX_Find(TLSX* list, TLSX_Type type); WOLFSSL_LOCAL TLSX* TLSX_Find(TLSX* list, TLSX_Type type);
WOLFSSL_LOCAL void TLSX_Remove(TLSX** list, TLSX_Type type, void* heap); WOLFSSL_LOCAL void TLSX_Remove(TLSX** list, TLSX_Type type, void* heap);
@ -4233,7 +4233,7 @@ enum cipherState {
CIPHER_STATE_END, CIPHER_STATE_END,
}; };
typedef struct Options { struct Options {
#ifndef NO_PSK #ifndef NO_PSK
wc_psk_client_callback client_psk_cb; wc_psk_client_callback client_psk_cb;
wc_psk_server_callback server_psk_cb; wc_psk_server_callback server_psk_cb;
@ -4448,7 +4448,7 @@ typedef struct Options {
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
byte oldMinor; /* client preferred version < TLS 1.3 */ byte oldMinor; /* client preferred version < TLS 1.3 */
#endif #endif
} Options; };
typedef struct Arrays { typedef struct Arrays {
byte* pendingMsg; /* defrag buffer */ byte* pendingMsg; /* defrag buffer */