esp: defer esp_replay_commit to after aead decrypt, and comments.#135
Open
philljj wants to merge 5 commits into
Open
esp: defer esp_replay_commit to after aead decrypt, and comments.#135philljj wants to merge 5 commits into
philljj wants to merge 5 commits into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Adjusts ESP transport-mode inbound processing so anti-replay state is only committed after AEAD authentication has been verified (which occurs during decrypt/verify for GCM/GMAC), aligning with RFC 4303 replay-window guidance and preventing replay-window advancement on failed AEAD verification.
Changes:
- Move
esp_replay_commit()to after the decrypt/verify step so AEAD ICV/tag verification happens before committing the sequence number. - Add/adjust comments describing when ICV verification occurs (HMAC vs AEAD) and add small clarifying comments around padding/debug printing.
- Add a note documenting current per-packet cipher context initialization tradeoffs.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
gasbytes
requested changes
Jun 18, 2026
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
Defer
esp_replay_commit()until after decrypt, which is where aead icv check happens.Add a unit test for this.
Also, add some comments.
Fixes ZD-21997.
Fixes F-4769.