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

Merge pull request #3299 from dgarske/ocsp_certchain

Browse Source 
Fix for possible NULL use if certChain not loaded and OCSP cert request called
This commit is contained in:
toddouska
2020-09-21 13:40:21 -07:00
committed by GitHub
parent 1274a01dc7 b4c964f729
commit 0e66f9d835
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/internal.c
View File

@ -17465,6 +17465,7 @@ int SendCertificateStatus(WOLFSSL* ssl)
#else
DecodedCert cert[1];
#endif
DerBuffer* chain;
#ifdef WOLFSSL_SMALL_STACK
cert = (DecodedCert*)XMALLOC(sizeof(DecodedCert), ssl->heap,
@ -17481,14 +17482,20 @@ int SendCertificateStatus(WOLFSSL* ssl)
return MEMORY_E;
}
while (idx + OPAQUE24_LEN < ssl->buffers.certChain->length) {
c24to32(ssl->buffers.certChain->buffer + idx, &der.length);
/* use certChain if available, otherwise use peer certificate */
chain = ssl->buffers.certChain;
if (chain == NULL) {
chain = ssl->buffers.certificate;
}
while (chain && idx + OPAQUE24_LEN < chain->length) {
c24to32(chain->buffer + idx, &der.length);
idx += OPAQUE24_LEN;
der.buffer = ssl->buffers.certChain->buffer + idx;
der.buffer = chain->buffer + idx;
idx += der.length;
if (idx > ssl->buffers.certChain->length)
if (idx > chain->length)
break;
ret = CreateOcspRequest(ssl, request, cert, der.buffer,