Merge pull request #3410 from cconlon/zd11001

PKCS#7: Reset variables correctly in VerifySignedData
This commit is contained in:
JacobBarthelmeh
2020-11-02 11:33:52 +08:00
committed by GitHub

View File

@@ -4563,6 +4563,7 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
if (ret == 0) { if (ret == 0) {
idx += length; idx += length;
}
pkiMsg2 = pkiMsg; pkiMsg2 = pkiMsg;
pkiMsg2Sz = pkiMsgSz; pkiMsg2Sz = pkiMsgSz;
@@ -4572,7 +4573,6 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf,
#endif #endif
} }
} }
}
else { else {
pkiMsg2 = pkiMsg; pkiMsg2 = pkiMsg;
pkiMsg2Sz = pkiMsgSz; pkiMsg2Sz = pkiMsgSz;