X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c2d25819d8c55b568814da61d116fda9b4ad53d1..5ea2c8851520ed67b42b62a25f08eb493c1ed41a:/client/cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 0449e34a..67013b2e 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;
 
@@ -56,7 +57,7 @@ int CmdEM410xRead(const char *Cmd)
 
   /* get clock */
   clock = GetClock(Cmd, high, 0);
-
+   
   /* parity for our 4 columns */
   parity[0] = parity[1] = parity[2] = parity[3] = 0;
   header = rows = 0;
@@ -97,7 +98,7 @@ int CmdEM410xRead(const char *Cmd)
 
 retest:
   /* We go till 5 before the graph ends because we'll get that far below */
-  for (i = 1; i < bit2idx - 5; i++)
+  for (i = 0; i < bit2idx - 5; i++)
   {
     /* Step 2: We have our header but need our tag ID */
     if (header == 9 && rows < 10)
@@ -126,7 +127,7 @@ retest:
         PrintAndLog("Thought we had a valid tag but failed at word %d (i=%d)", rows + 1, i);
 
         /* Start back rows * 5 + 9 header bits, -1 to not start at same place */
-        i -= 9 + (5 * rows) - 5;
+        i -= 9 + (5 * rows) -2;
 
         rows = header = 0;
       }
@@ -194,15 +195,33 @@ 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 UID %02X%02X%02X%02X%02X", uid[0],uid[1],uid[2],uid[3],uid[4]);
+	PrintAndLog("Press pm3-button to about simulation");
+  
   /* clock is 64 in EM410x tags */
   int clock = 64;
 
   /* clear our graph */
-  ClearGraph(0);
-
+  ClearGraph(1);
+  
   /* write it out a few times */
   for (h = 0; h < 4; h++)
   {
@@ -246,7 +265,7 @@ int CmdEM410xSim(const char *Cmd)
   }
 
   /* modulate that biatch */
-  CmdManchesterMod("");
+  CmdManchesterMod("64");
 
   /* booyah! */
   RepaintGraphWindow();
@@ -270,8 +289,14 @@ int CmdEM410xWatch(const char *Cmd)
 	int read_h = (*Cmd == 'h');
 	do
 	{
+		if (ukbhit()) {
+			printf("\naborted via keyboard!\n");
+			break;
+		}
+		
 		CmdLFRead(read_h ? "h" : "");
-		CmdSamples("16000");	
+		CmdSamples("16000");
+		
 	} while (
 		!CmdEM410xRead("") 
 	);
@@ -337,7 +362,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;
@@ -530,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;
 }
@@ -570,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;
 }
@@ -591,7 +615,7 @@ int CmdWriteWord(const char *Cmd)
     return 1;
   }
   
-  PrintAndLog("Writting word %d with data %08X", Word, Data);
+  PrintAndLog("Writing word %d with data %08X", Word, Data);
   
   c.cmd = CMD_EM4X_WRITE_WORD;
   c.d.asBytes[0] = 0x0; //Normal mode
@@ -604,7 +628,7 @@ int CmdWriteWord(const char *Cmd)
 
 int CmdWriteWordPWD(const char *Cmd)
 {
-  int Word = 8; //default to invalid word
+  int Word = 16; //default to invalid word
   int Data = 0xFFFFFFFF; //default to blank data
   int Password = 0xFFFFFFFF; //default to blank password
   UsbCommand c;
@@ -616,7 +640,7 @@ int CmdWriteWordPWD(const char *Cmd)
     return 1;
   }
   
-  PrintAndLog("Writting word %d with data %08X and password %08X", Word, Data, Password);
+  PrintAndLog("Writing word %d with data %08X and password %08X", Word, Data, Password);
   
   c.cmd = CMD_EM4X_WRITE_WORD;
   c.d.asBytes[0] = 0x1; //Password mode