X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bf7ebb7b208a3b95f28a9a40f2e560a56e121794..852ecedc16ee8220c8208828c55d14a668e69c30:/client/cmdhfepa.c?ds=sidebyside

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index e9c63f20..76664bf5 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -8,15 +8,20 @@
 // Commands related to the German electronic Identification Card
 //-----------------------------------------------------------------------------
 
-#include "util.h"
+#include "cmdhfepa.h"
 
-#include "proxmark3.h"
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include "util.h"
+#include "util_posix.h"
+#include "comms.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);
 
@@ -36,8 +41,8 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
 	m = m > 0 ? m : 1;
 	n = n > 0 ? n : 1;
 
-	PrintAndLog("Collecting %u %"hhu"-byte nonces", n, m);
-	PrintAndLog("Start: %u", time(NULL));
+	PrintAndLog("Collecting %u %u-byte nonces", n, m);
+	PrintAndLog("Start: %" PRIu64 , msclock()/1000);
 	// repeat n times
 	for (unsigned int i = 0; i < n; i++) {
 		// execute PACE
@@ -58,12 +63,13 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
 			}
 			// print nonce
 			PrintAndLog("Length: %d, Nonce: %s", nonce_length, nonce);
+			free(nonce);
 		}
 		if (i < n - 1) {
 			sleep(d);
 		}
 	}
-	PrintAndLog("End: %u", time(NULL));
+	PrintAndLog("End: %" PRIu64, msclock()/1000);
 
 	return 1;
 }
@@ -81,7 +87,7 @@ int CmdHFEPAPACEReplay(const char *Cmd)
 	uint8_t *apdus[] = {msesa_apdu, gn_apdu, map_apdu, pka_apdu, ma_apdu};
 
 	// usage message
-	static const char const *usage_msg =
+	static const char *usage_msg =
 		"Please specify 5 APDUs separated by spaces. "
 		"Example:\n preplay 0022C1A4 1068000000 1086000002 1234ABCDEF 1A2B3C4D";
 
@@ -196,10 +202,7 @@ int CmdHelp(const char *Cmd)
 
 int CmdHFEPA(const char *Cmd)
 {
-	// flush
-	WaitForResponseTimeout(CMD_ACK,NULL,100);
-
-	// parse
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+	(void)WaitForResponseTimeout(CMD_ACK,NULL,100);
+	CmdsParse(CommandTable, Cmd);
+	return 0;
 }