X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/43591e6464af07466ffd87fcb970527ba748253a..d9de20fa4bb0a36052927b55c4185caa204c5c4d:/client/cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index b973354d..744a95d2 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -28,11 +28,13 @@
 #include "cmdhflegic.h"
 #include "cmdhficlass.h"
 #include "cmdhfmf.h"
+#include "cmdhfmfp.h"
 #include "cmdhfmfu.h"
 #include "cmdhftopaz.h"
 #include "protocols.h"
 #include "emv/cmdemv.h"
 #include "cmdhflist.h"
+#include "cmdhffido.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -262,7 +264,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
 		uint8_t parityBits = parityBytes[j>>3];
 		if (protocol != ISO_14443B && (isResponse || protocol == ISO_14443A) && (oddparity8(frame[j]) != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
-			snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
+			snprintf(line[j/16]+(( j % 16) * 4), 110, " %02x!", frame[j]);
 		} else {
 			snprintf(line[j/16]+(( j % 16) * 4), 110, " %02x ", frame[j]);
 		}
@@ -279,14 +281,11 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 		}
 	}
 
-	if(data_len == 0)
-	{
-		if(data_len == 0){
-			sprintf(line[0],"<empty trace - possible error>");
-		}
+	if (data_len == 0) {
+		sprintf(line[0]," <empty trace - possible error>");
 	}
-	//--- Draw the CRC column
 
+	//--- Draw the CRC column
 	char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
 
 	EndOfTransmissionTimestamp = timestamp + duration;
@@ -413,6 +412,8 @@ int CmdHFList(const char *Cmd)
 			protocol = ISO_14443B;
 		} else if(strcmp(type,"topaz") == 0) {
 			protocol = TOPAZ;
+		} else if(strcmp(type, "7816") == 0) {
+			protocol = ISO_7816_4;	
 		} else if(strcmp(type,"raw") == 0) {
 			protocol = -1; //No crc, no annotations
 		} else if (strcmp(type, "save") == 0) {
@@ -590,12 +591,13 @@ static command_t CommandTable[] =
 	{"14b",		CmdHF14B,		1, "{ ISO14443B RFIDs... }"},
 	{"15",		CmdHF15,		1, "{ ISO15693 RFIDs... }"},
 	{"epa",		CmdHFEPA,		1, "{ German Identification Card... }"},
-	{"emv",		CmdHFEMV,		1, "{ EMV cards... }"},
 	{"legic",	CmdHFLegic,		0, "{ LEGIC RFIDs... }"},
 	{"iclass",	CmdHFiClass,	1, "{ ICLASS RFIDs... }"},
 	{"mf",		CmdHFMF,		1, "{ MIFARE RFIDs... }"},
 	{"mfu",		CmdHFMFUltra,	1, "{ MIFARE Ultralight RFIDs... }"},
+	{"mfp",		CmdHFMFP,		1, "{ MIFARE Plus RFIDs... }"},
 	{"topaz",	CmdHFTopaz,		1, "{ TOPAZ (NFC Type 1) RFIDs... }"},
+	{"fido",	CmdHFFido,		1, "{ FIDO and FIDO2 authenticators... }"},
 	{"tune",	CmdHFTune,		0, "Continuously measure HF antenna tuning"},
 	{"list",	CmdHFList,		1, "List protocol data in trace buffer"},
 	{"search",	CmdHFSearch,	1, "Search for known HF tags [preliminary]"},