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

break out on error parsing PKCS#7 SignedData inner OCTET_STRING

Browse Source
This commit is contained in:
Chris Conlon
2020-11-12 15:44:25 -07:00
parent c0c452b0a1
commit 735fb19ea9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wolfcrypt/src/pkcs7.c
View File

@ -4379,11 +4379,17 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
if (localIdx - start + length == (word32)contentLen) { if (localIdx - start + length == (word32)contentLen) {
multiPart = 0; multiPart = 0;
} else { } else {
/* reset length to outer OCTET_STRING (contentLen) */ /* reset length to outer OCTET_STRING for bundle size
* check below */
length = contentLen; length = contentLen;
} }
localIdx = start; localIdx = start;
} }
if (ret != 0) {
/* failed ASN1 parsing during OCTET_STRING checks */
break;
}
} }
/* get length of content in case of single part */ /* get length of content in case of single part */
@ -4426,7 +4432,10 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
if (!degenerate && !detached && ret != 0) if (!degenerate && !detached && ret != 0)
break; break;
length = 0; /* no content to read */ /* no content to read */
length = 0;
contentLen = 0;
pkiMsg2 = pkiMsg; pkiMsg2 = pkiMsg;
pkiMsg2Sz = pkiMsgSz; pkiMsg2Sz = pkiMsgSz;
} }