X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/54a942b05dd2a601b85e9851a5799929cbdffd5f..3400a4358db11337382065c26e58539d28ade5ef:/client/cmdlfem4x.c?ds=sidebyside

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index f823750b..83f49db7 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -22,6 +22,20 @@
 
 static int CmdHelp(const char *Cmd);
 
+
+
+int CmdEMdemodASK(const char *Cmd)
+{
+  int findone=0;
+  UsbCommand c={CMD_EM410X_DEMOD};
+  if(Cmd[0]=='1') findone=1;
+  c.arg[0]=findone;
+  SendCommand(&c);
+  return 0;
+}
+
+
+
 /* Read the ID of an EM410x tag.
  * Format:
  *   1111 1111 1           <-- standard non-repeatable header
@@ -35,6 +49,7 @@ int CmdEM410xRead(const char *Cmd)
   int i, j, clock, header, rows, bit, hithigh, hitlow, first, bit2idx, high, low;
   int parity[4];
   char id[11];
+  char id2[11];
   int retested = 0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN];
   high = low = 0;
@@ -101,6 +116,7 @@ retest:
       {
         /* Read another byte! */
         sprintf(id+rows, "%x", (8 * BitStream[i]) + (4 * BitStream[i+1]) + (2 * BitStream[i+2]) + (1 * BitStream[i+3]));
+        sprintf(id2+rows, "%x", (8 * BitStream[i+3]) + (4 * BitStream[i+2]) + (2 * BitStream[i+1]) + (1 * BitStream[i]));
         rows++;
 
         /* Keep parity info */
@@ -135,6 +151,7 @@ retest:
       {
         /* Sweet! */
         PrintAndLog("EM410x Tag ID: %s", id);
+        PrintAndLog("Unique Tag ID: %s", id2);
 
         /* Stop any loops */
         return 1;
@@ -248,11 +265,20 @@ int CmdEM410xSim(const char *Cmd)
  * looped until an EM410x tag is detected */
 int CmdEM410xWatch(const char *Cmd)
 {
+  int read_h = (*Cmd == 'h');
   do
   {
-    CmdLFRead("");
-    CmdSamples("2000");
-  } while ( ! CmdEM410xRead(""));
+    CmdLFRead(read_h ? "h" : "");
+    // 2000 samples is OK for clock=64, but not clock=32.  Probably want
+		//   8000 for clock=16.  Don't want to go too high since old HID driver
+		//   is very slow
+		// TBD: Auto-grow sample size based on detected sample rate.  IE: If the
+		//   rate gets lower, then grow the number of samples
+
+    // Changed by martin, 4000 x 4 = 16000, 
+    // see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
+		CmdSamples("16000");
+ } while ( ! CmdEM410xRead(""));
   return 0;
 }
 
@@ -307,7 +333,7 @@ int CmdEM4x50Read(const char *Cmd)
       ++i;
     while ((GraphBuffer[i] > low) && (i<GraphTraceLen))
       ++i;
-    if (j>(MAX_GRAPH_TRACE_LEN/64)) {
+    if (j>=(MAX_GRAPH_TRACE_LEN/64)) {
       break;
     }
     tmpbuff[j++]= i - start;
@@ -402,22 +428,66 @@ int CmdEM4x50Read(const char *Cmd)
 
 int CmdEM410xWrite(const char *Cmd)
 {
-  uint64_t id = 0;
-  unsigned int card;
-
-  sscanf(Cmd, "%" PRIx64 " %d", &id, &card);
-
-  if (id >= 0x10000000000) {
-    PrintAndLog("Error! Given EM410x ID is longer than 40 bits.\n");
-    return 0;
-  }
-
-  if (card > 1) {
-    PrintAndLog("Error! Bad card type selected.\n");
-    return 0;
-  }
+  uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
+  int card = 0xFF; // invalid card value
+	unsigned int clock = 0; // invalid clock value
+
+	sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);
+
+	// Check ID
+	if (id == 0xFFFFFFFFFFFFFFFF) {
+		PrintAndLog("Error! ID is required.\n");
+		return 0;
+	}
+	if (id >= 0x10000000000) {
+		PrintAndLog("Error! Given EM410x ID is longer than 40 bits.\n");
+		return 0;
+	}
+
+	// Check Card
+	if (card == 0xFF) {
+		PrintAndLog("Error! Card type required.\n");
+		return 0;
+	}
+	if (card < 0) {
+		PrintAndLog("Error! Bad card type selected.\n");
+		return 0;
+	}
+
+	// Check Clock
+	if (card == 1)
+	{
+		// Default: 64
+		if (clock == 0)
+			clock = 64;
+
+		// Allowed clock rates: 16, 32 and 64
+		if ((clock != 16) && (clock != 32) && (clock != 64)) {
+			PrintAndLog("Error! Clock rate %d not valid. Supported clock rates are 16, 32 and 64.\n", clock);
+			return 0;
+		}
+	}
+	else if (clock != 0)
+	{
+		PrintAndLog("Error! Clock rate is only supported on T55x7 tags.\n");
+		return 0;
+	}
+
+	if (card == 1) {
+		PrintAndLog("Writing %s tag with UID 0x%010" PRIx64 " (clock rate: %d)", "T55x7", id, clock);
+		// NOTE: We really should pass the clock in as a separate argument, but to
+		//   provide for backwards-compatibility for older firmware, and to avoid
+		//   having to add another argument to CMD_EM410X_WRITE_TAG, we just store
+		//   the clock rate in bits 8-15 of the card value
+		card = (card & 0xFF) | (((uint64_t)clock << 8) & 0xFF00);
+	}
+	else if (card == 0)
+		PrintAndLog("Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
+	else {
+		PrintAndLog("Error! Bad card type selected.\n");
+		return 0;
+	}
 
-  PrintAndLog("Writing %s tag with UID 0x%010" PRIx64, card ? "T55x7":"T5555", id);
   UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
   SendCommand(&c);
 
@@ -525,10 +595,11 @@ int CmdWriteWordPWD(const char *Cmd)
 static command_t CommandTable[] =
 {
   {"help", CmdHelp, 1, "This help"},
+  {"em410xdemod", CmdEMdemodASK, 0, "[clock rate] -- Extract ID from EM410x tag"},  
   {"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag"},
   {"em410xsim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
-  {"em410xwatch", CmdEM410xWatch, 0, "Watches for EM410x tags"},
-  {"em410xwrite", CmdEM410xWrite, 1, "<UID> <'0' T5555> <'1' T55x7> -- Write EM410x UID to T5555(Q5) or T55x7 tag"},
+  {"em410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
+  {"em410xwrite", CmdEM410xWrite, 1, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
   {"em4x50read", CmdEM4x50Read, 1, "Extract data from EM4x50 tag"},
   {"readword", CmdReadWord, 1, "<Word> -- Read EM4xxx word data"},
   {"readwordPWD", CmdReadWordPWD, 1, "<Word> <Password> -- Read EM4xxx word data in password mode"},