X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/660d641a03456e99ea83c68dbd3d03bae2b64573..8b89fcae134bd1a106738a99481e9a5dea47e2c4:/client/cmdlfhitag.c

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index c648f6a5..a5c3b8eb 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -12,167 +12,203 @@
 #include <stdlib.h>
 #include <string.h>
 #include "data.h"
-//#include "proxusb.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
 #include "hitag2.h"
+#include "hitagS.h"
 #include "sleep.h"
 #include "cmdmain.h"
 
 static int CmdHelp(const char *Cmd);
 
-int CmdLFHitagList(const char *Cmd)
-{
-  uint8_t got[3000];
-  GetFromBigBuf(got,sizeof(got),0);
-  WaitForResponse(CMD_ACK,NULL);
+size_t nbytes(size_t nbits) {
+	return (nbits/8)+((nbits%8)>0);
+}
 
-  PrintAndLog("recorded activity:");
-  PrintAndLog(" ETU     :rssi: who bytes");
-  PrintAndLog("---------+----+----+-----------");
+int CmdLFHitagList(const char *Cmd) {
+ 	uint8_t *got = malloc(USB_CMD_DATA_SIZE);
 
-  int i = 0;
-  int prev = -1;
+	// 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);
 
-  char filename[256];
-  FILE* pf = NULL;
+	char filename[FILE_PATH_SIZE]  = { 0x00 };
+	FILE* f = NULL;
+  	
+	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+	memcpy(filename, Cmd, len);
+   
+	if (strlen(filename) > 0) {
+		f = fopen(filename,"wb");
+		if (!f) {
+			PrintAndLog("Error: Could not open file [%s]",filename);
+			return 1;
+		}
+	}
+
+	for (;;) {
   
-  for (;;) {
-    if(i >= 1900) {
-      break;
-    }
-
-    bool isResponse;
-    int timestamp = *((uint32_t *)(got+i));
-    if (timestamp & 0x80000000) {
-      timestamp &= 0x7fffffff;
-      isResponse = 1;
-    } else {
-      isResponse = 0;
-    }
-
-    int metric = 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 len = got[i+8];
-
-    if (len > 100) {
-      break;
-    }
-    if (i + len >= 1900) {
-      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]);
-      }
-    }
-
-    char metricString[100];
-    if (isResponse) {
-      sprintf(metricString, "%3d", metric);
-    } else {
-      strcpy(metricString, "   ");
-    }
-
-    PrintAndLog(" +%7d: %s: %s %s",
-      (prev < 0 ? 0 : (timestamp - prev)),
-      metricString,
-      (isResponse ? "TAG" : "   "),
-      line);
-
-
-   if (pf) {
-      fprintf(pf," +%7d: %s: %s %s %s",
-					(prev < 0 ? 0 : (timestamp - prev)),
-					metricString,
-					(isResponse ? "TAG" : "   "),
-					line,
-					"\n");
-    }
-	
-    prev = timestamp;
-    i += (len + 9);
-  }
+		if(i >= traceLen) { 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 > 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]);
+		  }
+		}
+
+		PrintAndLog(" +%7d:  %3d: %s %s",
+			(prev < 0 ? 0 : (timestamp - prev)),
+			bits,
+			(isResponse ? "TAG" : "   "),
+			line);
+
+		if (f) {
+			fprintf(f," +%7d:  %3d: %s %s\n",
+				(prev < 0 ? 0 : (timestamp - prev)),
+				bits,
+				(isResponse ? "TAG" : "   "),
+				line);
+		}
+		
+		prev = timestamp;
+		i += (len + 9);
+	}
   
