FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifde...

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 5317994fcb48fdded09d06b9fbcfcfc82b943477..2c4c594924c2903029a1c75a4b899f82edfb10de 100644 (file)
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -13,8 +13,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>

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

 #include "proxmark3.h"
 #include "data.h"
 #include "graph.h"
 #include "proxmark3.h"
 #include "data.h"
 #include "graph.h"


@@ -145,7 +144,7 @@ demodError:
 
 int CmdHF14BList(const char *Cmd)
 {
 
 int CmdHF14BList(const char *Cmd)
 {

-  uint8_t got[960];
+  uint8_t got[TRACE_BUFFER_SIZE];

   GetFromBigBuf(got,sizeof(got),0);
   WaitForResponse(CMD_ACK,NULL);
 
   GetFromBigBuf(got,sizeof(got),0);
   WaitForResponse(CMD_ACK,NULL);
 


@@ -157,9 +156,8 @@ int CmdHF14BList(const char *Cmd)
   int prev = -1;
 
   for(;;) {
   int prev = -1;
 
   for(;;) {

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

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


@@ -176,12 +174,15 @@ int CmdHF14BList(const char *Cmd)
     if(len > 100) {
       break;
     }
     if(len > 100) {
       break;
     }

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

       break;
     }
 
     uint8_t *frame = (got+i+9);
 
       break;
     }
 
     uint8_t *frame = (got+i+9);
 

+       // Break and stick with current result if buffer was not completely full
+       if (frame[0] == 0x44 && frame[1] == 0x44 && frame[2] == 0x44 && frame[3] == 0x44) break; 
+       

     char line[1000] = "";
     int j;
     for(j = 0; j < len; j++) {
     char line[1000] = "";
     int j;
     for(j = 0; j < len; j++) {


@@ -334,6 +335,11 @@ int CmdHF14BCmdRaw (const char *cmd) {
         PrintAndLog("Invalid char on input");
         return 0;
     }
         PrintAndLog("Invalid char on input");
         return 0;
     }

+    if (datalen == 0)
+    {
+      PrintAndLog("Missing data input");
+      return 0;
+    }

     if(crc)
     {
         uint8_t first, second;
     if(crc)
     {
         uint8_t first, second;


@@ -350,7 +356,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
     SendCommand(&c);
     
     if (reply) {
     SendCommand(&c);
     
     if (reply) {

-        if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+        if (WaitForResponseTimeout(CMD_ACK,&resp,10000)) {

             recv = resp.d.asBytes;
             PrintAndLog("received %i octets",resp.arg[0]);
             if(!resp.arg[0])
             recv = resp.d.asBytes;
             PrintAndLog("received %i octets",resp.arg[0]);
             if(!resp.arg[0])


@@ -379,6 +385,66 @@ int CmdHF14BCmdRaw (const char *cmd) {
     return 0;
 }
 
     return 0;
 }
 

+int CmdHF14BWrite( const char *Cmd){
+
+/*
+ * For SRIX4K  blocks 00 - 7F
+ * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
+ *
+ * For SR512  blocks 00 - 0F
+ * hf 14b raw -c -p 09 $sr512wblock $sr512wdata
+ * 
+ * Special block FF =  otp_lock_reg block.
+ * Data len 4 bytes-
+ */
+       char cmdp = param_getchar(Cmd, 0);
+       uint8_t blockno = -1;
+       uint8_t data[4] = {0x00};
+       bool isSrix4k = true;
+       char str[20];   
+
+       if (cmdp == 'h' || cmdp == 'H') {
+               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");
+               return 0;
+       }
+
+       if ( param_getchar(Cmd, 0) == '2' )
+               isSrix4k = false;
+       
+       blockno = param_get8(Cmd, 1);
+       
+       if ( isSrix4k ){
+               if ( blockno > 0x7f && blockno != 0xff ){
+                       PrintAndLog("Block number out of range");
+                       return 0;
+               }               
+       } else {
+               if ( blockno > 0x0f && blockno != 0xff ){
+                       PrintAndLog("Block number out of range");
+                       return 0;
+               }               
+       }
+       
+       if (param_gethex(Cmd, 2, data, 8)) {
+               PrintAndLog("Data must include 8 HEX symbols");
+               return 0;
+       }
+ 
+       if ( blockno == 0xff)
+               PrintAndLog("Writing to special block %02X [ %s]", blockno,  sprint_hex(data,4) );
+       else
+               PrintAndLog("Writing to block %02X [ %s]", blockno,  sprint_hex(data,4) );
+ 
+       sprintf(str, "-c -p 09 %02x %02x%02x%02x%02x", blockno, data[0], data[1], data[2], data[3]);
+       CmdHF14BCmdRaw(str);
+       return 0;
+}
+

 static command_t CommandTable[] = 
 {
   {"help",        CmdHelp,        1, "This help"},
 static command_t CommandTable[] = 
 {
   {"help",        CmdHelp,        1, "This help"},


@@ -391,6 +457,7 @@ static command_t CommandTable[] =
   {"sri512read",  CmdSri512Read,  0, "Read contents of a SRI512 tag"},
   {"srix4kread",  CmdSrix4kRead,  0, "Read contents of a SRIX4K tag"},
   {"raw",         CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
   {"sri512read",  CmdSri512Read,  0, "Read contents of a SRI512 tag"},
   {"srix4kread",  CmdSrix4kRead,  0, "Read contents of a SRIX4K tag"},
   {"raw",         CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},

+  {"write",       CmdHF14BWrite,  0, "Write data to a SRI512 | SRIX4K tag"},

   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };