minor fix when reading blocks

[proxmark3-svn] / client / cmdhfepa.c

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 5fcd17141578f2a928f31ebe65884424bbc0bbf1..41f801e705aa83c1b1242bfe31f65549e518a853 100644 (file)
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -10,10 +10,12 @@
 
 #include "util.h"
 #include "proxusb.h"
 
 #include "util.h"
 #include "proxusb.h"

+#include "proxmark3.h"

 #include "ui.h"
 #include "cmdparser.h"
 #include "common.h"
 #include "cmdmain.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "common.h"
 #include "cmdmain.h"

+#include "sleep.h"

 
 #include "cmdhfepa.h"
 
 
 #include "cmdhfepa.h"
 


@@ -26,8 +28,10 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
        uint8_t m = 0;
        // requested number of Nonces
        unsigned int n = 0;
        uint8_t m = 0;
        // requested number of Nonces
        unsigned int n = 0;

+       // delay between requests
+       unsigned int d = 0;

        
        

-       sscanf(Cmd, "%hhu %u", &m, &n);
+       sscanf(Cmd, "%hhu %u %u", &m, &n, &d);

        
        // values are expected to be > 0
        m = m > 0 ? m : 1;
        
        // values are expected to be > 0
        m = m > 0 ? m : 1;


@@ -40,22 +44,24 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
                // execute PACE
                UsbCommand c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}};
                SendCommand(&c);
                // 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
 
                // 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 {
                } 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++) {
                        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]);
+                               snprintf(nonce + (2 * j), 3, "%02X", resp.d.asBytes[j]);

                        }
                        // print nonce
                        }
                        // print nonce

-                       PrintAndLog("Length: %d, Nonce: %s",
-                                   resp->arg[1], nonce);
+                       PrintAndLog("Length: %d, Nonce: %s",resp.arg[1], nonce);
+               }
+               if (i < n - 1) {
+                       sleep(d);

                }
        }
        PrintAndLog("End: %u", time(NULL));
                }
        }
        PrintAndLog("End: %u", time(NULL));


@@ -68,7 +74,8 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
 static const command_t CommandTable[] = 
 {
   {"help",    CmdHelp,                   1, "This help"},
 static const command_t CommandTable[] = 
 {
   {"help",    CmdHelp,                   1, "This help"},

-  {"cnonces", CmdHFEPACollectPACENonces, 0, "<m> <n> Acquire n>0 encrypted PACE nonces of size m>0"},
+  {"cnonces", CmdHFEPACollectPACENonces, 0,
+              "<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses"},

   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };
 


@@ -81,7 +88,7 @@ int CmdHelp(const char *Cmd)
 int CmdHFEPA(const char *Cmd)
 {
        // flush
 int CmdHFEPA(const char *Cmd)
 {
        // flush

-       while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;
+       WaitForResponseTimeout(CMD_ACK,NULL,100);

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