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;
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)
{
(j == num_lines-1) ? explanation : "");
}
}
+
+ if (DecodeMifareData(frame, data_len, isResponse, mfData, &mfDataLen)) {
+ annotateIso14443a(explanation, sizeof(explanation), mfData, mfDataLen);
+
+ PrintAndLog(" | * | dec |%-64s | %-4s| %s",
+ sprint_hex(mfData, mfDataLen),
+ "",
+ (true) ? explanation : "");
+ };
if (is_last_record(tracepos, trace, traceLen)) return traceLen;
PrintAndLog(" Start | End | Src | Data (! denotes parity error) | CRC | Annotation |");
PrintAndLog("------------|------------|-----|-----------------------------------------------------------------|-----|--------------------|");
+ ClearAuthData();
while(tracepos < traceLen)
{
tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles, markCRCBytes);