X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b957bcd382bf718f766c0774839752eb99f668af..28ee794f59aac1fac7aa18bfbaa4050d48a90260:/client/cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 3256b69a..00b1aa8d 100644
--- 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,14 @@ 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)) {
+		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;