X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f6c18637ca504d2eea0bc3accaabddd132d749fb..2ae8a312e058f71d0f02be4f2f9cc6f284ebbf34:/client/cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 8380bcba..aa87132e 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+ //-----------------------------------------------------------------------------
 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
@@ -22,6 +22,7 @@
 #include "util.h"
 #include "data.h"
 #define LF_TRACE_BUFF_SIZE 12000
+#define LF_BITSSTREAM_LEN 1000
 
 char *global_em410xId;
 
@@ -194,9 +195,27 @@ retest:
  *   0                     <-- stop bit, end of tag
  */
 int CmdEM410xSim(const char *Cmd)
-{
-  int i, n, j, h, binary[4], parity[4];
+{	
+	int i, n, j, h, binary[4], parity[4];
+
+	char cmdp = param_getchar(Cmd, 0);
+	uint8_t uid[5] = {0x00};
+
+	if (cmdp == 'h' || cmdp == 'H') {
+		PrintAndLog("Usage:  lf em4x sim <UID>");
+		PrintAndLog("");
+		PrintAndLog("     sample: lf em4x sim 0F0368568B");
+		return 0;
+	}
 
+	if (param_gethex(Cmd, 0, uid, 10)) {
+		PrintAndLog("UID must include 10 HEX symbols");
+		return 0;
+	}
+	
+	PrintAndLog("Starting simulating with UID %02X %02X %02X %02X %02X", uid[0],uid[1],uid[2],uid[3],uid[4]);
+	
+  
   /* clock is 64 in EM410x tags */
   int clock = 64;
 
@@ -255,38 +274,38 @@ int CmdEM410xSim(const char *Cmd)
   return 0;
 }
 
-/* Function is equivalent of loread + losamples + em410xread
- * looped until an EM410x tag is detected */
+/* Function is equivalent of lf read + data samples + em410xread
+ * looped until an EM410x tag is detected 
+ * 
+ * Why is CmdSamples("16000")?
+ *  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
+
+*/
 int CmdEM410xWatch(const char *Cmd)
 {
-  int read_h = (*Cmd == 'h');
-  //char k;
-  do
-  {
-    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
+	int read_h = (*Cmd == 'h');
+	do
+	{
+		if (ukbhit()) {
+			printf("\naborted via keyboard!\n");
+			break;
+		}
+		
+		CmdLFRead(read_h ? "h" : "");
 		CmdSamples("16000");
- } while (
-		!CmdEM410xRead("") 
+		
+	} while (
+		!CmdEM410xRead("64") 
 	);
-  return 0;
+	return 0;
 }
 
 int CmdEM410xWatchnSpoof(const char *Cmd)
 {
-  int read_h = (*Cmd == 'h');
-  do
-  {
-    CmdLFRead(read_h ? "h" : "");
-    CmdSamples("16000");
- } while ( ! CmdEM410xRead(""));
+	CmdEM410xWatch(Cmd);
     PrintAndLog("# Replaying : %s",global_em410xId);
     CmdEM410xSim(global_em410xId);
   return 0;
@@ -536,9 +555,9 @@ int CmdReadWord(const char *Cmd)
 	}
 	GraphTraceLen = LF_TRACE_BUFF_SIZE;
 	
-	uint8_t bits[1000] = {0x00};
+	uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};
 	uint8_t * bitstream = bits;
-	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);
+	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream,LF_BITSSTREAM_LEN);
 	RepaintGraphWindow();
   return 0;
 }
@@ -576,10 +595,9 @@ int CmdReadWordPWD(const char *Cmd)
 	}
 	GraphTraceLen = LF_TRACE_BUFF_SIZE;
 	
-	uint8_t bits[1000] = {0x00};
-	uint8_t * bitstream = bits;
-	
-	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);
+	uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};
+	uint8_t * bitstream = bits;	
+	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);
 	RepaintGraphWindow();
   return 0;
 }
@@ -636,12 +654,12 @@ int CmdWriteWordPWD(const char *Cmd)
 static command_t CommandTable[] =
 {
   {"help", CmdHelp, 1, "This help"},
-  {"410read", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag"},
-  {"410sim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
-  {"410watch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
-  {"410spoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
-  {"410write", CmdEM410xWrite, 1, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
-  {"4xread", CmdEM4x50Read, 1, "Extract data from EM4x50 tag"},
+  {"410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag"},
+  {"410xsim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
+  {"410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
+  {"410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
+  {"410xwrite", CmdEM410xWrite, 1, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
+  {"4x50read", CmdEM4x50Read, 1, "Extract data from EM4x50 tag"},
   {"rd", CmdReadWord, 1, "<Word 1-15> -- Read EM4xxx word data"},
   {"rdpwd", CmdReadWordPWD, 1, "<Word 1-15> <Password> -- Read EM4xxx word data  in password mode "},
   {"wr", CmdWriteWord, 1, "<Data> <Word 1-15> -- Write EM4xxx word data"},