X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3fe4ff4f0329d6bde9585b77966d42dfc3f612f5..e770c6482407fb67c37973cc3e95409cd5c6d952:/client/cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 7e4cbd00..cf865875 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -23,7 +23,6 @@
 #include "cmdhf14b.h"
 #include "cmdmain.h"
 
-
 static int CmdHelp(const char *Cmd);
 
 int CmdHF14BDemod(const char *Cmd)
@@ -146,11 +145,25 @@ demodError:
 
 int CmdHF14BList(const char *Cmd)
 {
-  uint8_t got[960];
-  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("---------+----+----+-----------");
 
@@ -158,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));
@@ -177,7 +189,7 @@ int CmdHF14BList(const char *Cmd)
     if(len > 100) {
       break;
     }
-    if(i + len >= 900) {
+    if(i + len >= traceLen) {
       break;
     }
 
@@ -220,6 +232,7 @@ int CmdHF14BList(const char *Cmd)
     prev = timestamp;
     i += (len + 9);
   }
+  free(got);
   return 0;
 }
 
@@ -282,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;
     
@@ -336,7 +349,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
             continue;
         }
         PrintAndLog("Invalid char on input");
-        return 0;
+        return 1;
     }
     if (datalen == 0)
     {
@@ -406,20 +419,27 @@ int CmdHF14BWrite( const char *Cmd){
 	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("");
-		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;
 	}
 
-	if ( param_getchar(Cmd, 0) == '2' )
+	if ( cmdp == '2' )
 		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 ){
@@ -439,11 +459,12 @@ int CmdHF14BWrite( const char *Cmd){
 	}
  
 	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
-		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;
 }