FIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks.

[proxmark3-svn] / client / cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 92cdb90d2248b11483bdd09b87d173c87d7dde2b..d371bf279067bc3fe2cd829d60860588de60ee3a 100644 (file)
--- 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,
 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,


@@ -11,13 +11,20 @@
 #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 "graph.h"
 #include "ui.h"
 #include "graph.h"

+#include "cmdmain.h"

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

+#include "util.h"
+#include "data.h"
+#define LF_TRACE_BUFF_SIZE 12000
+#define LF_BITSSTREAM_LEN 1000
+
+char *global_em410xId;

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


@@ -34,6 +41,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];
   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;
   int retested = 0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN];
   high = low = 0;


@@ -49,7 +57,8 @@ int CmdEM410xRead(const char *Cmd)
 
   /* get clock */
   clock = GetClock(Cmd, high, 0);
 
   /* get clock */
   clock = GetClock(Cmd, high, 0);

-
+ 
+  

   /* 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;


@@ -100,6 +109,7 @@ retest:
       {
         /* Read another byte! */
         sprintf(id+rows, "%x", (8 * BitStream[i]) + (4 * BitStream[i+1]) + (2 * BitStream[i+2]) + (1 * BitStream[i+3]));
       {
         /* 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 */
         rows++;
 
         /* Keep parity info */


@@ -134,7 +144,10 @@ retest:
       {
         /* Sweet! */
         PrintAndLog("EM410x Tag ID: %s", id);
       {
         /* Sweet! */
         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;
       }


@@ -163,8 +176,9 @@ retest:
   }
 
   /* if we've already retested after flipping bits, return */
   }
 
   /* if we've already retested after flipping bits, return */

-  if (retested++)
+  if (retested++){

     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++)


@@ -182,15 +196,33 @@ retest:
  *   0                     <-- stop bit, end of tag
  */
 int CmdEM410xSim(const char *Cmd)
  *   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;
 
   /* clear our graph */
   /* 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++)
   {
   /* write it out a few times */
   for (h = 0; h < 4; h++)
   {


@@ -234,7 +266,7 @@ int CmdEM410xSim(const char *Cmd)
   }
 
   /* modulate that biatch */
   }
 
   /* modulate that biatch */

-  CmdManchesterMod("");
+  CmdManchesterMod("64");

 
   /* booyah! */
   RepaintGraphWindow();
 
   /* booyah! */
   RepaintGraphWindow();


@@ -243,15 +275,40 @@ int CmdEM410xSim(const char *Cmd)
   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)
 {

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

   return 0;
 }
 
   return 0;
 }
 


@@ -306,7 +363,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;


@@ -401,22 +458,66 @@ int CmdEM4x50Read(const char *Cmd)
 
 int CmdEM410xWrite(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;
-  }
+  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;
+       }

 
 

-  if (card > 1) {
-    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);
 
   UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
   SendCommand(&c);
 


@@ -425,66 +526,98 @@ int CmdEM410xWrite(const char *Cmd)
 
 int CmdReadWord(const char *Cmd)
 {
 
 int CmdReadWord(const char *Cmd)
 {

-  int Word = 16; //default to invalid word
-  UsbCommand c;
-
-  sscanf(Cmd, "%d", &Word);
-
-  if (Word > 15) {
-       PrintAndLog("Word must be between 0 and 15");
-       return 1;
-  }    
-
-  PrintAndLog("Reading word %d", Word);
-
-  c.cmd = CMD_EM4X_READ_WORD;
-  c.d.asBytes[0] = 0x0; //Normal mode
-  c.arg[0] = 0;
-  c.arg[1] = Word;
-  c.arg[2] = 0;
-  SendCommand(&c);
+       int Word = -1; //default to invalid word
+       UsbCommand c;
+  
+       sscanf(Cmd, "%d", &Word);
+  
+       if ( (Word > 15) | (Word < 0) ) {
+               PrintAndLog("Word must be between 0 and 15");
+               return 1;
+       }
+  
+       PrintAndLog("Reading word %d", Word);
+  
+       c.cmd = CMD_EM4X_READ_WORD;
+       c.d.asBytes[0] = 0x0; //Normal mode
+       c.arg[0] = 0;
+       c.arg[1] = Word;
+       c.arg[2] = 0;
+       SendCommand(&c);
+       WaitForResponse(CMD_ACK, NULL);
+
+       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};
+
+       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
+       WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+
+       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {
+               GraphBuffer[j] = ((int)data[j]);
+       }
+       GraphTraceLen = LF_TRACE_BUFF_SIZE;
+       
+       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;
 }
 
 int CmdReadWordPWD(const char *Cmd)
 {
   return 0;
 }
 
 int CmdReadWordPWD(const char *Cmd)
 {

-  int Word = 16; //default to invalid word
-  int Password = 0xFFFFFFFF; //default to blank password
-  UsbCommand c;
+       int Word = -1; //default to invalid word
+       int Password = 0xFFFFFFFF; //default to blank password
+       UsbCommand c;

 
 

-  sscanf(Cmd, "%d %x", &Word, &Password);
+       sscanf(Cmd, "%d %x", &Word, &Password);

 
 

-  if (Word > 15) {
-       PrintAndLog("Word must be between 0 and 15");
-       return 1;
-  }    
-
-  PrintAndLog("Reading word %d with password %08X", Word, Password);
-
-  c.cmd = CMD_EM4X_READ_WORD;
-  c.d.asBytes[0] = 0x1; //Password mode
-  c.arg[0] = 0;
-  c.arg[1] = Word;
-  c.arg[2] = Password;
-  SendCommand(&c);
+       if ( (Word > 15) | (Word < 0) ) {
+               PrintAndLog("Word must be between 0 and 15");
+               return 1;
+       }
+  
+       PrintAndLog("Reading word %d with password %08X", Word, Password);
+
+       c.cmd = CMD_EM4X_READ_WORD;
+       c.d.asBytes[0] = 0x1; //Password mode
+       c.arg[0] = 0;
+       c.arg[1] = Word;
+       c.arg[2] = Password;
+       SendCommand(&c);
+       WaitForResponse(CMD_ACK, NULL);
+               
+       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};
+
+       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
+       WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+
+       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {
+               GraphBuffer[j] = ((int)data[j]);
+       }
+       GraphTraceLen = LF_TRACE_BUFF_SIZE;
+       
+       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;
 }
 
 int CmdWriteWord(const char *Cmd)
 {
   int Word = 16; //default to invalid block
   return 0;
 }
 
 int CmdWriteWord(const char *Cmd)
 {
   int Word = 16; //default to invalid block

-  int Data = 0xFFFFFFFF; //default to blank data 
+  int Data = 0xFFFFFFFF; //default to blank data

   UsbCommand c;
   UsbCommand c;

-
+  

   sscanf(Cmd, "%x %d", &Data, &Word);
   sscanf(Cmd, "%x %d", &Data, &Word);

-
+  

   if (Word > 15) {
   if (Word > 15) {

-       PrintAndLog("Word must be between 0 and 15");
-       return 1;
-  }    
-
-  PrintAndLog("Writting word %d with data %08X", Word, Data);
-
+    PrintAndLog("Word must be between 0 and 15");
+    return 1;
+  }
+  
+  PrintAndLog("Writing word %d with data %08X", Word, Data);
+  

   c.cmd = CMD_EM4X_WRITE_WORD;
   c.d.asBytes[0] = 0x0; //Normal mode
   c.arg[0] = Data;
   c.cmd = CMD_EM4X_WRITE_WORD;
   c.d.asBytes[0] = 0x0; //Normal mode
   c.arg[0] = Data;


@@ -496,20 +629,20 @@ int CmdWriteWord(const char *Cmd)
 
 int CmdWriteWordPWD(const char *Cmd)
 {
 
 int CmdWriteWordPWD(const char *Cmd)
 {

-  int Word = 8; //default to invalid word
-  int Data = 0xFFFFFFFF; //default to blank data 
+  int Word = 16; //default to invalid word
+  int Data = 0xFFFFFFFF; //default to blank data

   int Password = 0xFFFFFFFF; //default to blank password
   UsbCommand c;
   int Password = 0xFFFFFFFF; //default to blank password
   UsbCommand c;

-
+  

   sscanf(Cmd, "%x %d %x", &Data, &Word, &Password);
   sscanf(Cmd, "%x %d %x", &Data, &Word, &Password);

-
+  

   if (Word > 15) {
   if (Word > 15) {

-       PrintAndLog("Word must be between 0 and 15");
-       return 1;
-  }    
-
-  PrintAndLog("Writting word %d with data %08X and password %08X", Word, Data, Password);
-
+    PrintAndLog("Word must be between 0 and 15");
+    return 1;
+  }
+  
+  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.arg[0] = Data;
   c.cmd = CMD_EM4X_WRITE_WORD;
   c.d.asBytes[0] = 0x1; //Password mode
   c.arg[0] = Data;


@@ -519,19 +652,19 @@ int CmdWriteWordPWD(const char *Cmd)
   return 0;
 }
 
   return 0;
 }
 

-

 static command_t CommandTable[] =
 {
 static command_t CommandTable[] =
 {

-  {"help",         CmdHelp,         1, "This help"},
-  {"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"},
-  {"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"},
-  {"writeword",    CmdWriteWord,    1, "<Data> <Word> -- Write EM4xxx word data"},
-  {"writewordPWD", CmdWriteWordPWD, 1, "<Data> <Word> <Password> -- Write EM4xxx word data in password mode"},
+  {"help", CmdHelp, 1, "This help"},
+  {"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"},
+  {"wrpwd", CmdWriteWordPWD, 1, "<Data> <Word 1-15> <Password> -- Write EM4xxx word data in password mode"},

   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };