X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4e12287d19650c3e446deb83e87aa40121d65c18..e17660d5f7dfa44447068e7897ee6454157d2ae1:/client/cmdlfhitag.c

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 07247364..103f2b77 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -17,9 +17,9 @@
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
+#include "parity.h"
 #include "hitag2.h"
 #include "hitagS.h"
-#include "sleep.h"
 #include "cmdmain.h"
 
 static int CmdHelp(const char *Cmd);
@@ -108,15 +108,9 @@ int CmdLFHitagList(const char *Cmd)
 		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))) {
+		  if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) {
 			sprintf(line+(j*4), "%02x!  ", frame[j]);
 		  }
 		  else {
@@ -214,14 +208,19 @@ 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);
+			//			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;
+		case RHT2F_UID_ONLY: {
+			// No additional parameters needed
+		} break;
 		default: {
-			PrintAndLog("Error: unkown reader function %d",htf);
-			PrintAndLog("Hitag reader functions");
+			PrintAndLog("\nError: unkown reader function %d",htf);
+			PrintAndLog("");
+			PrintAndLog("Usage: hitag reader <Reader Function #>");
+			PrintAndLog("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");
@@ -231,6 +230,7 @@ int CmdLFHitagReader(const char *Cmd) {
 			PrintAndLog("  22 <nr> <ar> (authentication)");
 			PrintAndLog("  23 <key> (authentication) key is in format: ISK high + ISK low");
 			PrintAndLog("  25 (test recorded authentications)");
+			PrintAndLog("  26 just read UID");
 			return 1;
 		} break;
 	}
@@ -238,32 +238,38 @@ 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);
+	// Send the command to the proxmark
+	SendCommand(&c);
 
-  PrintAndLog("Succesfully saved tag memory to [%s]",filename);
-  
-  return 0;
+	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);
+		
+	if (htf == RHT2F_UID_ONLY){
+		PrintAndLog("Valid Hitag2 tag found - UID: %08x",id);
+	} else {
+		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;
 }
 
 
@@ -343,7 +349,9 @@ int CmdLFHitagWP(const char *Cmd) {
 			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
+		case 04:
+		case 24:
+		{ //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);
@@ -357,6 +365,7 @@ int CmdLFHitagWP(const char *Cmd) {
 			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*)");
+			PrintAndLog("  24 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
 			return 1;
 		} break;
 	}