First check in.

[proxmark3-svn] / client / cmdhfepa.c

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index e285f02ccc915a6d4ca41744e68b3e0ab9c0e8ef..92e61c68805fd14240ebbd3453f0bd7263f7a5c8 100644 (file)
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -9,13 +9,13 @@
 //-----------------------------------------------------------------------------
 
 #include "util.h"
 //-----------------------------------------------------------------------------
 
 #include "util.h"

-#include "proxusb.h"
+//#include "proxusb.h"
+#include "proxmark3.h"

 #include "ui.h"
 #include "cmdparser.h"
 #include "ui.h"
 #include "cmdparser.h"

-#include "common.h"
+#include "../include/common.h"

 #include "cmdmain.h"
 #include "sleep.h"
 #include "cmdmain.h"
 #include "sleep.h"

-

 #include "cmdhfepa.h"
 
 static int CmdHelp(const char *Cmd);
 #include "cmdhfepa.h"
 
 static int CmdHelp(const char *Cmd);


@@ -24,41 +24,40 @@ static int CmdHelp(const char *Cmd);
 int CmdHFEPACollectPACENonces(const char *Cmd)
 {
        // requested nonce size
 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;
        
        // 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;
 
        
        // 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);
        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
 
                // 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);
                }
                if (i < n - 1) {
                        sleep(d);


@@ -88,9 +87,9 @@ 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);
   return 0;
 
        // parse
   CmdsParse(CommandTable, Cmd);
   return 0;

-}
+}
\ No newline at end of file