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

Merge pull request #8710 from JacobBarthelmeh/codesonar

Browse Source 
ech get length fix and x509 extension print temporary buffer size
This commit is contained in:
David Garske
2025-05-09 11:41:24 -07:00
committed by GitHub
parent 7cd080b421 77c0f79cbe
commit 407efd3c5d
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ssl.c
View File

@ -1004,16 +1004,23 @@ int GetEchConfigsEx(WOLFSSL_EchConfig* configs, byte* output, word32* outputLen)
WOLFSSL_EchConfig* workingConfig = NULL; WOLFSSL_EchConfig* workingConfig = NULL;
byte* outputStart = output; byte* outputStart = output;
word32 totalLen = 2; word32 totalLen = 2;
word32 workingOutputLen; word32 workingOutputLen = 0;
if (configs == NULL || outputLen == NULL || *outputLen < totalLen) if (configs == NULL || outputLen == NULL ||
(output != NULL && *outputLen < totalLen)) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
}
workingOutputLen = *outputLen - totalLen;
/* skip over total length which we fill in later */ /* skip over total length which we fill in later */
if (output != NULL) if (output != NULL) {
workingOutputLen = *outputLen - totalLen;
output += 2; output += 2;
}
else {
/* caller getting the size only, set current 2 byte length size */
*outputLen = totalLen;
}
workingConfig = configs; workingConfig = configs;

3
src/x509.c
View File

@ -6554,8 +6554,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
buf = (char*)XMALLOC(MAX_WIDTH-4-indent, x509->heap, buf = (char*)XMALLOC(MAX_WIDTH, x509->heap, DYNAMIC_TYPE_TMP_BUFFER);
DYNAMIC_TYPE_TMP_BUFFER);
if (buf == NULL) { if (buf == NULL) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }