FIX: @marshmellow found out that the CRC-8/Maxim was not always giving the right...

[proxmark3-svn] / client / cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index a7312d21b81a21a148c7cfe1e0e95f5b4db021d3..f6671bcdb27586eb376e147d9df30ed27cdaf17a 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -11,17 +11,28 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>

-//#include "proxusb.h"

 #include "proxmark3.h"
 #include "ui.h"
 #include "proxmark3.h"
 #include "ui.h"

+#include "util.h"

 #include "graph.h"
 #include "cmdparser.h"
 #include "cmddata.h"
 #include "cmdlf.h"
 #include "cmdlfem4x.h"
 #include "graph.h"
 #include "cmdparser.h"
 #include "cmddata.h"
 #include "cmdlf.h"
 #include "cmdlfem4x.h"

+char *global_em410xId;

 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 

+int CmdEMdemodASK(const char *Cmd)
+{
+       char cmdp = param_getchar(Cmd, 0);
+       int findone = (cmdp == '1') ? 1 : 0;    
+  UsbCommand c={CMD_EM410X_DEMOD};
+  c.arg[0]=findone;
+  SendCommand(&c);
+  return 0;
+}
+

 /* Read the ID of an EM410x tag.
  * Format:
  *   1111 1111 1           <-- standard non-repeatable header
 /* Read the ID of an EM410x tag.
  * Format:
  *   1111 1111 1           <-- standard non-repeatable header


@@ -34,8 +45,8 @@ int CmdEM410xRead(const char *Cmd)
 {
   int i, j, clock, header, rows, bit, hithigh, hitlow, first, bit2idx, high, low;
   int parity[4];
 {
   int i, j, clock, header, rows, bit, hithigh, hitlow, first, bit2idx, high, low;
   int parity[4];

-  char id[11];
-  char id2[11];
+  char id[11] = {0x00};
+  char id2[11] = {0x00};

   int retested = 0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN];
   high = low = 0;
   int retested = 0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN];
   high = low = 0;


@@ -50,13 +61,13 @@ int CmdEM410xRead(const char *Cmd)
   }
 
   /* get clock */
   }
 
   /* get clock */

-  clock = GetClock(Cmd, high, 0);
+  clock = GetAskClock(Cmd, false, false);

 
   /* parity for our 4 columns */
   parity[0] = parity[1] = parity[2] = parity[3] = 0;
   header = rows = 0;
 
 
   /* parity for our 4 columns */
   parity[0] = parity[1] = parity[2] = parity[3] = 0;
   header = rows = 0;
 

-  /* manchester demodulate */
+  // manchester demodulate

   bit = bit2idx = 0;
   for (i = 0; i < (int)(GraphTraceLen / clock); i++)
   {
   bit = bit2idx = 0;
   for (i = 0; i < (int)(GraphTraceLen / clock); i++)
   {


@@ -67,9 +78,9 @@ int CmdEM410xRead(const char *Cmd)
     /* Find out if we hit both high and low peaks */
     for (j = 0; j < clock; j++)
     {
     /* Find out if we hit both high and low peaks */
     for (j = 0; j < clock; j++)
     {

-      if (GraphBuffer[(i * clock) + j] == high)
+      if (GraphBuffer[(i * clock) + j] >= high)

         hithigh = 1;
         hithigh = 1;

-      else if (GraphBuffer[(i * clock) + j] == low)
+      else if (GraphBuffer[(i * clock) + j] <= low)

         hitlow = 1;
 
       /* it doesn't count if it's the first part of our read
         hitlow = 1;
 
       /* it doesn't count if it's the first part of our read


@@ -139,6 +150,8 @@ retest:
         PrintAndLog("EM410x Tag ID: %s", id);
         PrintAndLog("Unique Tag ID: %s", id2);
 
         PrintAndLog("EM410x Tag ID: %s", id);
         PrintAndLog("Unique Tag ID: %s", id2);
 

+               global_em410xId = id;
+               

         /* Stop any loops */
         return 1;
       }
         /* Stop any loops */
         return 1;
       }


@@ -167,8 +180,10 @@ retest:
   }
 
   /* if we've already retested after flipping bits, return */
   }
 
   /* if we've already retested after flipping bits, return */

-  if (retested++)
+       if (retested++){
+               PrintAndLog("Failed to decode");

     return 0;
     return 0;

+       }

 
   /* if this didn't work, try flipping bits */
   for (i = 0; i < bit2idx; i++)
 
   /* if this didn't work, try flipping bits */
   for (i = 0; i < bit2idx; i++)


