Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / cmdlfhid.c

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 767ea3cc3dec3216489babd45473b83e8656ffbe..c6d54e78e24bbbbbf44f9342cdbb7c6567f278d6 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -9,7 +9,8 @@
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>

-#include "proxusb.h"
+#include <string.h>
+#include "proxmark3.h"

 #include "ui.h"
 #include "graph.h"
 #include "cmdparser.h"
 #include "ui.h"
 #include "graph.h"
 #include "cmdparser.h"


@@ -38,7 +39,10 @@ int CmdHIDDemod(const char *Cmd)
 
 int CmdHIDDemodFSK(const char *Cmd)
 {
 
 int CmdHIDDemodFSK(const char *Cmd)
 {

+  int findone=0;
+       if(Cmd[0]=='1') findone=1;

   UsbCommand c={CMD_HID_DEMOD_FSK};
   UsbCommand c={CMD_HID_DEMOD_FSK};

+  c.arg[0]=findone;

   SendCommand(&c);
   return 0;
 }
   SendCommand(&c);
   return 0;
 }


@@ -54,6 +58,7 @@ int CmdHIDSim(const char *Cmd)
   }
 
   PrintAndLog("Emulating tag with ID %x%16x", hi, lo);
   }
 
   PrintAndLog("Emulating tag with ID %x%16x", hi, lo);

+  PrintAndLog("Press pm3-button to abort simulation");

 
   UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
   SendCommand(&c);
 
   UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
   SendCommand(&c);


@@ -62,17 +67,38 @@ int CmdHIDSim(const char *Cmd)
 
 int CmdHIDClone(const char *Cmd)
 {
 
 int CmdHIDClone(const char *Cmd)
 {

-  unsigned int hi = 0, lo = 0;
+  unsigned int hi2 = 0, hi = 0, lo = 0;

   int n = 0, i = 0;
   int n = 0, i = 0;

+  UsbCommand c;

 
 

-  while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-    hi = (hi << 4) | (lo >> 28);
-    lo = (lo << 4) | (n & 0xf);
+  if (strchr(Cmd,'l') != 0) {
+       while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+      hi2 = (hi2 << 4) | (hi >> 28);
+      hi = (hi << 4) | (lo >> 28);
+      lo = (lo << 4) | (n & 0xf);
+    }
+
+    PrintAndLog("Cloning tag with long ID %x%08x%08x", hi2, hi, lo);
+
+    c.d.asBytes[0] = 1;
+  }
+  else {
+       while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+      hi = (hi << 4) | (lo >> 28);
+      lo = (lo << 4) | (n & 0xf);
+    }
+
+    PrintAndLog("Cloning tag with ID %x%08x", hi, lo);
+
+    hi2 = 0;
+    c.d.asBytes[0] = 0;

   }
 
   }
 

-  PrintAndLog("Cloning tag with ID %x%08x", hi, lo);
+  c.cmd = CMD_HID_CLONE_TAG;
+  c.arg[0] = hi2;
+  c.arg[1] = hi;
+  c.arg[2] = lo;

 
 

-  UsbCommand c = {CMD_HID_CLONE_TAG, {hi, lo}};

   SendCommand(&c);
   return 0;
 }
   SendCommand(&c);
   return 0;
 }


@@ -81,9 +107,9 @@ static command_t CommandTable[] =
 {
   {"help",      CmdHelp,        1, "This help"},
   {"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},
 {
   {"help",      CmdHelp,        1, "This help"},
   {"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},

-  {"fskdemod",  CmdHIDDemodFSK, 0, "Realtime HID FSK demodulator"},
+  {"fskdemod",  CmdHIDDemodFSK, 0, "['1'] Realtime HID FSK demodulator (option '1' for one tag only)"},

   {"sim",       CmdHIDSim,      0, "<ID> -- HID tag simulator"},
   {"sim",       CmdHIDSim,      0, "<ID> -- HID tag simulator"},

-  {"clone",     CmdHIDClone,    0, "<ID> -- Clone HID to T55x7 (tag must be in antenna)"},
+  {"clone",     CmdHIDClone,    0, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},

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