Repository navigation
fix(misc): PCAP-NG ZigBee keys hand-roll a short-read record #2688
Description
Found by the short-read audit, and confirmed by an independent re-probe. zigbee_key_held in the PCAP-NG schema module (used by PCAPNG._make_secrets_zigbee_nwk and _make_secrets_zigbee_aps) pads Secrets Data to the key's fixed width with ljust. It unpacks the padded octets, then walks the fixed fields and writes __short_read__ by hand for the first field the data ends inside. That duplicates Schema._note_short_read.
Fix:
- Drop the
ljustand the hand-written loop. - Unpack the held octets as they are, with a declared length so that empty Secrets Data does not raise
StreamEOFError. - Let the built-in record the cut.
- Discard the already-reported short-read
SchemaWarningthroughhold_warnings, not a warnings filter.
Round trips at every cut must stay exact.
Activity
JarryShaw commentedon Nov 2, 2026
Filed from the short-read audit, and confirmed by an independent re-probe. A worker is on it now. Moved to
wip.JarryShaw commentedon Nov 2, 2026
The fix is pushed as branch
fix/2688-zigbee-key-short-read(983a5c6df). Opening its PR is held because the Actions queue is at 24; new PRs wait for fewer than 20. A Sonnet review runs on the branch in the meantime.JarryShaw commentedon Nov 2, 2026
The PR is #2697.
fix(misc): let the built-in record a held ZigBee key's short read (#2688