sync with master lf files to resolve conflicts

[proxmark3-svn] / client / cmdhfepa.c

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index a89c448a737766e4c50afe3d3540ad4cac034bf2..3286ceb9cce45a2f9d9738219347044db63a303a 100644 (file)
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -16,7 +16,6 @@
 #include "common.h"
 #include "cmdmain.h"
 #include "sleep.h"
 #include "common.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);


@@ -46,7 +45,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
                SendCommand(&c);
                UsbCommand resp;
     
                SendCommand(&c);
                UsbCommand resp;
     

-    WaitForResponse(CMD_ACK,&resp);
+               WaitForResponse(CMD_ACK,&resp);

 
                // check if command failed
                if (resp.arg[0] != 0) {
 
                // check if command failed
                if (resp.arg[0] != 0) {


@@ -55,10 +54,10 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
                        size_t nonce_length = resp.arg[1];
                        char *nonce = (char *) malloc(2 * nonce_length + 1);
                        for(int j = 0; j < nonce_length; j++) {
                        size_t nonce_length = resp.arg[1];
                        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]);
+                               sprintf(nonce + (2 * j), "%02X", resp.d.asBytes[j]);

                        }
                        // print nonce
                        }
                        // print nonce

-                       PrintAndLog("Length: %d, Nonce: %s",resp.arg[1], nonce);
+                       PrintAndLog("Length: %d, Nonce: %s", nonce_length, nonce);

                }
                if (i < n - 1) {
                        sleep(d);
                }
                if (i < n - 1) {
                        sleep(d);