extracted download and signature verification functionality to a function in tools...

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 3388d75fbc64bf4caee8508426b8e5daf578e1b1..ff58e0a4b11649d1e6cbe353adc105390d775891 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -26,6 +26,7 @@
 unsigned int current_command = CMD_UNKNOWN;
 unsigned int received_command = CMD_UNKNOWN;
 UsbCommand current_response;
 unsigned int current_command = CMD_UNKNOWN;
 unsigned int received_command = CMD_UNKNOWN;
 UsbCommand current_response;

+UsbCommand current_response_user;

 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);
 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);


@@ -55,12 +56,16 @@ int CmdQuit(const char *Cmd)
 }
 
 UsbCommand * WaitForResponseTimeout(uint32_t response_type, uint32_t ms_timeout) {
 }
 
 UsbCommand * WaitForResponseTimeout(uint32_t response_type, uint32_t ms_timeout) {

-       UsbCommand * ret = &current_response;
+       UsbCommand * ret =  NULL;

        int i=0;
 
        for(i=0; received_command != response_type && i < ms_timeout / 10; i++) {
                msleep(10); // XXX ugh
        }
        int i=0;
 
        for(i=0; received_command != response_type && i < ms_timeout / 10; i++) {
                msleep(10); // XXX ugh
        }

+       
+       // There was an evil BUG
+       memcpy(&current_response_user, &current_response, sizeof(UsbCommand));
+       ret = &current_response_user;

 
        if(received_command != response_type)
                ret = NULL;
 
        if(received_command != response_type)
                ret = NULL;


@@ -100,12 +105,12 @@ void UsbCommandReceived(UsbCommand *UC)
       }
       memcpy(s, UC->d.asBytes, UC->arg[0]);
       s[UC->arg[0]] = '\0';
       }
       memcpy(s, UC->d.asBytes, UC->arg[0]);
       s[UC->arg[0]] = '\0';

-      PrintAndLog("#db# %s", s);
+      PrintAndLog("#db# %s       ", s);

       return;
     }
 
     case CMD_DEBUG_PRINT_INTEGERS:
       return;
     }
 
     case CMD_DEBUG_PRINT_INTEGERS:

-      PrintAndLog("#db# %08x, %08x, %08x\r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
+      PrintAndLog("#db# %08x, %08x, %08x       \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);

       return;
 
     case CMD_MEASURED_ANTENNA_TUNING: {
       return;
 
     case CMD_MEASURED_ANTENNA_TUNING: {


@@ -153,7 +158,7 @@ void UsbCommandReceived(UsbCommand *UC)
     unexpected_response:
 
        if(UC->cmd != CMD_ACK)
     unexpected_response:
 
        if(UC->cmd != CMD_ACK)

-               PrintAndLog("unrecognized command %08x\n", UC->cmd);
+               PrintAndLog("unrecognized command %08x       \n", UC->cmd);

        else
                memcpy(&current_response, UC, sizeof(UsbCommand));
        received_command = UC->cmd;
        else
                memcpy(&current_response, UC, sizeof(UsbCommand));
        received_command = UC->cmd;