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

Merge pull request #2109 from dgarske/pkcs7_buf

Browse Source 
Fix for proper detection of PKCS7 buffer overflow case
This commit is contained in:
toddouska
2019-02-25 13:02:09 -08:00
committed by GitHub
parent b037334732 ee3eb8fb4c
commit 72a50b8d46
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/pkcs7.c
View File

@ -2068,6 +2068,10 @@ static int PKCS7_EncodeSigned(PKCS7* pkcs7, ESD* esd,
totalSz -= pkcs7->contentSz; totalSz -= pkcs7->contentSz;
} }
} }
else {
/* if using single output buffer include content and footer */
totalSz += total2Sz;
}
if (totalSz > *outputSz) { if (totalSz > *outputSz) {
if (pkcs7->signedAttribsSz != 0) if (pkcs7->signedAttribsSz != 0)