Repository navigation
PKCS7: only wait for an 00 00 ending on indefinite EncryptedContentInfo - #11616
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Copilot review overview
🟢 Approval recommended
The focused change correctly distinguishes definite and indefinite encodings and addresses the existing regression test.
Review effort: Balanced
Findings: None
What changed in this PR
Fixes PKCS#7 streaming decode of definite-length EncryptedContentInfo by avoiding an erroneous wait for an end-of-contents marker.
Changes:
- Adds EOC lookahead only when
indefEciis set. - Restores expected short-tag validation behavior.
| File | Description |
|---|---|
wolfcrypt/src/pkcs7.c |
Makes stream buffering conditional on indefinite-length encoding. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
JacobBarthelmeh
approved these changes
Sep 30, 2026
dgarske
approved these changes
Sep 30, 2026
Member
|
Merging early to unblock CI |
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
This fixes a CI failure on master following merge of #11490 and #11554.
Change is to use the
indefEciflag to decide whether to look for the two trailing bytes.Testing
CI
Checklist