correct 1st key calculation

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 2557607b35e320217c0a0afde98d679cb671862a..9f3ff4e4c44f3d937943aed355051b23f4da4aa4 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;
        
@@ -400,7 +402,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
        EndOfTransmissionTimestamp = timestamp + duration;
 
        if (protocol == PROTO_MIFARE)
-               annotateMifare(explanation, sizeof(explanation), frame, data_len, isResponse);
+               annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse);
        
        if(!isResponse)
        {
@@ -430,6 +432,13 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                                (j == num_lines-1) ? explanation : "");
                }
        }
+       
+       if (DecodeMifareData(frame, data_len, isResponse, mfData, &mfDataLen)) {
+               PrintAndLog("            |            |     |%-64s | %s| %s",
+                       sprint_hex(mfData, mfDataLen),
+                       "",
+                       (false) ? explanation : "");
+       };
 
        if (is_last_record(tracepos, trace, traceLen)) return traceLen;