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

sanity check on length befor checking ASN.1 tag

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-11-06 14:00:10 -07:00
committed by David Garske
parent 27db083733
commit 100bf76748
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wolfcrypt/src/pkcs7.c
View File

@ -3559,10 +3559,10 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
/* content expected? */ /* content expected? */
if ((ret == 0 && length > 0) && if ((ret == 0 && length > 0) &&
!(pkiMsg2 && pkiMsg2Sz > 0 && hashBuf && hashSz > 0)) { !(pkiMsg2 && pkiMsg2Sz > 0 && hashBuf && hashSz > 0)) {
pkcs7->stream->expected = length; pkcs7->stream->expected = length + ASN_TAG_SZ;
} }
else { else {
pkcs7->stream->expected = 0; pkcs7->stream->expected = ASN_TAG_SZ;
} }
if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &stateIdx, &idx)) != 0) { if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &stateIdx, &idx)) != 0) {
@ -3572,7 +3572,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
/* content length is in multiple parts */ /* content length is in multiple parts */
if (multiPart) { if (multiPart) {
pkcs7->stream->expected = contentLen; pkcs7->stream->expected = contentLen + ASN_TAG_SZ;
} }
pkcs7->stream->multi = multiPart; pkcs7->stream->multi = multiPart;
@ -3686,6 +3686,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
} }
else { else {
pkiMsg2 = pkiMsg; pkiMsg2 = pkiMsg;
pkiMsg2Sz = pkiMsgSz;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
pkcs7->stream->flagOne = 1; pkcs7->stream->flagOne = 1;
#endif #endif
@ -3702,14 +3703,18 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
} }
/* Get the implicit[0] set of certificates */ /* Get the implicit[0] set of certificates */
if (pkiMsg2[idx] == (ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 0)) { if (ret == 0 && idx >= pkiMsg2Sz)
ret = BUFFER_E;
if (ret == 0 && pkiMsg2[idx] ==
(ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 0)) {
idx++; idx++;
if (GetLength(pkiMsg2, &idx, &length, pkiMsg2Sz) < 0) if (GetLength(pkiMsg2, &idx, &length, pkiMsg2Sz) < 0)
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
if (ret != 0) { if (ret != 0) {
break; break;
} }
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
/* save content */ /* save content */
if (content != NULL) { if (content != NULL) {
@ -3921,7 +3926,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
/* Get the implicit[1] set of crls */ /* Get the implicit[1] set of crls */
if (ret == 0 && idx > pkiMsg2Sz) if (ret == 0 && idx >= pkiMsg2Sz)
ret = BUFFER_E; ret = BUFFER_E;
if (ret == 0 && pkiMsg2[idx] == if (ret == 0 && pkiMsg2[idx] ==