X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2d495a814df05ad14cce886700fa3d96c1a5f5e3..9e130475f9d8c727a5d99db54bc6d52b88a13e78:/client/cmdlfhitag.c

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 61a7d3b3..c648f6a5 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -12,12 +12,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include "data.h"
-#include "proxusb.h"
+//#include "proxusb.h"
+#include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
 #include "hitag2.h"
+#include "sleep.h"
+#include "cmdmain.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -25,17 +28,7 @@ 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;
-	  }
-  }
+  WaitForResponse(CMD_ACK,NULL);
 
   PrintAndLog("recorded activity:");
   PrintAndLog(" ETU     :rssi: who bytes");
@@ -44,6 +37,9 @@ int CmdLFHitagList(const char *Cmd)
   int i = 0;
   int prev = -1;
 
+  char filename[256];
+  FILE* pf = NULL;
+  
   for (;;) {
     if(i >= 1900) {
       break;
@@ -114,7 +110,7 @@ int CmdLFHitagList(const char *Cmd)
       line);
 
 
-	if (strlen(filename) > 0) {
+   if (pf) {
       fprintf(pf," +%7d: %s: %s %s %s",
 					(prev < 0 ? 0 : (timestamp - prev)),
 					metricString,
@@ -127,7 +123,7 @@ int CmdLFHitagList(const char *Cmd)
     i += (len + 9);
   }
   
-  if (strlen(filename) > 0) {
+  if (pf) {
 	  PrintAndLog("Recorded activity succesfully written to file: %s", filename);
     fclose(pf);
   }
@@ -143,7 +139,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;
 
@@ -184,18 +180,23 @@ 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;
 		default: {
 			PrintAndLog("Error: unkown reader function %d",htf);
-			PrintAndLog("Hitag reader functions",htf);
-			PrintAndLog(" HitagS (0*)",htf);
-			PrintAndLog(" Hitag1 (1*)",htf);
-			PrintAndLog(" Hitag2 (2*)",htf);
-			PrintAndLog("  21 <password> (password mode)",htf);
-			PrintAndLog("  22 <nr> <ar> (authentication)",htf);
-			PrintAndLog("  25 (test recorded authentications)",htf);
+			PrintAndLog("Hitag reader functions");
+			PrintAndLog(" HitagS (0*)");
+			PrintAndLog(" Hitag1 (1*)");
+			PrintAndLog(" Hitag2 (2*)");
+			PrintAndLog("  21 <password> (password mode)");
+			PrintAndLog("  22 <nr> <ar> (authentication)");
+			PrintAndLog("  23 <key> (authentication) key is in format: ISK high + ISK low");
+			PrintAndLog("  25 (test recorded authentications)");
 			return 1;
 		} break;
 	}
@@ -203,7 +204,31 @@ int CmdLFHitagReader(const char *Cmd) {
 	// Copy the hitag2 function into the first argument
 	c.arg[0] = htf;
 
+  // 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);
+
+  PrintAndLog("Succesfully saved tag memory to [%s]",filename);
+  
   return 0;
 }