@@ -187,7 +202,25 @@ retest:
  */
 int CmdEM410xSim(const char *Cmd)
 {
  */
 int CmdEM410xSim(const char *Cmd)
 {

-  int i, n, j, h, binary[4], parity[4];
+       int i, n, j, binary[4], parity[4];
+
+       char cmdp = param_getchar(Cmd, 0);
+       uint8_t uid[5] = {0x00};
+
+       if (cmdp == 'h' || cmdp == 'H') {
+               PrintAndLog("Usage:  lf em4x 410xsim <UID>");
+               PrintAndLog("");
+               PrintAndLog("     sample: lf em4x 410xsim 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;
 
   /* clock is 64 in EM410x tags */
   int clock = 64;


@@ -195,9 +228,6 @@ int CmdEM410xSim(const char *Cmd)
   /* clear our graph */
   ClearGraph(0);
 
   /* clear our graph */
   ClearGraph(0);
 

-  /* write it out a few times */
-  for (h = 0; h < 4; h++)
-  {

     /* write 9 start bits */
     for (i = 0; i < 9; i++)
       AppendGraph(0, clock, 1);
     /* write 9 start bits */
     for (i = 0; i < 9; i++)
       AppendGraph(0, clock, 1);


@@ -234,37 +264,45 @@ int CmdEM410xSim(const char *Cmd)
     AppendGraph(0, clock, parity[3]);
 
     /* stop bit */
     AppendGraph(0, clock, parity[3]);
 
     /* stop bit */

-    AppendGraph(0, clock, 0);
-  }
-
-  /* modulate that biatch */
-  CmdManchesterMod("");
-
-  /* booyah! */
-  RepaintGraphWindow();
-  
-  CmdLFSim("");
+  AppendGraph(1, clock, 0);
+ 
+  CmdLFSim("0"); //240 start_gap.

   return 0;
 }
 
   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 CmdEM410xWatch(const char *Cmd)
 {

-  int read_h = (*Cmd == 'h');
-  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
-               CmdSamples("16000");
- } while ( ! CmdEM410xRead(""));
+       char cmdp = param_getchar(Cmd, 0);
+       int read_h = (cmdp == 'h');
+       do {
+               if (ukbhit()) {
+                       printf("\naborted via keyboard!\n");
+                       break;
+               }
+               
+               CmdLFRead(read_h ? "h" : "");
+               CmdSamples("6000");             
+       } while (
+               !CmdEM410xRead("") 
+       );
+       return 0;
+}
+
+int CmdEM410xWatchnSpoof(const char *Cmd)
+{
+       CmdEM410xWatch(Cmd);
+    PrintAndLog("# Replaying : %s",global_em410xId);
+    CmdEM410xSim(global_em410xId);

   return 0;
 }
 
   return 0;
 }
 


@@ -319,7 +357,7 @@ int CmdEM4x50Read(const char *Cmd)
       ++i;
     while ((GraphBuffer[i] > low) && (i<GraphTraceLen))
       ++i;
       ++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;
       break;
     }
     tmpbuff[j++]= i - start;


@@ -482,12 +520,12 @@ int CmdEM410xWrite(const char *Cmd)
 
 int CmdReadWord(const char *Cmd)
 {
 
 int CmdReadWord(const char *Cmd)
 {

-  int Word = 16; //default to invalid word
+       int Word = -1; //default to invalid word

   UsbCommand c;
   
   sscanf(Cmd, "%d", &Word);
   
   UsbCommand c;
   
   sscanf(Cmd, "%d", &Word);
   

-  if (Word > 15) {
+       if ( (Word > 15) | (Word < 0) ) {

     PrintAndLog("Word must be between 0 and 15");
     return 1;
   }
     PrintAndLog("Word must be between 0 and 15");
     return 1;
   }


@@ -505,13 +543,13 @@ int CmdReadWord(const char *Cmd)
 
 int CmdReadWordPWD(const char *Cmd)
 {
 
 int CmdReadWordPWD(const char *Cmd)
 {

-  int Word = 16; //default to invalid word
+       int Word = -1; //default to invalid word

   int Password = 0xFFFFFFFF; //default to blank password
   UsbCommand c;
   
   sscanf(Cmd, "%d %x", &Word, &Password);
   
   int Password = 0xFFFFFFFF; //default to blank password
   UsbCommand c;
   
   sscanf(Cmd, "%d %x", &Word, &Password);
   

-  if (Word > 15) {
+       if ( (Word > 15) | (Word < 0) ) {

     PrintAndLog("Word must be between 0 and 15");
     return 1;
   }
     PrintAndLog("Word must be between 0 and 15");
     return 1;
   }


@@ -540,7 +578,7 @@ int CmdWriteWord(const char *Cmd)
     return 1;
   }
   
     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
   
   c.cmd = CMD_EM4X_WRITE_WORD;
   c.d.asBytes[0] = 0x0; //Normal mode


@@ -553,7 +591,7 @@ int CmdWriteWord(const char *Cmd)
 
 int CmdWriteWordPWD(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;
   int Data = 0xFFFFFFFF; //default to blank data
   int Password = 0xFFFFFFFF; //default to blank password
   UsbCommand c;


@@ -565,7 +603,7 @@ int CmdWriteWordPWD(const char *Cmd)
     return 1;
   }
   
     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
   
   c.cmd = CMD_EM4X_WRITE_WORD;
   c.d.asBytes[0] = 0x1; //Password mode


@@ -576,14 +614,14 @@ int CmdWriteWordPWD(const char *Cmd)
   return 0;
 }
 
   return 0;
 }
 

-
-

 static command_t CommandTable[] =
 {
   {"help", CmdHelp, 1, "This help"},
 static command_t CommandTable[] =
 {
   {"help", CmdHelp, 1, "This help"},

+  {"em410xdemod", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},  

   {"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag"},
   {"em410xsim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
   {"em410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
   {"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag"},
   {"em410xsim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
   {"em410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},

+  {"em410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (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"},
   {"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"},