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

adjust size when streaming with PKCS7 verify

Browse Source
This commit is contained in:
Jacob Barthelmeh
2021-03-18 22:52:36 +07:00
parent a3be049e0e
commit de50209cdf
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/src/pkcs7.c
View File

@@ -5077,6 +5077,11 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
wc_PKCS7_StreamGetVar(pkcs7, &pkiMsg2Sz, 0, &length); wc_PKCS7_StreamGetVar(pkcs7, &pkiMsg2Sz, 0, &length);
if (pkcs7->stream->flagOne) { if (pkcs7->stream->flagOne) {
pkiMsg2 = pkiMsg; pkiMsg2 = pkiMsg;
/* check if using internal stream buffer and should adjust sz */
if (pkiMsg != in && pkcs7->stream->length > 0) {
pkiMsg2Sz = pkcs7->stream->length;
}
} }
/* restore content type */ /* restore content type */
@@ -5136,7 +5141,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
} }
} }
else { else {
/* last state expect the reset of the buffer */ /* last state expect the rest of the buffer */
pkcs7->stream->expected = (pkcs7->stream->maxLen - pkcs7->stream->expected = (pkcs7->stream->maxLen -
pkcs7->stream->totalRd) + pkcs7->stream->length; pkcs7->stream->totalRd) + pkcs7->stream->length;
} }
@@ -5155,6 +5160,11 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
wc_PKCS7_StreamGetVar(pkcs7, &pkiMsg2Sz, 0, &length); wc_PKCS7_StreamGetVar(pkcs7, &pkiMsg2Sz, 0, &length);
if (pkcs7->stream->flagOne) { if (pkcs7->stream->flagOne) {
pkiMsg2 = pkiMsg; pkiMsg2 = pkiMsg;
/* check if using internal stream buffer and should adjust sz */
if (pkiMsg != in && pkcs7->stream->length > 0) {
pkiMsg2Sz = pkcs7->stream->length;
}
} }
/* restore content */ /* restore content */