diff --git a/CHANGELOG.md b/CHANGELOG.md index ca1586305..f78a62b7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] +- Fixed `trace list` - a Hitag U LOGIN or WRITE SINGLE BLOCK frame could write up to 17 bytes past the end of the 60 byte annotation buffer (@iceman1001) - Fixed `hf mf autopwn` - it now re-authenticates and retries the block with the other key (@iceman1001) - Fixed `hf mf hardnested` - the device declared `num_nonces * 4` bytes but packs 9 bytes per nonce pair. Thanks @TheArchitect0880 (@iceman1001) - Changed `hf mfdes detect` - with no `-n` it now sweeps every key number the application declares instead of only key 0 (@iceman1001) diff --git a/client/src/cmdtrace.c b/client/src/cmdtrace.c index e835cc478..dd599e1c3 100644 --- a/client/src/cmdtrace.c +++ b/client/src/cmdtrace.c @@ -518,7 +518,10 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr uint32_t end_of_transmission_timestamp = 0; uint8_t topaz_reader_command[MAX_TOPAZ_READER_CMD_LEN]; - char explanation[60] = {0}; + // Shared by every annotate* function below. + // annotateHitagU() and annotateHitagS() accumulate into it without clamping. + // annotateHitagU(): 76 chars for flags PEXT|INV|RFU|NOS|CRCT on a WRITE SINGLE BLOCK + char explanation[80] = {0}; tracelog_hdr_t *first_hdr = (tracelog_hdr_t *)(trace); tracelog_hdr_t *hdr = (tracelog_hdr_t *)(trace + tracepos);