ADD: `hf 14a read` - now can detect the newer magic generation 1b. In output 1A...

[proxmark3-svn] / client / cmdhfepa.c

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 68176bf664996217ead1413ae57940f99d0709e5..2f7ee7bc3fa04838b25b8d4d7079a10459efe133 100644 (file)
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -36,7 +36,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
        m = m > 0 ? m : 1;
        n = n > 0 ? n : 1;
 
        m = m > 0 ? m : 1;
        n = n > 0 ? n : 1;
 

-       PrintAndLog("Collecting %u %"hhu"-byte nonces", n, m);
+       PrintAndLog("Collecting %u %u byte nonces", n, m);

        PrintAndLog("Start: %u", time(NULL));
        // repeat n times
        for (unsigned int i = 0; i < n; i++) {
        PrintAndLog("Start: %u", time(NULL));
        // repeat n times
        for (unsigned int i = 0; i < n; i++) {


@@ -81,7 +81,7 @@ int CmdHFEPAPACEReplay(const char *Cmd)
        uint8_t *apdus[] = {msesa_apdu, gn_apdu, map_apdu, pka_apdu, ma_apdu};
 
        // usage message
        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";
 
                "Please specify 5 APDUs separated by spaces. "
                "Example:\n preplay 0022C1A4 1068000000 1086000002 1234ABCDEF 1A2B3C4D";
 


@@ -178,8 +178,7 @@ int CmdHFEPAPACEReplay(const char *Cmd)
 
 // UI-related stuff
 
 
 // UI-related stuff
 

-static const command_t CommandTable[] =
-{
+static const command_t CommandTable[] = {

   {"help",    CmdHelp,                   1, "This help"},
   {"cnonces", CmdHFEPACollectPACENonces, 0,
               "<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses"},
   {"help",    CmdHelp,                   1, "This help"},
   {"cnonces", CmdHFEPACollectPACENonces, 0,
               "<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses"},


@@ -188,18 +187,15 @@ static const command_t CommandTable[] =
   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };
 

-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {

   CmdsHelp(CommandTable);
   return 0;
 }
 
   CmdsHelp(CommandTable);
   return 0;
 }
 

-int CmdHFEPA(const char *Cmd)
-{
+int CmdHFEPA(const char *Cmd) {

        // flush
        clearCommandBuffer();
        //WaitForResponseTimeout(CMD_ACK,NULL,100);
        // flush
        clearCommandBuffer();
        //WaitForResponseTimeout(CMD_ACK,NULL,100);

-

        // parse
        CmdsParse(CommandTable, Cmd);
        return 0;
        // parse
        CmdsParse(CommandTable, Cmd);
        return 0;