-  if (pf) {
-	  PrintAndLog("Recorded activity succesfully written to file: %s", filename);
-    fclose(pf);
-  }
-	
-  return 0;
+	if (f) {
+		fclose(f);
+		PrintAndLog("Recorded activity succesfully written to file: %s", filename);
+	}
+
+	free(got);
+	return 0;
 }
 
 int CmdLFHitagSnoop(const char *Cmd) {
-  UsbCommand c = {CMD_SNOOP_HITAG};
-  SendCommand(&c);
-  return 0;
+	UsbCommand c = {CMD_SNOOP_HITAG};
+	clearCommandBuffer();
+	SendCommand(&c);
+	return 0;
 }
 
 int CmdLFHitagSim(const char *Cmd) {
-  UsbCommand c = {CMD_SIMULATE_HITAG};
-	char filename[256] = { 0x00 };
-	FILE* pf;
+    
+	UsbCommand c = {CMD_SIMULATE_HITAG};
+	char filename[FILE_PATH_SIZE] = { 0x00 };
+	FILE* f;
 	bool tag_mem_supplied;
-
-	param_getstr(Cmd,0,filename);
 	
+	int len = strlen(Cmd);
+	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+	memcpy(filename, Cmd, len);
+
 	if (strlen(filename) > 0) {
-		if ((pf = fopen(filename,"rb+")) == NULL) {
+		f = fopen(filename,"rb+");
+		if (!f) {
 			PrintAndLog("Error: Could not open file [%s]",filename);
 			return 1;
 		}
 		tag_mem_supplied = true;
-		fread(c.d.asBytes,48,1,pf);
-		fclose(pf);
+		size_t bytes_read = fread(c.d.asBytes, 48, 1, f);
+		if ( bytes_read == 0) {
+			PrintAndLog("Error: File reading error");
+			fclose(f);
+			return 1;
+		}
+		fclose(f);
 	} else {
 		tag_mem_supplied = false;
 	}
-	
+
 	// Does the tag comes with memory
 	c.arg[0] = (uint32_t)tag_mem_supplied;
-
-  SendCommand(&c);
-  return 0;
+	clearCommandBuffer();
+	SendCommand(&c);
+	return 0;
 }
 
 int CmdLFHitagReader(const char *Cmd) {
-//  UsbCommand c = {CMD_READER_HITAG};
 	
-//	param_get32ex(Cmd,1,0,16);
 	UsbCommand c = {CMD_READER_HITAG};//, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}};
 	hitag_data* htd = (hitag_data*)c.d.asBytes;
 	hitag_function htf = param_get32ex(Cmd,0,0,10);
 	
 	switch (htf) {
+		case 01: { //RHTSF_CHALLENGE
+			c = (UsbCommand){ CMD_READ_HITAG_S };
+			num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->auth.NrAr);
+			num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4);
+		} break;
+		case 02: { //RHTSF_KEY
+			c = (UsbCommand){ CMD_READ_HITAG_S };
+			num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
+		} break;
 		case RHT2F_PASSWORD: {
 			num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->pwd.password);
 		} break;
@@ -182,7 +218,6 @@ int CmdLFHitagReader(const char *Cmd) {
 		} break;
 		case RHT2F_CRYPTO: {
 			num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
-//			num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4);
 		} break;
 		case RHT2F_TEST_AUTH_ATTEMPTS: {
 			// No additional parameters needed
@@ -191,6 +226,8 @@ int CmdLFHitagReader(const char *Cmd) {
 			PrintAndLog("Error: unkown reader function %d",htf);
 			PrintAndLog("Hitag reader functions");
 			PrintAndLog(" HitagS (0*)");
+			PrintAndLog("  01 <nr> <ar> (Challenge) read all pages from a Hitag S tag");
+			PrintAndLog("  02 <key> (set to 0 if no authentication is needed) read all pages from a Hitag S tag");
 			PrintAndLog(" Hitag1 (1*)");
 			PrintAndLog(" Hitag2 (2*)");
 			PrintAndLog("  21 <password> (password mode)");
@@ -203,53 +240,161 @@ int CmdLFHitagReader(const char *Cmd) {
 
 	// Copy the hitag2 function into the first argument
 	c.arg[0] = htf;
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;
+	WaitForResponse(CMD_ACK,&resp);
 
-  // Send the command to the proxmark
-  SendCommand(&c);
-  
-  UsbCommand resp;
-  WaitForResponse(CMD_ACK,&resp);
-  
-  // Check the return status, stored in the first argument
-  if (resp.arg[0] == false) return 1;
-    
-  uint32_t id = bytes_to_num(resp.d.asBytes,4);
-  char filename[256];
-  FILE* pf = NULL;
-
-  sprintf(filename,"%08x_%04x.ht2",id,(rand() & 0xffff));
-  if ((pf = fopen(filename,"wb")) == NULL) {
-    PrintAndLog("Error: Could not open file [%s]",filename);
-    return 1;
-  }
-  
-  // Write the 48 tag memory bytes to file and finalize
-  fwrite(resp.d.asBytes,1,48,pf);
-  fclose(pf);
+	// Check the return status, stored in the first argument
+	if (resp.arg[0] == false) return 1;
 
-  PrintAndLog("Succesfully saved tag memory to [%s]",filename);
-  
-  return 0;
+	uint32_t id = bytes_to_num(resp.d.asBytes,4);
+
+	char filename[FILE_PATH_SIZE];
+	FILE* f = NULL;
+	sprintf(filename,"%08x_%04x.ht2",id,(rand() & 0xffff));
+	f = fopen(filename,"wb");
+	if (!f) {
+		PrintAndLog("Error: Could not open file [%s]",filename);
+		return 1;
+	}
+
+	// Write the 48 tag memory bytes to file and finalize
+	fwrite(resp.d.asBytes, 1, 48, f);
+	fclose(f);
+	PrintAndLog("Succesfully saved tag memory to [%s]",filename);
+	return 0;
 }
 
-static command_t CommandTableHitag[] = 
+int CmdLFHitagSimS(const char *Cmd) {
+	UsbCommand c = { CMD_SIMULATE_HITAG_S };
+	char filename[FILE_PATH_SIZE] = { 0x00 };
+	FILE* f;
+	bool tag_mem_supplied;
+	int len = strlen(Cmd);
+	if (len > FILE_PATH_SIZE)
+		len = FILE_PATH_SIZE;
+	memcpy(filename, Cmd, len);
+
+	if (strlen(filename) > 0) {
+		f = fopen(filename, "rb+");
+		if (!f) {
+			PrintAndLog("Error: Could not open file [%s]", filename);
+			return 1;
+		}
+		tag_mem_supplied = true;
+		size_t bytes_read = fread(c.d.asBytes, 4*64, 1, f);
+		if ( bytes_read == 0) {
+			PrintAndLog("Error: File reading error");
+			fclose(f);
+			return 1;
+		}
+		fclose(f);
+	} else {
+		tag_mem_supplied = false;
+	}
+
+	// Does the tag comes with memory
+	c.arg[0] = (uint32_t) tag_mem_supplied;
+	clearCommandBuffer();
+	SendCommand(&c);
+	return 0;
+}
+
+int CmdLFHitagCheckChallenges(const char *Cmd) {
+	UsbCommand c = { CMD_TEST_HITAGS_TRACES };
+	char filename[FILE_PATH_SIZE] = { 0x00 };
+	FILE* f;
+	bool file_given;
+	int len = strlen(Cmd);
+	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+	memcpy(filename, Cmd, len);
+	
+	if (strlen(filename) > 0) {
+		f = fopen(filename,"rb+");
+		if( !f ) {
+			PrintAndLog("Error: Could not open file [%s]", filename);
+			return 1;
+		}
+		file_given = true;
+		size_t bytes_read = fread(c.d.asBytes, 8*60, 1, f);
+		if ( bytes_read == 0) {
+			PrintAndLog("Error: File reading error");
+			fclose(f);
+			return 1;
+        }
+		fclose(f);
+	} else {
+		file_given = false;
+	}
+	
+	//file with all the challenges to try
+	c.arg[0] = (uint32_t)file_given;
+	clearCommandBuffer();
+	SendCommand(&c);
+	return 0;
+}
+
+int CmdLFHitagWP(const char *Cmd) {
+	UsbCommand c = { CMD_WR_HITAG_S };
+	hitag_data* htd = (hitag_data*)c.d.asBytes;
+	hitag_function htf = param_get32ex(Cmd,0,0,10);
+	switch (htf) {
+		case 03: { //WHTSF_CHALLENGE
+			num_to_bytes(param_get64ex(Cmd,1,0,16),8,htd->auth.NrAr);
+			c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
+			num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->auth.data);
+		} break;
+		case 04: { //WHTSF_KEY
+			num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
+			c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
+			num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->crypto.data);
+
+		} break;
+		default: {
+			PrintAndLog("Error: unkown writer function %d",htf);
+			PrintAndLog("Hitag writer functions");
+			PrintAndLog(" HitagS (0*)");
+			PrintAndLog("  03 <nr,ar> (Challenge) <page> <byte0...byte3> write page on a Hitag S tag");
+			PrintAndLog("  04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
+			PrintAndLog(" Hitag1 (1*)");
+			PrintAndLog(" Hitag2 (2*)");
+			return 1;
+		} break;
+	}
+	// Copy the hitag function into the first argument
+	c.arg[0] = htf;
+
+	clearCommandBuffer();
+	SendCommand(&c);
+	UsbCommand resp;
+	WaitForResponse(CMD_ACK,&resp);
+
+	// Check the return status, stored in the first argument
+	if (resp.arg[0] == false) return 1;
+	return 0;
+}
+
+static command_t CommandTable[] = 
 {
-  {"help",    CmdHelp,           1, "This help"},
-  {"list",    CmdLFHitagList,    1, "List Hitag trace history"},
-  {"reader",  CmdLFHitagReader,  1, "Act like a Hitag Reader"},
-  {"sim",     CmdLFHitagSim,     1, "Simulate Hitag transponder"},
-  {"snoop",   CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
-		{NULL, NULL, 0, NULL}
+	{"help",    CmdHelp,           1, "This help"},
+	{"list",    CmdLFHitagList,    1, "<outfile> List Hitag trace history"},
+	{"reader",  CmdLFHitagReader,  1, "Act like a Hitag Reader"},
+	{"sim",     CmdLFHitagSim,     1, "<infile> Simulate Hitag transponder"},
+	{"snoop",   CmdLFHitagSnoop,   1, "Eavesdrop Hitag communication"},
+  {"writer",   		CmdLFHitagWP,      1, "Act like a Hitag Writer" },
+  {"simS",   		CmdLFHitagSimS,    1, "<hitagS.hts> Simulate HitagS transponder" }, 
+  {"checkChallenges",	CmdLFHitagCheckChallenges,   1, "<challenges.cc> test all challenges" }, {
+				NULL,NULL, 0, NULL }
 };
 
-int CmdLFHitag(const char *Cmd)
-{
-  CmdsParse(CommandTableHitag, Cmd);
-  return 0;
+int CmdLFHitag(const char *Cmd) {
+	clearCommandBuffer();
+	CmdsParse(CommandTable, Cmd);
+	return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
-  CmdsHelp(CommandTableHitag);
-  return 0;
+int CmdHelp(const char *Cmd) {
+	CmdsHelp(CommandTable);
+	return 0;
 }