Finishing touches on new mifare classic hack rework

[proxmark3-svn] / client / cmdlfhid.c

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index d077147a41dd88dd0174b7bd4a4615ea5d0afe80..dd413d2e2899cd97eaed460e15073b8d17eb764f 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -46,57 +46,56 @@ int CmdHIDDemodFSK(const char *Cmd)
 }
 
 int CmdHIDSim(const char *Cmd)
 }
 
 int CmdHIDSim(const char *Cmd)

+{
+  unsigned int hi = 0, lo = 0;
+  int n = 0, i = 0;
+
+  while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+    hi = (hi << 4) | (lo >> 28);
+    lo = (lo << 4) | (n & 0xf);
+  }
+
+  PrintAndLog("Emulating tag with ID %x%16x", hi, lo);
+
+  UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
+  SendCommand(&c);
+  return 0;
+}
+
+int CmdHIDClone(const char *Cmd)

 {
   unsigned int hi2 = 0, hi = 0, lo = 0;
   int n = 0, i = 0;
   UsbCommand c;
 
   if (strchr(Cmd,'l') != 0) {
 {
   unsigned int hi2 = 0, hi = 0, lo = 0;
   int n = 0, i = 0;
   UsbCommand c;
 
   if (strchr(Cmd,'l') != 0) {

-    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+       while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {

       hi2 = (hi2 << 4) | (hi >> 28);
       hi = (hi << 4) | (lo >> 28);
       lo = (lo << 4) | (n & 0xf);
     }
       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);
     PrintAndLog("Cloning tag with long ID %x%08x%08x", hi2, hi, lo);

-    
+

     c.d.asBytes[0] = 1;
     c.d.asBytes[0] = 1;

-       }
-       else {
-    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+  }
+  else {
+       while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {

       hi = (hi << 4) | (lo >> 28);
       lo = (lo << 4) | (n & 0xf);
     }
       hi = (hi << 4) | (lo >> 28);
       lo = (lo << 4) | (n & 0xf);
     }

-    
+

     PrintAndLog("Cloning tag with ID %x%08x", hi, lo);
     PrintAndLog("Cloning tag with ID %x%08x", hi, lo);

-    
+

     hi2 = 0;
     c.d.asBytes[0] = 0;
   }
     hi2 = 0;
     c.d.asBytes[0] = 0;
   }

-  
-  c.cmd = CMD_HID_SIM_TAG;
+
+  c.cmd = CMD_HID_CLONE_TAG;

   c.arg[0] = hi2;
   c.arg[1] = hi;
   c.arg[2] = lo;
   c.arg[0] = hi2;
   c.arg[1] = hi;
   c.arg[2] = lo;

-  
-//  UsbCommand c = {CMD_HID_SIM_TAG, {hi, lo, 0}};
-  SendCommand(&c);
-  return 0;
-}
-
-int CmdHIDClone(const char *Cmd)
-{
-  unsigned int hi = 0, lo = 0;
-  int n = 0, i = 0;
-
-  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);

 
 

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

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