nested works

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 00b1aa8d6824215c5bda462ba218062e17ae8ec6..ffbc451580ca6ce045d53a9b2fe83d3477f00c7d 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -433,12 +433,16 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                }
        }
        
-       if (DecodeMifareData(frame, data_len, isResponse, mfData, &mfDataLen)) {
-               annotateIso14443a(explanation, sizeof(explanation), mfData, mfDataLen);
-               
+       if (DecodeMifareData(frame, data_len, parityBytes, 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 : "");
        };