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

handle degenerate case after rebase

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-11-05 15:42:31 -07:00
committed by David Garske
parent 9fa4f754ab
commit 820ee0439a
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wolfcrypt/src/pkcs7.c
View File

@@ -3356,7 +3356,8 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
} }
/* Get the contentInfo sequence */ /* Get the contentInfo sequence */
if (ret == 0 && GetSequence(pkiMsg, &idx, &length, totalSz) < 0) if (ret == 0 && GetSequence_ex(pkiMsg, &idx, &length, totalSz,
NO_USER_CHECK) < 0)
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
if (ret == 0 && length == 0 && pkiMsg[idx-1] == 0x80) { if (ret == 0 && length == 0 && pkiMsg[idx-1] == 0x80) {
@@ -3389,6 +3390,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
pkiMsgSz) < 0) pkiMsgSz) < 0)
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
if (ret == 0 && outerContentType != SIGNED_DATA) { if (ret == 0 && outerContentType != SIGNED_DATA) {
WOLFSSL_MSG("PKCS#7 input not of type SignedData"); WOLFSSL_MSG("PKCS#7 input not of type SignedData");
ret = PKCS7_OID_E; ret = PKCS7_OID_E;
@@ -3399,11 +3401,13 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
(ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 0)) (ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 0))
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
if (ret == 0 && GetLength(pkiMsg, &idx, &length, totalSz) < 0) if (ret == 0 && GetLength_ex(pkiMsg, &idx, &length, totalSz,
NO_USER_CHECK) < 0)
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
/* Get the signedData sequence */ /* Get the signedData sequence */
if (ret == 0 && GetSequence(pkiMsg, &idx, &length, totalSz) < 0) if (ret == 0 && GetSequence_ex(pkiMsg, &idx, &length, totalSz,
NO_USER_CHECK) < 0)
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
/* Get the version */ /* Get the version */
@@ -3433,7 +3437,9 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &stateIdx, &idx)) != 0) { if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &stateIdx, &idx)) != 0) {
break; break;
} }
pkcs7->stream->maxLen = totalSz; if (pkiMsg2 && pkiMsg2Sz > 0) {
pkcs7->stream->maxLen += pkiMsg2Sz + pkcs7->contentSz;
}
wc_PKCS7_StreamStoreVar(pkcs7, totalSz, 0, 0); wc_PKCS7_StreamStoreVar(pkcs7, totalSz, 0, 0);
#endif #endif
@@ -3529,6 +3535,13 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
} }
idx = localIdx; idx = localIdx;
} }
else {
if (!degenerate && ret != 0)
break;
length = 0; /* no content to read */
pkiMsg2 = pkiMsg;
pkiMsg2Sz = pkiMsgSz;
}
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
/* save contentType */ /* save contentType */
@@ -3543,11 +3556,6 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
XMEMCPY(pkcs7->stream->nonce, contentType, contentTypeSz); XMEMCPY(pkcs7->stream->nonce, contentType, contentTypeSz);
} }
if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &stateIdx, &idx)) != 0) {
break;
}
wc_PKCS7_StreamStoreVar(pkcs7, pkiMsg2Sz, localIdx, length);
/* 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)) {
@@ -3557,6 +3565,11 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
pkcs7->stream->expected = 0; pkcs7->stream->expected = 0;
} }
if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &stateIdx, &idx)) != 0) {
break;
}
wc_PKCS7_StreamStoreVar(pkcs7, pkiMsg2Sz, localIdx, length);
/* content length is in multiple parts */ /* content length is in multiple parts */
if (multiPart) { if (multiPart) {
pkcs7->stream->expected = contentLen; pkcs7->stream->expected = contentLen;
@@ -3713,7 +3726,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
} }
} }
if (pkcs7->stream->flagOne) { if (content != NULL && pkcs7->stream->flagOne) {
stateIdx = idx; /* case where all data was read from in2 */ stateIdx = idx; /* case where all data was read from in2 */
} }