X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/902cb3c00b49535f0de9a3b6d5ba0c54260ccac1..46e14b0f960dcd84fc41df32c74fb3fd89c0ac5c:/client/cmdlfhitag.c

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 2541ce59..331f2c87 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -12,43 +12,37 @@
 #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 "../include/common.h"
 #include "util.h"
-#include "hitag2.h"
+#include "../include/hitag2.h"
 #include "sleep.h"
 #include "cmdmain.h"
 
 static int CmdHelp(const char *Cmd);
 
+size_t nbytes(size_t nbits) {
+	return (nbits/8)+((nbits%8)>0);
+}
+
 int CmdLFHitagList(const char *Cmd)
 {
   uint8_t got[3000];
   GetFromBigBuf(got,sizeof(got),0);
   WaitForResponse(CMD_ACK,NULL);
 
-  char filename[256];
-  FILE* pf = NULL;
-
-  if (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");
-  PrintAndLog("---------+----+----+-----------");
+  PrintAndLog(" ETU     :nbits: who bytes");
+  PrintAndLog("---------+-----+----+-----------");
 
   int i = 0;
   int prev = -1;
 
+  char filename[256];
+  FILE* pf = NULL;
+  
   for (;;) {
     if(i >= 1900) {
       break;
@@ -63,7 +57,6 @@ int CmdLFHitagList(const char *Cmd)
       isResponse = 0;
     }
 
-    int metric = 0;
     int parityBits = *((uint32_t *)(got+i+4));
     // 4 bytes of additional information...
     // maximum of 32 additional parity bit information
@@ -72,7 +65,8 @@ int CmdLFHitagList(const char *Cmd)
     // 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];
+    int bits = got[i+8];
+    int len = nbytes(got[i+8]);
 
     if (len > 100) {
       break;
@@ -105,27 +99,19 @@ int CmdLFHitagList(const char *Cmd)
       }
     }
 
-    char metricString[100];
-    if (isResponse) {
-      sprintf(metricString, "%3d", metric);
-    } else {
-      strcpy(metricString, "   ");
-    }
-
-    PrintAndLog(" +%7d: %s: %s %s",
+    PrintAndLog(" +%7d:  %3d: %s %s",
       (prev < 0 ? 0 : (timestamp - prev)),
-      metricString,
+      bits,
       (isResponse ? "TAG" : "   "),
       line);
 
 
    if (pf) {
-      fprintf(pf," +%7d: %s: %s %s %s",
+      fprintf(pf," +%7d:  %3d: %s %s\n",
 					(prev < 0 ? 0 : (timestamp - prev)),
-					metricString,
+					bits,
 					(isResponse ? "TAG" : "   "),
-					line,
-					"\n");
+					line);
     }
 	
     prev = timestamp;
@@ -160,7 +146,10 @@ int CmdLFHitagSim(const char *Cmd) {
 			return 1;
 		}
 		tag_mem_supplied = true;
-		fread(c.d.asBytes,48,1,pf);
+		if (fread(c.d.asBytes,48,1,pf) == 0) {
+      PrintAndLog("Error: File reading error");
+			return 1;
+    }
 		fclose(pf);
 	} else {
 		tag_mem_supplied = false;
@@ -198,14 +187,14 @@ int CmdLFHitagReader(const char *Cmd) {
 		} 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("  23 <key> (authentication) key is in format: ISK high + ISK low",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;
 	}
@@ -213,11 +202,35 @@ 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;
 }
 
-static command_t CommandTableHitag[] = 
+static command_t CommandTable[] = 
 {
   {"help",    CmdHelp,           1, "This help"},
   {"list",    CmdLFHitagList,    1, "List Hitag trace history"},
@@ -229,12 +242,12 @@ static command_t CommandTableHitag[] =
 
 int CmdLFHitag(const char *Cmd)
 {
-  CmdsParse(CommandTableHitag, Cmd);
+  CmdsParse(CommandTable, Cmd);
   return 0;
 }
 
 int CmdHelp(const char *Cmd)
 {
-  CmdsHelp(CommandTableHitag);
+  CmdsHelp(CommandTable);
   return 0;
 }