github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

only mark CRC bytes if we have 3 or more bytes, and increase the line buffer since ansi colors eats chars

Browse source
This commit is contained in:
iceman1001 2022-12-31 10:04:30 +01:00
commit e77781e621
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/cmdtrace.c
View file

@ -573,7 +573,7 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
//2 Not crc-command //2 Not crc-command
//--- Draw the data column //--- Draw the data column
char line[18][140] = {{0}}; char line[18][160] = {{0}};
if (data_len == 0) { if (data_len == 0) {
if (protocol == ICLASS && duration == 2048) { if (protocol == ICLASS && duration == 2048) {
@ -633,8 +633,9 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
} }
uint8_t crc_format_string_offset = 0; uint8_t crc_format_string_offset = 0;
if (markCRCBytes) { if (markCRCBytes && data_len > 2) {
//CRC-command //CRC-command
if (((protocol == PROTO_HITAG1) || (protocol == PROTO_HITAGS)) && (data_len > 1)) { if (((protocol == PROTO_HITAG1) || (protocol == PROTO_HITAGS)) && (data_len > 1)) {
// Note that UID REQUEST response has no CRC, but we don't know // Note that UID REQUEST response has no CRC, but we don't know
@ -647,6 +648,7 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
} else { } else {
if (crcStatus == 0 || crcStatus == 1) { if (crcStatus == 0 || crcStatus == 1) {
char *pos1 = line[(data_len - 2) / 18]; char *pos1 = line[(data_len - 2) / 18];
pos1 += (((data_len - 2) % 18) * 4) - 1; pos1 += (((data_len - 2) % 18) * 4) - 1;