Fix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 713959f29745c3cc1548f7a31d8b36c5a07af1e2..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)
     {


@@ -404,20 +419,27 @@ int CmdHF14BWrite( const char *Cmd){
        bool isSrix4k = true;
        char str[20];   
 
        bool isSrix4k = true;
        char str[20];   
 

-       if (cmdp == 'h' || cmdp == 'H') {
+       if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {

                PrintAndLog("Usage:  hf 14b write <1|2> <BLOCK> <DATA>");
                PrintAndLog("Usage:  hf 14b write <1|2> <BLOCK> <DATA>");

-               PrintAndLog("");
-               PrintAndLog("     sample: hf 14b write 1 127 11223344");
-               PrintAndLog("     sample: hf 14b write 1 255 11223344");
-               PrintAndLog("     sample: hf 14b write 2 15 11223344");
-               PrintAndLog("     sample: hf 14b write 2 255 11223344");
+               PrintAndLog("    [1 = SRIX4K]");
+               PrintAndLog("    [2 = SRI512]");
+               PrintAndLog("    [BLOCK number depends on tag, special block == FF]");
+               PrintAndLog("     sample: hf 14b write 1 7F 11223344");
+               PrintAndLog("           : hf 14b write 1 FF 11223344");
+               PrintAndLog("           : hf 14b write 2 15 11223344");
+               PrintAndLog("           : hf 14b write 2 FF 11223344");

                return 0;
        }
 
                return 0;
        }
 

-       if ( param_getchar(Cmd, 0) == '2' )
+       if ( cmdp == '2' )

                isSrix4k = false;
        
                isSrix4k = false;
        

-       blockno = param_get8(Cmd, 1);
+       //blockno = param_get8(Cmd, 1);
+       
+       if ( param_gethex(Cmd,1, &blockno, 2) ) {
+               PrintAndLog("Block number must include 2 HEX symbols");
+               return 0;
+       }

        
        if ( isSrix4k ){
                if ( blockno > 0x7f && blockno != 0xff ){
        
        if ( isSrix4k ){
                if ( blockno > 0x7f && blockno != 0xff ){


@@ -437,11 +459,12 @@ int CmdHF14BWrite( const char *Cmd){
        }
  
        if ( blockno == 0xff)
        }
  
        if ( blockno == 0xff)

-               PrintAndLog("Writing to special block %02X [ %s]", blockno,  sprint_hex(data,4) );
+               PrintAndLog("[%s] Write special block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512" , blockno,  sprint_hex(data,4) );

        else
        else

-               PrintAndLog("Writing to block %02X [ %s]", blockno,  sprint_hex(data,4) );
+               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;
 }