X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7f0d5926362d50ed01ea04af95a1e03777fce47c..7b215d149ac4fd5709635111d86a2062fc7ac3ad:/client/cmdhfepa.c?ds=sidebyside diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c index f9f69a88..f3456afb 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 +#include +#include +#include +#include +#include "util.h" +#include "util_posix.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); @@ -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 @@ -64,7 +69,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd) sleep(d); } } - PrintAndLog("End: %u", time(NULL)); + PrintAndLog("End: %" PRIu64, msclock()/1000); return 1; } @@ -82,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";