pkcs7 fix: retain certificates after SignedData encode - #11062
Open
danielinux wants to merge 1 commit into
Open
Conversation
PKCS7_EncodeSigned() freed the object's certificate-list nodes after a successful encode while leaving the signer fields populated. Reusing the object then emitted SignedData without certificates, requiring external signature verification. Keep the list until wc_PKCS7_Free(), which already handles its cleanup.
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes PKCS#7 SignedData encoding object reuse by stopping PKCS7_EncodeSigned() from freeing the internal certificate-list nodes after a successful encode. This keeps certificate inclusion consistent across repeated encodes until the object is explicitly cleaned up via wc_PKCS7_Free().
Changes:
- Remove the post-encode call to
wc_PKCS7_FreeCertSet(pkcs7)inPKCS7_EncodeSigned(). - Ensure the certificate list remains available for subsequent encodes and is only cleaned up in
wc_PKCS7_Free().
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
PKCS7_EncodeSigned() freed the object's certificate-list nodes after a successful encode while leaving the signer fields populated. Reusing the object then emitted SignedData without certificates, requiring external signature verification.
Keep the list until wc_PKCS7_Free(), which already handles its cleanup.
Testing
Discovered in MC/DC campaign part 5 #11039