wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7312 from philljj/zd17621

Browse Source 
Handle failed alloc in TLSX_Write.
This commit is contained in:
David Garske
2024-03-09 15:20:50 -08:00
committed by GitHub
parent 0c40fb5c5f 0e15a2e83a
commit bd20640e58
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/tls.c
View File

@ -3089,8 +3089,8 @@ static word16 TLSX_CSR_GetSize(CertificateStatusRequest* csr, byte isRequest)
return size; return size;
} }
static word16 TLSX_CSR_Write(CertificateStatusRequest* csr, byte* output, static int TLSX_CSR_Write(CertificateStatusRequest* csr, byte* output,
byte isRequest) byte isRequest)
{ {
/* shut up compiler warnings */ /* shut up compiler warnings */
(void) csr; (void) output; (void) isRequest; (void) csr; (void) output; (void) isRequest;
@ -3119,6 +3119,9 @@ static word16 TLSX_CSR_Write(CertificateStatusRequest* csr, byte* output,
if (ret > 0) { if (ret > 0) {
length = (word16)ret; length = (word16)ret;
} }
else {
return ret;
}
} }
c16toa(length, output + offset); c16toa(length, output + offset);
@ -3127,7 +3130,7 @@ static word16 TLSX_CSR_Write(CertificateStatusRequest* csr, byte* output,
break; break;
} }
return offset; return (int)offset;
} }
#endif #endif
#if defined(WOLFSSL_TLS13) && !defined(NO_WOLFSSL_SERVER) #if defined(WOLFSSL_TLS13) && !defined(NO_WOLFSSL_SERVER)
@ -3555,7 +3558,7 @@ static word16 TLSX_CSR2_GetSize(CertificateStatusRequestItemV2* csr2,
return size; return size;
} }
static word16 TLSX_CSR2_Write(CertificateStatusRequestItemV2* csr2, static int TLSX_CSR2_Write(CertificateStatusRequestItemV2* csr2,
byte* output, byte isRequest) byte* output, byte isRequest)
{ {
/* shut up compiler warnings */ /* shut up compiler warnings */
@ -3600,6 +3603,9 @@ static word16 TLSX_CSR2_Write(CertificateStatusRequestItemV2* csr2,
if (ret > 0) { if (ret > 0) {
length = (word16)ret; length = (word16)ret;
} }
else {
return ret;
}
} }
c16toa(length, output + offset); c16toa(length, output + offset);
@ -3611,7 +3617,7 @@ static word16 TLSX_CSR2_Write(CertificateStatusRequestItemV2* csr2,
/* list size */ /* list size */
c16toa(offset - OPAQUE16_LEN, output); c16toa(offset - OPAQUE16_LEN, output);
return offset; return (int)offset;
} }
#endif #endif
@ -12614,15 +12620,23 @@ static int TLSX_Write(TLSX* list, byte* output, byte* semaphore,
case TLSX_STATUS_REQUEST: case TLSX_STATUS_REQUEST:
WOLFSSL_MSG("Certificate Status Request extension to write"); WOLFSSL_MSG("Certificate Status Request extension to write");
offset += CSR_WRITE((CertificateStatusRequest*)extension->data, ret = CSR_WRITE((CertificateStatusRequest*)extension->data,
output + offset, isRequest); output + offset, isRequest);
if (ret > 0) {
offset += (word16)ret;
ret = 0;
}
break; break;
case TLSX_STATUS_REQUEST_V2: case TLSX_STATUS_REQUEST_V2:
WOLFSSL_MSG("Certificate Status Request v2 extension to write"); WOLFSSL_MSG("Certificate Status Request v2 extension to write");
offset += CSR2_WRITE( ret = CSR2_WRITE(
(CertificateStatusRequestItemV2*)extension->data, (CertificateStatusRequestItemV2*)extension->data,
output + offset, isRequest); output + offset, isRequest);
if (ret > 0) {
offset += (word16)ret;
ret = 0;
}
break; break;
case TLSX_RENEGOTIATION_INFO: case TLSX_RENEGOTIATION_INFO: