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

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 703767b0..bdabe5e4 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -25,6 +25,17 @@ int CmdLFHitagList(const char *Cmd)
 {
   uint8_t got[3000];
   GetFromBigBuf(got,sizeof(got),0);
+  char filename[256];
+  FILE* pf;
+
+  param_getstr(Cmd,0,filename);
+  
+  if (strlen(filename) > 0) {
+      if ((pf = fopen(filename,"w")) == NULL) {
+	    PrintAndLog("Error: Could not open file [%s]",filename);
+	    return 1;
+	  }
+  }
 
   PrintAndLog("recorded activity:");
   PrintAndLog(" ETU     :rssi: who bytes");
@@ -102,10 +113,26 @@ int CmdLFHitagList(const char *Cmd)
       (isResponse ? "TAG" : "   "),
       line);
 
+
+	if (strlen(filename) > 0) {
+      fprintf(pf," +%7d: %s: %s %s %s",
+					(prev < 0 ? 0 : (timestamp - prev)),
+					metricString,
+					(isResponse ? "TAG" : "   "),
+					line,
+					"\n");
+    }
+	
     prev = timestamp;
     i += (len + 9);
   }
-	return 0;
+  
+  if (strlen(filename) > 0) {
+	  PrintAndLog("Recorded activity succesfully written to file: %s", filename);
+    fclose(pf);
+  }
+	
+  return 0;
 }
 
 int CmdLFHitagSnoop(const char *Cmd) {
@@ -116,7 +143,7 @@ int CmdLFHitagSnoop(const char *Cmd) {
 
 int CmdLFHitagSim(const char *Cmd) {
   UsbCommand c = {CMD_SIMULATE_HITAG};
-	char filename[256];
+	char filename[256] = { 0x00 };
 	FILE* pf;
 	bool tag_mem_supplied;
 
@@ -157,6 +184,10 @@ int CmdLFHitagReader(const char *Cmd) {
 			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 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
 		} break;
@@ -168,6 +199,7 @@ int CmdLFHitagReader(const char *Cmd) {
 			PrintAndLog(" Hitag2 (2*)",htf);
 			PrintAndLog("  21 <password> (password mode)",htf);
 			PrintAndLog("  22 <nr> <ar> (authentication)",htf);
+			PrintAndLog("  23 <key> (authentication)",htf);
 			PrintAndLog("  25 (test recorded authentications)",htf);
 			return 1;
 		} break;