From b8ddb3b3848a4fb5892091e43d6e52b00eded848 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 14 Feb 2018 23:48:45 +0100 Subject: [PATCH] chg: 'hf list mf' - 10b uid --- client/cmdhf.c | 4 ++-- client/cmdhflist.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/client/cmdhf.c b/client/cmdhf.c index 4f11fe8f1..c36bc70c7 100644 --- a/client/cmdhf.c +++ b/client/cmdhf.c @@ -226,9 +226,9 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui // Always annotate LEGIC read/tag if ( protocol == LEGIC ) - annotateLegic(explanation,sizeof(explanation),frame,data_len); + annotateLegic(explanation, sizeof(explanation), frame, data_len); - if (protocol == PROTO_MIFARE) + if ( protocol == PROTO_MIFARE ) annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse); if (!isResponse) { diff --git a/client/cmdhflist.c b/client/cmdhflist.c index 38d3aabe4..8f93d3cfd 100644 --- a/client/cmdhflist.c +++ b/client/cmdhflist.c @@ -544,6 +544,10 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8 ClearAuthData(); AuthData.uid = bytes_to_num(&cmd[2], 4); } + if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_3 && cmd[1] == 0x70) { + ClearAuthData(); + AuthData.uid = bytes_to_num(&cmd[2], 4); + } } switch(MifareAuthState) {