X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cda2a4c0a5e9b9e2a373aeb822111237ff9ec710..385f398740895f512abc90ea5a00a9be82bf115b:/client/cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 83d6633c..cf865875 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -14,10 +14,10 @@
 #include <string.h>
 #include <stdint.h>
 #include "iso14443crc.h"
-//#include "proxusb.h"
 #include "proxmark3.h"
 #include "data.h"
 #include "graph.h"
+#include "util.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "cmdhf14b.h"
@@ -145,10 +145,25 @@ demodError:
 
 int CmdHF14BList(const char *Cmd)
 {
-  uint8_t got[960];
-  GetFromBigBuf(got,sizeof(got),0);
-
-  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("---------+----+----+-----------");
 
@@ -156,9 +171,8 @@ int CmdHF14BList(const char *Cmd)
   int prev = -1;
 
   for(;;) {
-    if(i >= 900) {
-      break;
-    }
+    
+	if(i >= traceLen) { break; }
 
     bool isResponse;
     int timestamp = *((uint32_t *)(got+i));
@@ -175,12 +189,15 @@ int CmdHF14BList(const char *Cmd)
     if(len > 100) {
       break;
     }
-    if(i + len >= 900) {
+    if(i + len >= traceLen) {
       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++) {
@@ -215,6 +232,7 @@ int CmdHF14BList(const char *Cmd)
     prev = timestamp;
     i += (len + 9);
   }
+  free(got);
   return 0;
 }
 
@@ -277,7 +295,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
     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;
     
@@ -331,7 +349,12 @@ int CmdHF14BCmdRaw (const char *cmd) {
             continue;
         }
         PrintAndLog("Invalid char on input");
-        return 0;
+        return 1;
+    }
+    if (datalen == 0)
+    {
+      PrintAndLog("Missing data input");
+      return 0;
     }
     if(crc)
     {
@@ -358,7 +381,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
             if (hexout != NULL) {
                 uint8_t first, second;
                 for (int i = 0; i < resp.arg[0]; i++) { // data in hex
-                    sprintf(&hexout[i * 3], "%02hX ", recv[i]);
+                    sprintf(&hexout[i * 3], "%02X ", recv[i]);
                 }
                 PrintAndLog("%s", hexout);
                 free(hexout);
@@ -378,6 +401,74 @@ int CmdHF14BCmdRaw (const char *cmd) {
     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 (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
+		PrintAndLog("Usage:  hf 14b write <1|2> <BLOCK> <DATA>");
+		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;
+	}
+
+	if ( cmdp == '2' )
+		isSrix4k = false;
+	
+	//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 ){
+			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("[%s] Write special 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 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"},
@@ -390,6 +481,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"},
+  {"write",       CmdHF14BWrite,  0, "Write data to a SRI512 | SRIX4K tag"},
   {NULL, NULL, 0, NULL}
 };