CryptoEngine: fix missleading packet id uint64 type#10076
Open
Jorropo wants to merge 1 commit intomeshtastic:developfrom
Open
CryptoEngine: fix missleading packet id uint64 type#10076Jorropo wants to merge 1 commit intomeshtastic:developfrom
Jorropo wants to merge 1 commit intomeshtastic:developfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR corrects the CryptoEngine API to treat packet identifiers as 32-bit values (matching the on-wire header format) and updates nonce initialization accordingly.
Changes:
- Change
CryptoEnginemethod signatures to useuint32_tforpacketNum/packetId(Curve25519 and packet encryption/decryption APIs). - Update
initNonce()to build the nonce from a 32-bit packet id plus optional 32-bitextraNonce, thenfromNode.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
src/mesh/CryptoEngine.h |
Updates public API types from uint64_t to uint32_t and adjusts initNonce() signature. |
src/mesh/CryptoEngine.cpp |
Updates implementations to match new 32-bit packet id types and modifies nonce packing logic. |
The packet id is always a uint32. The wire header format hardcodes a uint32 value. All the callers zext uint32s to uint64s when calling the CryptoEngine. Inside initNonce we even overwrite the upper half of the packet id when extraNonce is present.
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.
The packet id is always a uint32.
The wire header format hardcodes a uint32 value.
All the callers zext uint32s to uint64s when calling the CryptoEngine. Inside initNonce we even overwrite the upper half of the packet id when extraNonce is present.
I didn't tested this code.