X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b915fda392487a876ccc7b0c8b79a1b31ca5e398..13024283676d477113b2a9d5a5ccf71c50bc7bbe:/client/cmdlfhitag.c

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 549c427c..fe5ba587 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -29,110 +29,125 @@ size_t nbytes(size_t nbits) {
 
 int CmdLFHitagList(const char *Cmd)
 {
-  uint8_t got[TRACE_BUFFER_SIZE];
-  GetFromBigBuf(got,sizeof(got),0);
-  WaitForResponse(CMD_ACK,NULL);
-
-  PrintAndLog("recorded activity:");
-  PrintAndLog(" ETU     :nbits: who bytes");
-  PrintAndLog("---------+-----+----+-----------");
+ 	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):");
+	PrintAndLog(" ETU     :nbits: who bytes");
+	PrintAndLog("---------+-----+----+-----------");
 
-  int i = 0;
-  int prev = -1;
-  int len = strlen(Cmd);
+	int i = 0;
+	int prev = -1;
+	int len = strlen(Cmd);
 
-  char filename[FILE_PATH_SIZE]  = { 0x00 };
-  FILE* pf = NULL;
+	char filename[FILE_PATH_SIZE]  = { 0x00 };
+	FILE* pf = NULL;
   	
-  if (len > FILE_PATH_SIZE) 
-     len = FILE_PATH_SIZE;
-  memcpy(filename, Cmd, len);
+	if (len > FILE_PATH_SIZE) 
+		len = FILE_PATH_SIZE;
+	memcpy(filename, Cmd, len);
    
-  if (strlen(filename) > 0) {
-	if ((pf = fopen(filename,"wb")) == NULL) {
-		PrintAndLog("Error: Could not open file [%s]",filename);
-		return 1;
+	if (strlen(filename) > 0) {
+		if ((pf = fopen(filename,"wb")) == NULL) {
+			PrintAndLog("Error: Could not open file [%s]",filename);
+			return 1;
+		}
 	}
-  }
 
-  for (;;) {
+	for (;;) {
   
-    if(i >= TRACE_BUFFER_SIZE) { break; }
-
-    bool isResponse;
-    int timestamp = *((uint32_t *)(got+i));
-    if (timestamp & 0x80000000) {
-      timestamp &= 0x7fffffff;
-      isResponse = 1;
-    } else {
-      isResponse = 0;
-    }
-
-    int parityBits = *((uint32_t *)(got+i+4));
-    // 4 bytes of additional information...
-    // maximum of 32 additional parity bit information
-    //
-    // TODO:
-    // at each quarter bit period we can send power level (16 levels)
-    // or each half bit period in 256 levels.
-
-    int bits = got[i+8];
-    int len = nbytes(got[i+8]);
-
-    if (len > 100) {
-      break;
-    }
-    if (i + len >= TRACE_BUFFER_SIZE) { 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[3] == 0x44) { break; }
-
-    char line[1000] = "";
-    int j;
-    for (j = 0; j < len; j++) {
-      int oddparity = 0x01;
-      int k;
+		if(i > traceLen) { break; }
+
+		bool isResponse;
+		int timestamp = *((uint32_t *)(got+i));
+		if (timestamp & 0x80000000) {
+			timestamp &= 0x7fffffff;
+			isResponse = 1;
+		} else {
+			isResponse = 0;
+		}
 
-      for (k=0;k<8;k++) {
-        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
-      }
+		int parityBits = *((uint32_t *)(got+i+4));
+		// 4 bytes of additional information...
+		// maximum of 32 additional parity bit information
+		//
+		// TODO:
+		// at each quarter bit period we can send power level (16 levels)
+		// or each half bit period in 256 levels.
 
-      //if((parityBits >> (len - j - 1)) & 0x01) {
-      if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {
-        sprintf(line+(j*4), "%02x!  ", frame[j]);
-      }
-      else {
-        sprintf(line+(j*4), "%02x   ", frame[j]);
-      }
-    }
-
-    PrintAndLog(" +%7d:  %3d: %s %s",
-      (prev < 0 ? 0 : (timestamp - prev)),
-      bits,
-      (isResponse ? "TAG" : "   "),
-      line);
+		int bits = got[i+8];
+		int len = nbytes(got[i+8]);
 
+		if (len > 100) {
+		  break;
+		}
+		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[3] == 0x44) { break; }
+
+		char line[1000] = "";
+		int j;
+		for (j = 0; j < len; j++) {
+		  int oddparity = 0x01;
+		  int k;
+
+		  for (k=0;k<8;k++) {
+			oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
+		  }
+
+		  //if((parityBits >> (len - j - 1)) & 0x01) {
+		  if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {
+			sprintf(line+(j*4), "%02x!  ", frame[j]);
+		  }
+		  else {
+			sprintf(line+(j*4), "%02x   ", frame[j]);
+		  }
+		}
 
-   if (pf) {
-      fprintf(pf," +%7d:  %3d: %s %s\n",
-					(prev < 0 ? 0 : (timestamp - prev)),
-					bits,
-					(isResponse ? "TAG" : "   "),
-					line);
-    }
-	
-    prev = timestamp;
-    i += (len + 9);
-  }
+		PrintAndLog(" +%7d:  %3d: %s %s",
+			(prev < 0 ? 0 : (timestamp - prev)),
+			bits,
+			(isResponse ? "TAG" : "   "),
+			line);
+
+		if (pf) {
+			fprintf(pf," +%7d:  %3d: %s %s\n",
+				(prev < 0 ? 0 : (timestamp - prev)),
+				bits,
+				(isResponse ? "TAG" : "   "),
+				line);
+		}
+		
+		prev = timestamp;
+		i += (len + 9);
+	}
   
-  if (pf) {
-    fclose(pf);
-	PrintAndLog("Recorded activity succesfully written to file: %s", filename);
-  }
+	if (pf) {
+		fclose(pf);
+		PrintAndLog("Recorded activity succesfully written to file: %s", filename);
+	}
 
-  return 0;
+	free(got);
+	return 0;
 }
 
 int CmdLFHitagSnoop(const char *Cmd) {