X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/69f8a37be03089ccf5e579fb94a7cc02edd779fc..9484ff3d6eeff3bea9ff1547f753a97e85c94f13:/client/cmdhfepa.c

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 2787b969..3286ceb9 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -9,12 +9,13 @@
 //-----------------------------------------------------------------------------
 
 #include "util.h"
-#include "proxusb.h"
+//#include "proxusb.h"
+#include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "common.h"
 #include "cmdmain.h"
-
+#include "sleep.h"
 #include "cmdhfepa.h"
 
 static int CmdHelp(const char *Cmd);
@@ -23,41 +24,40 @@ static int CmdHelp(const char *Cmd);
 int CmdHFEPACollectPACENonces(const char *Cmd)
 {
 	// requested nonce size
-	uint8_t m = 0;
+	unsigned int m = 0;
 	// requested number of Nonces
 	unsigned int n = 0;
 	// delay between requests
 	unsigned int d = 0;
 	
-	sscanf(Cmd, "%hhu %u %u", &m, &n, &d);
+	sscanf(Cmd, "%u %u %u", &m, &n, &d);
 	
 	// values are expected to be > 0
 	m = m > 0 ? m : 1;
 	n = n > 0 ? n : 1;
 
-	PrintAndLog("Collecting %u %hhu-byte nonces", n, m);
+	PrintAndLog("Collecting %u %"hhu"-byte nonces", n, m);
 	PrintAndLog("Start: %u", time(NULL));
 	// repeat n times
 	for (unsigned int i = 0; i < n; i++) {
 		// execute PACE
 		UsbCommand c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}};
 		SendCommand(&c);
-		UsbCommand *resp = WaitForResponse(CMD_ACK);
+		UsbCommand resp;
+    
+		WaitForResponse(CMD_ACK,&resp);
 
 		// check if command failed
-		if (resp->arg[0] != 0) {
-			PrintAndLog("Error in step %d, Return code: %d",
-			            resp->arg[0],
-						(int)resp->arg[1]);
+		if (resp.arg[0] != 0) {
+			PrintAndLog("Error in step %d, Return code: %d",resp.arg[0],(int)resp.arg[1]);
 		} else {
-			size_t nonce_length = resp->arg[1];
+			size_t nonce_length = resp.arg[1];
 			char *nonce = (char *) malloc(2 * nonce_length + 1);
 			for(int j = 0; j < nonce_length; j++) {
-				snprintf(nonce + (2 * j), 3, "%02X", resp->d.asBytes[j]);
+				sprintf(nonce + (2 * j), "%02X", resp.d.asBytes[j]);
 			}
 			// print nonce
-			PrintAndLog("Length: %d, Nonce: %s",
-			            resp->arg[1], nonce);
+			PrintAndLog("Length: %d, Nonce: %s", nonce_length, nonce);
 		}
 		if (i < n - 1) {
 			sleep(d);
@@ -87,7 +87,7 @@ int CmdHelp(const char *Cmd)
 int CmdHFEPA(const char *Cmd)
 {
 	// flush
-	while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;
+	WaitForResponseTimeout(CMD_ACK,NULL,100);
 
 	// parse
   CmdsParse(CommandTable, Cmd);