hf list mf 1st auth works

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 3256b69a9e77b24eac2bb216f1d30a8b714fc1c7..06382abbbd159ad83c4232eeeef4f1161c3da8a0 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -300,6 +300,8 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
        uint8_t topaz_reader_command[9];
        uint32_t timestamp, first_timestamp, EndOfTransmissionTimestamp;
        char explanation[30] = {0};
+       uint8_t mfData[32] = {0};
+       size_t mfDataLen = 0;
 
        if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
        
@@ -431,8 +433,18 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                }
        }
        
-//     if (DecodeMifareData(frame, data_len, isResponse)) {
-//     };
+       if (DecodeMifareData(frame, data_len, isResponse, mfData, &mfDataLen)) {
+               memset(explanation, 0x00, sizeof(explanation));
+               if (!isResponse) {
+                       explanation[0] = '>';
+                       annotateIso14443a(&explanation[1], sizeof(explanation) - 1, mfData, mfDataLen);
+               }
+               uint8_t crcc = iso14443A_CRC_check(isResponse, mfData, mfDataLen);
+               PrintAndLog("            |          * | dec |%-64s | %-4s| %s",
+                       sprint_hex(mfData, mfDataLen),
+                       (crcc == 0 ? "!crc" : (crcc == 1 ? " ok " : "    ")),
+                       (true) ? explanation : "");
+       };
 
        if (is_last_record(tracepos, trace, traceLen)) return traceLen;