wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-10 01:40:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10788 from aidangarske/fenrir-tls-batch-2026-06

Browse Source 
Various hardening fixes across sniffer, QUIC, PKCS#11, TLS and tooling
This commit is contained in:
David Garske
2026-07-08 13:58:14 -07:00
committed by GitHub
parent 1e6f266e47 d53e3615a3
commit fdfba83c38
11 changed files with 138 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/asn1/asn1.c
+8 -1
View File
@@ -98,13 +98,20 @@ static int asn1App_ReadFile(FILE* fp, unsigned char** pdata, word32* plen)
/* Add read data amount to length. */
len += (word32)read_len;
/* Stop before the length or reallocation size can wrap word32. */
if (len > (word32)(0xFFFFFFFFU - DATA_INC_LEN)) {
XFREE(data, NULL, DYNAMIC_TYPE_TMP_BUFFER);
data = NULL;
break;
}
/* Stop if we are at end-of-file. */
if (feof(fp)) {
break;
}
/* Make space for more data to be added to buffer. */
p = (unsigned char*)XREALLOC(data, len + DATA_INC_LEN, NULL,
p = (unsigned char*)XREALLOC(data, (size_t)len + DATA_INC_LEN, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (p == NULL) {
/* Reallocation failed - free current buffer. */
examples/pem/pem.c
+8 -1
View File
@@ -112,13 +112,20 @@ static int pemApp_ReadFile(FILE* fp, unsigned char** pdata, word32* plen)
/* Add read data amount to length. */
len += (word32)read_len;
/* Stop before the length or reallocation size can wrap word32. */
if (len > (word32)(0xFFFFFFFFU - DATA_INC_LEN - BLOCK_SIZE_MAX)) {
XFREE(data, NULL, DYNAMIC_TYPE_TMP_BUFFER);
data = NULL;
break;
}
/* Stop if we are at end-of-file. */
if (feof(fp)) {
break;
}
/* Make space for more data to be added to buffer. */
p = (unsigned char*)XREALLOC(data, len + DATA_INC_LEN +
p = (unsigned char*)XREALLOC(data, (size_t)len + DATA_INC_LEN +
BLOCK_SIZE_MAX, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (p == NULL) {
/* Reallocation failed - free current buffer. */