Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index e3d0fc230423905891593df9bdca291584eadde2..cf8658750c8eb48b76705726feecf202156081f7 100644 (file)
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -145,11 +145,25 @@ demodError:
 
 int CmdHF14BList(const char *Cmd)
 {
 
 int CmdHF14BList(const char *Cmd)
 {

-  uint8_t got[TRACE_BUFFER_SIZE];
-  GetFromBigBuf(got,sizeof(got),0);
-  WaitForResponse(CMD_ACK,NULL);
-
-  PrintAndLog("recorded activity:");
+       uint8_t *got = malloc(USB_CMD_DATA_SIZE);
+
+       // Query for the actual size of the trace
+       UsbCommand response;
+       GetFromBigBuf(got, USB_CMD_DATA_SIZE, 0);
+       WaitForResponse(CMD_ACK, &response);
+       uint16_t traceLen = response.arg[2];
+       if (traceLen > USB_CMD_DATA_SIZE) {
+               uint8_t *p = realloc(got, traceLen);
+               if (p == NULL) {
+                       PrintAndLog("Cannot allocate memory for trace");
+                       free(got);
+                       return 2;
+               }
+               got = p;
+               GetFromBigBuf(got, traceLen, 0);
+               WaitForResponse(CMD_ACK,NULL);
+       }
+  PrintAndLog("recorded activity: (TraceLen = %d bytes)", traceLen);

   PrintAndLog(" time  :rssi: who bytes");
   PrintAndLog("---------+----+----+-----------");
 
   PrintAndLog(" time  :rssi: who bytes");
   PrintAndLog("---------+----+----+-----------");
 


@@ -158,7 +172,7 @@ int CmdHF14BList(const char *Cmd)
 
   for(;;) {
     
 
   for(;;) {
     

-       if(i >= TRACE_BUFFER_SIZE) { break; }
+       if(i >= traceLen) { break; }

 
     bool isResponse;
     int timestamp = *((uint32_t *)(got+i));
 
     bool isResponse;
     int timestamp = *((uint32_t *)(got+i));


@@ -175,7 +189,7 @@ int CmdHF14BList(const char *Cmd)
     if(len > 100) {
       break;
     }
     if(len > 100) {
       break;
     }

-    if(i + len >= TRACE_BUFFER_SIZE) {
+    if(i + len >= traceLen) {

       break;
     }
 
       break;
     }
 


@@ -218,6 +232,7 @@ int CmdHF14BList(const char *Cmd)
     prev = timestamp;
     i += (len + 9);
   }
     prev = timestamp;
     i += (len + 9);
   }

+  free(got);

   return 0;
 }
 
   return 0;
 }
 


@@ -280,7 +295,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
     uint8_t power=0;
     char buf[5]="";
     int i=0;
     uint8_t power=0;
     char buf[5]="";
     int i=0;

-    uint8_t data[100];
+    uint8_t data[100] = {0x00};

     unsigned int datalen=0, temp;
     char *hexout;
     
     unsigned int datalen=0, temp;
     char *hexout;
     


@@ -334,7 +349,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
             continue;
         }
         PrintAndLog("Invalid char on input");
             continue;
         }
         PrintAndLog("Invalid char on input");

-        return 0;
+        return 1;

     }
     if (datalen == 0)
     {
     }
     if (datalen == 0)
     {


@@ -448,7 +463,7 @@ int CmdHF14BWrite( const char *Cmd){
        else
                PrintAndLog("[%s] Write block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512", blockno,  sprint_hex(data,4) );
  
        else
                PrintAndLog("[%s] Write block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512", blockno,  sprint_hex(data,4) );
  

-       sprintf(str, "-c -p 09 %02x %02x%02x%02x%02x", blockno, data[0], data[1], data[2], data[3]);
+       sprintf(str, "-c 09 %02x %02x%02x%02x%02x", blockno, data[0], data[1], data[2], data[3]);

 
        CmdHF14BCmdRaw(str);
        return 0;
 
        CmdHF14BCmdRaw(str);
        return 0;