Repository navigation
fix(misc): let the built-in record a held ZigBee key's short read (#2688) - #2697
Merged
Merged
Conversation
) zigbee_key_held zero-filled the Secrets Data to the key's fixed width, unpacked that, and wrote __short_read__ by hand, duplicating Schema._note_short_read. Its buffers then spanned the fixed width until packed, so a Decryption Secrets Block made from a parsed short key was sized from them and written corrupt. Unpack the octets as held, with a declared length so that empty Secrets Data is not the end of the stream, and let Schema.unpack record the cut. The parse already reported the short read, so its warnings are dropped through hold_warnings with discard set.
JarryShaw
added
bug
Owner
Author
|
GOOD TO GO at
|
JarryShaw
removed
the
review: good-to-go
5 tasks done
JarryShaw
added a commit
that referenced
this pull request
Nov 2, 2026
…s, the cut schema lists, the TSO checksum cut and short ZigBee keys into 1.6.0 (#2449) - Breaking: MH (#2700) refuses a mobility option, or a sub-option, QoS attribute or CGA extension of one, whose fields do not take its length, where 1.5.x rebuilt another; QualityOfServiceOption gains a required tc_reserved. Prefix lengths are held to their field's width, the NAI and service identifier makers count octets, and a long-form DER CGA key parses. Folded into the MH/DSS and makers' range-check entries, with a QoS entry of its own; old and new values measured against v1.5.1. - Fixed: ListField zero-fills a cut list of schema items, bounded by ZERO_PAD_BUDGET_RATIO with no free band, and a SACK past the data raises ProtocolError where it raised FieldValueError (#2701); a Decryption Secrets Block made from a short parsed ZigBee key is written as captured, and zigbee_key_held's schema holds the octets given (#2697). - Folded into unreleased entries: radiotap's mixed bitmaps, their known-bits registries and BitmapField (#2696), into the Radiotap entry; the TSO and AH checksum cut (#2699), into the checksum and contextvars entries; the zero-filled SETTINGS and IGMPv3 records and the IGMPv3 Additional Data rebuild (#2701), into the HTTP/2 SETTINGS and IGMP entries, dropping HTTPv2.make's unreleased frame_length. - No entry for the docstring-and-test-only be83061 (#2695). - CHANGELOG.md regenerated; util/changelog_md.py --check passes.
1 of 5 tasks
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.
make pylint,make mypy,make isort)make testpasses, and a test case covers the changeWhat is the purpose of your pull request?
fix— corrects a defectDescription of your pull request and other information
zigbee_key_heldin the PCAP-NG schema module padded short Secrets Data to the key's width withljust, then hand-wrote the__short_read__record thatSchema.unpackalready makes. The padding also made the returned schema'sbytes()the full key width. So a Decryption Secrets Block built from a parsed short-key model came out wrongly sized and unaligned, for every short count from 0 up to the key width.It now unpacks the held octets as they are, with a declared length, and the built-in records the cut. The already-reported short-read warning is discarded through
hold_warnings.The new tests cut each NWK and APS key at every offset, at the schema level and through
makeandfrom_data. Each short count fails onmain, and both tests assert that nothing is reported twice. Shipped captures parse identically tomain.Closes #2688