X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3bcc4d77e1ea1d383e3dd15935efda2f36af4881..daccbcdc8d57d451323e19842aa7cf877a65829c:/client/cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 82313ae0..d2201800 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -9,18 +9,18 @@
 // High frequency commands
 //-----------------------------------------------------------------------------
 
+#include "cmdhf.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "proxmark3.h"
+#include "comms.h"
 #include "util.h"
-#include "data.h"
 #include "ui.h"
 #include "iso14443crc.h"
 #include "parity.h"
 #include "cmdmain.h"
 #include "cmdparser.h"
-#include "cmdhf.h"
 #include "cmdhf14a.h"
 #include "cmdhf14b.h"
 #include "cmdhf15.h"
@@ -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);
 
@@ -353,6 +355,12 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
 int CmdHFList(const char *Cmd)
 {
+	#ifdef WITH_SMARTCARD
+		PrintAndLog("TEST_WITH_SMARTCARD");
+	#endif
+	#ifdef WITH_TEST
+		PrintAndLog("TEST_WITH_TEST");
+	#endif
 	bool showWaitCycles = false;
 	bool markCRCBytes = false;
 	bool loadFromFile = false;
@@ -361,7 +369,7 @@ int CmdHFList(const char *Cmd)
 	char param2 = '\0';
 	char param3 = '\0';
 	char type[40] = {0};
-	char filename[FILE_PATH_SIZE];
+	char filename[FILE_PATH_SIZE] = {0};
 	uint8_t protocol = 0;
 	
 	// parse command line
@@ -497,8 +505,7 @@ int CmdHFList(const char *Cmd)
 		trace = malloc(USB_CMD_DATA_SIZE);
 		// Query for the size of the trace
 		UsbCommand response;
-		GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0);
-		WaitForResponse(CMD_ACK, &response);
+		GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0, &response, -1, false);
 		traceLen = response.arg[2];
 		if (traceLen > USB_CMD_DATA_SIZE) {
 			uint8_t *p = realloc(trace, traceLen);
@@ -508,8 +515,7 @@ int CmdHFList(const char *Cmd)
 				return 2;
 			}
 			trace = p;
-			GetFromBigBuf(trace, traceLen, 0);
-			WaitForResponse(CMD_ACK, NULL);
+			GetFromBigBuf(trace, traceLen, 0, NULL, -1, false);
 		}
 	}
 
@@ -591,7 +597,9 @@ static command_t CommandTable[] =
 	{"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]"},