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

fix for sanity check on PKCS7 indef read

Browse Source
This commit is contained in:
Jacob Barthelmeh
2022-04-22 15:28:03 -06:00
parent bf16696d8c
commit d96bd30398
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/src/pkcs7.c
View File

@@ -4590,8 +4590,13 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
} }
/* if indef, skip EOF */ /* if indef, skip EOF */
if (isIndef && pkiMsg[idx] == ASN_EOC && pkiMsg[idx+1] == 0) { if (isIndef) {
idx += 2; /* skip EOF + zero byte */ if (idx + 1 >= pkiMsgSz) {
ret = ASN_PARSE_E;
}
else if (pkiMsg[idx] == ASN_EOC && pkiMsg[idx+1] == 0) {
idx += 2; /* skip EOF + zero byte */
}
} }
} }