CHG: moved to header file

[proxmark3-svn] / client / cmdlfhid.c

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index b9d4b75e9067b78fa4af8f08a5985ac8de6c389a..3c0faf3e8e74d9344d7a6c86b307a32cbd9c6f07 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -8,54 +8,95 @@
 // Low frequency HID commands
 //-----------------------------------------------------------------------------
 
 // Low frequency HID commands
 //-----------------------------------------------------------------------------
 

-#include <stdio.h>
-#include <string.h>
-#include "proxmark3.h"
-#include "ui.h"
-#include "graph.h"
-#include "cmdparser.h"

 #include "cmdlfhid.h"
 #include "cmdlfhid.h"

-#include "util.h"
-#include "cmdmain.h"

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

-int usage_hid_wiegand(){
-       PrintAndLog("Usage: lf hid wiegand [h] [formatlenght] [oem] [FacilityCode] [cardnumber]");
-       PrintAndLog("This command converts FC/Cardnum to wiegand code");
+int usage_lf_hid_wiegand(void){
+       PrintAndLog("This command converts facility code/card number to Wiegand code");
+       PrintAndLog("Usage: lf hid wiegand [h] [OEM] [FC] [CN]");
+
+       PrintAndLog("Options:");
+       PrintAndLog("       h             - This help");
+       PrintAndLog("       OEM           - OEM number / site code");
+       PrintAndLog("       FC            - facility code");
+       PrintAndLog("       CN            - card number");
+       PrintAndLog("Examples:");
+       PrintAndLog("      lf hid wiegand 0 101 2001");
+       return 0;
+}
+int usage_lf_hid_sim(void){
+       PrintAndLog("HID Tag simulator");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf hid sim [h] [ID]");
+       PrintAndLog("Options:");
+       PrintAndLog("       h   - This help");
+       PrintAndLog("       ID  - HID id");
+       PrintAndLog("Examples:");
+       PrintAndLog("      lf hid sim 224");
+       return 0;
+}
+int usage_lf_hid_clone(void){
+       PrintAndLog("Clone HID to T55x7.  Tag must be on antenna. ");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf hid clone [h] [ID] <L>");

        PrintAndLog("Options:");
        PrintAndLog("Options:");

-       PrintAndLog("       h                   - This help");
-       PrintAndLog("       formatlen   - Format length,  26|34|35|37|44|84");
-       PrintAndLog("       oem                 - Oem number");
-       PrintAndLog("       facilitynum - Facility number");
-       PrintAndLog("       cardnum             - Card number");
+       PrintAndLog("       h   - This help");
+       PrintAndLog("       ID  - HID id");
+       PrintAndLog("       L   - 84bit ID");

        PrintAndLog("Examples:");
        PrintAndLog("Examples:");

-       PrintAndLog("      lf hid wiegand 26 0 101 2001");
+       PrintAndLog("      lf hid clone 224");
+       PrintAndLog("      lf hid clone 224 L");

        return 0;
 }
        return 0;
 }

+int usage_lf_hid_brute(void){
+       PrintAndLog("Enables bruteforce of HID readers with specified facility code.");
+       PrintAndLog("This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
+       PrintAndLog("if cardnumber is not given, it starts with 1 and goes up to 65535");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf hid brute [h] a <format> f <facility-code> c <cardnumber> d <delay>");
+       PrintAndLog("Options :");
+       PrintAndLog("       h                 :  This help");   
+       PrintAndLog("       a <format>        :  26|33|34|35|37|40|44|84");
+       PrintAndLog("       f <facility-code> :  8-bit value HID facility code");
+       PrintAndLog("       c <cardnumber>    :  (optional) cardnumber to start with, max 65535");
+       PrintAndLog("       d <delay>         :  delay betweens attempts in ms. Default 1000ms");
+       PrintAndLog("");
+       PrintAndLog("Samples:");
+       PrintAndLog("       lf hid brute a 26 f 224");
+       PrintAndLog("       lf hid brute a 26 f 21 d 2000");
+       PrintAndLog("       lf hid brute a 26 f 21 c 200 d 2000");
+       return 0;
+}
+
+static int sendPing(void){
+       UsbCommand ping = {CMD_PING, {1, 2, 3}};
+       SendCommand(&ping);
+       SendCommand(&ping);     
+       SendCommand(&ping);     
+       clearCommandBuffer();
+       UsbCommand resp;
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
+               return 0;
+       return 1;
+}
+static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bs){
+
+       PrintAndLog("Trying FC: %u; CN: %u", fc, cn);
+       
+       calcWiegand( fmtlen, fc, cn, bs);

 
 

-/*
-int CmdHIDDemod(const char *Cmd)
-{
-  if (GraphTraceLen < 4800) {
-    PrintAndLog("too short; need at least 4800 samples");
-    return 0;
-  }
-
-  GraphTraceLen = 4800;
-  for (int i = 0; i < GraphTraceLen; ++i) {
-    if (GraphBuffer[i] < 0) {
-      GraphBuffer[i] = 0;
-    } else {
-      GraphBuffer[i] = 1;
-    }
-  }
-  RepaintGraphWindow();
-  return 0;
+       uint64_t arg1 = bytebits_to_byte(bs,32);
+       uint64_t arg2 = bytebits_to_byte(bs+32,32);
+       UsbCommand c = {CMD_HID_SIM_TAG, {arg1, arg2, 0}}; 
+       clearCommandBuffer();
+       SendCommand(&c);
+       msleep(delay);
+       sendPing();
+       return TRUE;

 }
 }

-*/
-int CmdHIDDemodFSK(const char *Cmd)
-{
+
+int CmdHIDDemodFSK(const char *Cmd) {

        int findone = ( Cmd[0] == '1' ) ? 1 : 0;
        UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0 , 0}};
        clearCommandBuffer();
        int findone = ( Cmd[0] == '1' ) ? 1 : 0;
        UsbCommand c = {CMD_HID_DEMOD_FSK, {findone, 0 , 0}};
        clearCommandBuffer();


@@ -63,11 +104,13 @@ int CmdHIDDemodFSK(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int CmdHIDSim(const char *Cmd)
-{
+int CmdHIDSim(const char *Cmd) {

        unsigned int hi = 0, lo = 0;
        int n = 0, i = 0;
 
        unsigned int hi = 0, lo = 0;
        int n = 0, i = 0;
 

+       uint8_t ctmp = param_getchar(Cmd, 0);
+       if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_sim();
+       

        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
                hi = (hi << 4) | (lo >> 28);
                lo = (lo << 4) | (n & 0xf);
        while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
                hi = (hi << 4) | (lo >> 28);
                lo = (lo << 4) | (n & 0xf);


@@ -82,12 +125,15 @@ int CmdHIDSim(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int CmdHIDClone(const char *Cmd)
-{
-       unsigned int hi2 = 0, hi = 0, lo = 0;
+int CmdHIDClone(const char *Cmd) {
+       
+       uint32_t hi2 = 0, hi = 0, lo = 0;

        int n = 0, i = 0;
        UsbCommand c;
 
        int n = 0, i = 0;
        UsbCommand c;
 

+       uint8_t ctmp = param_getchar(Cmd, 0);
+       if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_clone();
+

        if (strchr(Cmd,'l') != 0) {
                while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
                        hi2 = (hi2 << 4) | (hi >> 28);
        if (strchr(Cmd,'l') != 0) {
                while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
                        hi2 = (hi2 << 4) | (hi >> 28);


@@ -119,191 +165,283 @@ int CmdHIDClone(const char *Cmd)
        SendCommand(&c);
        return 0;
 }
        SendCommand(&c);
        return 0;
 }

-
-static void getParity26(uint32_t *hi, uint32_t *lo){
-       uint32_t result = 0;
-       int i;
-       // even parity
-       for (i = 24;i >= 13;i--)
-               result ^= (*lo >> i) & 1;
-       // even parity 26th bit
-       *lo |= result << 25;
-
-       // odd parity 
-       result = 0;
-       for (i = 12;i >= 1;i--)
-               result ^= (*lo >> i) & 1;
-       *lo |= !result;
-}
-static void getParity34(uint32_t *hi, uint32_t *lo){
-       uint32_t result = 0;
-       int i;
-
-       // even parity 
-       for (i = 7;i >= 0;i--)
-               result ^= (*hi >> i) & i;
-       for (i = 31;i >= 24;i--)
-               result ^= (*lo >> i) & 1;
-
-       *hi |= result << 2; 
-
-       // odd parity bit
-       result = 0;
-       for (i = 23;i >= 1;i--)
-               result ^= (*lo >> i) & 1;
-
-       *lo |= !result;
-}
-static void getParity35(uint32_t *hi, uint32_t *lo){
-       *hi = *hi;
-}
-static void getParity37S(uint32_t *hi,uint32_t *lo){
-       uint32_t result = 0;
-       uint8_t i;
-
-       // even parity
-       for (i = 4; i >= 0; i--)
-               result ^= (*hi >> i) & 1;
-       
-       for (i = 31; i >= 20; i--)
-               result ^= (*lo >> i) & 1;
-
-       *hi |= result;
-
-       // odd parity
-       result = 0;
-       for (i = 19; i >= 1; i--)
-               result ^= (*lo >> i) & 1;
-
-       *lo |= result;
-}
-static void getParity37H(uint32_t *hi, uint32_t *lo){
-       uint32_t result = 0;
-       int i;
-
-       // even parity
-       for (i = 4;i >= 0;i--)
-               result ^= (*hi >> i) & 1;
-       for (i = 31;i >= 20;i--)
-               result ^= (*lo >> i) & 1;
-       *hi |= result << 4;
-
-       // odd parity
-       result = 0;
-       for (i = 19;i >= 1;i--)
-               result ^= (*lo >> i) & 1;
-       *lo |= result;
+// struct to handle wiegand
+typedef struct {
+       uint8_t  FormatLen;
+       uint8_t  SiteCode;
+       uint8_t  FacilityCode;
+       uint8_t  CardNumber;
+       uint8_t* Wiegand;
+       size_t   Wiegand_n;
+ } wiegand_t;
+
+static void addHIDMarker(uint8_t fmtlen, uint8_t *out) {    
+       switch(fmtlen) {
+               case 26:{
+                       uint8_t len = 37;
+                       uint8_t tmp[len];
+                       memset(tmp, 0, len);
+                       uint8_t idx = 37-fmtlen;
+                       memcpy(tmp+idx, out, fmtlen);
+                       tmp[idx] = 1; // start sentinel?
+                       tmp[0]  = 1; // bit indicates that a format smaller than 37 is used
+                       memcpy(out, tmp, len);
+                       break;
+               }
+               case 34:
+                               // set bit format for less than 37 bit format
+                               // 5+32= 1
+                               //*hi = (1 << 5) | (fc >> 15);
+                       break;
+               default:break;
+       }

 }
 
 }
 

-static void calc26(uint16_t fc, uint32_t cardno, uint32_t *hi, uint32_t *lo){
-   *lo = ((cardno & 0xFFFF) << 1) | ((fc & 0xFF) << 17) | (1 << 26);
-   *hi = (1 << 5);
-}
-static void calc34(uint16_t fc, uint32_t cardno, uint32_t *hi, uint32_t *lo){
-  // put card number first bit 1 .. 20 //
-  *lo = ((cardno & 0X000F7FFF) << 1) | ((fc & 0XFFFF) << 17);
-  // set bit format for less than 37 bit format
-  *hi = (1 << 5) | (fc >> 15);
+// static void getParity34(uint32_t *hi, uint32_t *lo){
+       // uint32_t result = 0;
+       // int i;
+
+       // // even parity 
+       // for (i = 7;i >= 0;i--)
+               // result ^= (*hi >> i) & i;
+       // for (i = 31;i >= 24;i--)
+               // result ^= (*lo >> i) & 1;
+
+       // *hi |= result << 2; 
+
+       // // odd parity bit
+       // result = 0;
+       // for (i = 23;i >= 1;i--)
+               // result ^= (*lo >> i) & 1;
+
+       // *lo |= !result;
+// }
+// static void getParity37H(uint32_t *hi, uint32_t *lo){
+       // uint32_t result = 0;
+       // int i;
+
+       // // even parity
+       // for (i = 4;i >= 0;i--)
+               // result ^= (*hi >> i) & 1;
+       // for (i = 31;i >= 20;i--)
+               // result ^= (*lo >> i) & 1;
+       // *hi |= result << 4;
+
+       // // odd parity
+       // result = 0;
+       // for (i = 19;i >= 1;i--)
+               // result ^= (*lo >> i) & 1;
+       // *lo |= result;
+// }
+
+//static void calc26(uint16_t fc, uint32_t cardno,  uint8_t *out){
+static void calc26(uint16_t fc, uint32_t cardno, uint8_t *out){
+       uint8_t wiegand[24];
+       num_to_bytebits(fc, 8, wiegand);
+       num_to_bytebits(cardno, 16, wiegand+8);
+       wiegand_add_parity(out,  wiegand, sizeof(wiegand) );

 }
 }

-static void calc35(uint16_t fc, uint32_t cardno, uint32_t *hi, uint32_t *lo){
-       *lo = ((cardno & 0xFFFFF) << 1) | fc << 21; 
-       *hi = (1 << 5) | ((fc >> 11) & 1);  
+// static void calc33(uint16_t fc, uint32_t cardno,  uint8_t *out){
+// }
+static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out){
+       uint8_t wiegand[32];
+       num_to_bytebits(fc, 16, wiegand);
+       num_to_bytebits(cardno, 16, wiegand + 16);
+       wiegand_add_parity(out,  wiegand, sizeof(wiegand) );    

 }
 }

-static void calc37S(uint16_t sc, uint32_t cn, uint32_t *hi, uint32_t *lo){
-       // SC 2 - 17   - 16 bit  
-       // CN 18 - 36  - 19 bit
+// static void calc35(uint16_t fc, uint32_t cardno,  uint8_t *out){
+       // *lo = ((cardno & 0xFFFFF) << 1) | fc << 21; 
+       // *hi = (1 << 5) | ((fc >> 11) & 1);  
+// }
+static void calc37S(uint16_t fc, uint32_t cardno, uint8_t *out){
+       // FC 2 - 17   - 16 bit  
+       // cardno 18 - 36  - 19 bit

        // Even P1   1 - 19
        // Odd  P37  19 - 36
        // Even P1   1 - 19
        // Odd  P37  19 - 36

-
-       sc = sc & 0xFFFF;
-       *lo = ( (sc << 20) | (cn & 0x7FFFF) << 1);
-       *hi = (sc >> 12);
+       uint8_t wiegand[35];
+       num_to_bytebits(fc, 16, wiegand);
+       num_to_bytebits(cardno, 19, wiegand + 16);
+       wiegand_add_parity(out,  wiegand, sizeof(wiegand) );

 }
 }

-static void calc37H(uint64_t cn, uint32_t *hi, uint32_t *lo){
+static void calc37H(uint64_t cardno, uint8_t *out){

        // SC NONE
        // SC NONE

-       // CN 1-35 34 bits 
+       // cardno 1-35 34 bits 

        // Even Parity  0th bit  1-18
        // Odd  Parity 36th bit 19-35
        // Even Parity  0th bit  1-18
        // Odd  Parity 36th bit 19-35

-       cn = (cn & 0x00000003FFFFFFFF);
-       *lo = (cn << 1);
-       *hi = (cn >> 31);
-}
-static void calc40(uint64_t cn, uint32_t *hi, uint32_t *lo){
-       cn = (cn & 0xFFFFFFFFFF);
-       *lo = ((cn & 0xFFFFFFFF) << 1 ); 
-       *hi = (cn >> 31);  
+       uint8_t wiegand[37];
+       num_to_bytebits( (uint32_t)(cardno >> 32), 2, wiegand);
+       num_to_bytebits( (uint32_t)(cardno >> 0), 32, wiegand + 2);
+       wiegand_add_parity(out,  wiegand, sizeof(wiegand) );
+       
+       printf("%x %x\n", (uint32_t)(cardno >> 32), (uint32_t)cardno );

 }
 }

+// static void calc40(uint64_t cardno,  uint8_t *out){
+       // cardno = (cardno & 0xFFFFFFFFFF);
+       // *lo = ((cardno & 0xFFFFFFFF) << 1 ); 
+       // *hi = (cardno >> 31);  
+// }
+
+void calcWiegand(uint8_t fmtlen, uint16_t fc, uint64_t cardno, uint8_t *bits){
+        uint32_t cn32 = (cardno & 0xFFFFFFFF);
+        switch ( fmtlen ) {
+               case 26: calc26(fc, cn32, bits); break;
+               // case 33 : calc33(fc, cn32, bits); break;
+               case 34: calc34(fc, cn32, bits); break;
+               // case 35 : calc35(fc, cn32, bits); break;
+               case 37: calc37S(fc, cn32, bits); break;
+               case 38: calc37H(cardno, bits); break;
+               // case 40 : calc40(cardno, bits);      break;
+               // case 44 : { break; }
+               // case 84 : { break; }
+               default: break;
+       }
+}      

 
 

-int CmdHIDWiegand(const char *Cmd)
-{
-       uint32_t oem;
-       uint32_t fmtlen = 0;
-       uint32_t fc, lo = 0, hi = 0;
-       uint64_t cn = 0;
-       uint32_t cardnum = 0;
+int CmdHIDWiegand(const char *Cmd) {
+       uint32_t oem = 0, fc = 0;
+       uint64_t cardnum = 0;
+       uint64_t blocks = 0, wiegand = 0; 
+
+       uint8_t bits[96];
+       uint8_t *bs = bits;
+       memset(bs, 0, sizeof(bits));

        
        

-       //uint32_t temp, p

        uint8_t ctmp = param_getchar(Cmd, 0);
        uint8_t ctmp = param_getchar(Cmd, 0);

-       if ( strlen(Cmd) < 0 || strlen(Cmd) < 4 || ctmp == 'H' || ctmp == 'h' ) return usage_hid_wiegand();
-
-       fmtlen = param_get8(Cmd, 0);    
-       oem = param_get8(Cmd, 1);
-       fc = param_get32ex(Cmd, 2, 0, 10);
-       cn = param_get64ex(Cmd, 3, 0, 10);
-
-       switch ( fmtlen ) {
-               case 26 : {
-                       cardnum = (cn & 0xFFFFFFFF);
-                       calc26(fc, cardnum, &hi, &lo);
-                       getParity26(&hi, &lo);          
+       if ( strlen(Cmd) == 0 || strlen(Cmd) < 3 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_hid_wiegand();
+
+       oem = param_get8(Cmd, 0);
+       fc = param_get32ex(Cmd, 1, 0, 10);
+       cardnum = param_get64ex(Cmd, 2, 0, 10);
+
+       uint8_t fmtlen[] = {26,33,34,35,37,38,40};
+       
+       PrintAndLog("HID | OEM | FC   | CN      |  Wiegand  |  HID Formatted");
+       PrintAndLog("----+-----+------+---------+-----------+--------------------");
+       for (uint8_t i = 0; i < sizeof(fmtlen); i++){
+               memset(bits, 0x00, sizeof(bits));
+               calcWiegand( fmtlen[i], fc, cardnum, bs);
+               printf("ice:: %s", sprint_bin(bs, fmtlen[i]));
+               wiegand = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs+32, 32);
+               
+               addHIDMarker(fmtlen[i], bs);    
+               printf("ice:: %s", sprint_bin(bs, 37));
+               blocks = (uint64_t)bytebits_to_byte(bs, 32) << 32 | bytebits_to_byte(bs+32, 32);
+               uint8_t shifts = 64-fmtlen[i];          
+               wiegand >>= shifts;
+               
+               PrintAndLog(" %u | %03u | %03u  | %llu  | %llX  |  %llX",
+                       fmtlen[i],
+                       oem,
+                       fc,
+                       cardnum,
+                       wiegand,
+                       blocks
+                       );
+       }
+       PrintAndLog("----+-----+-----+-------+-----------+--------------------");
+       return 0;
+}
+
+int CmdHIDBrute(const char *Cmd){
+       
+       bool errors = false;
+       uint32_t fc = 0, cn = 0, delay = 1000;
+       uint8_t fmtlen = 0;
+       uint8_t bits[96];
+       uint8_t *bs = bits;
+       memset(bs, 0, sizeof(bits));
+       uint8_t cmdp = 0;
+               
+       while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+               switch(param_getchar(Cmd, cmdp)) {
+               case 'h':
+               case 'H':
+                       return usage_lf_hid_brute();
+               case 'f':
+               case 'F':
+                       fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
+                       if ( !fc )
+                               errors = true;
+                       cmdp += 2;

                        break;
                        break;

-               }
-               case 34 : {
-                       cardnum = (cn & 0xFFFFFFFF);
-                       calc34(fc, cardnum, &hi, &lo);
-                       getParity34(&hi, &lo);          
+               case 'd':
+               case 'D':
+                       // delay between attemps,  defaults to 1000ms. 
+                       delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
+                       cmdp += 2;

                        break;
                        break;

-               }
-               case 35 : {
-                       cardnum = (cn & 0xFFFFFFFF);
-                       calc35(fc, cardnum, &hi, &lo);
-                       getParity35(&hi, &lo);
+               case 'c':
+               case 'C':
+                       cn = param_get32ex(Cmd, cmdp+1, 0, 10);
+                       // truncate cardnumber.
+                       cn &= 0xFFFF;
+                       cmdp += 2;

                        break;
                        break;

-               }
-               case 37 : {
-                       cardnum = (cn & 0xFFFFFFFF);
-                       calc37S(fc, cardnum, &hi, &lo);
-                       getParity37S(&hi, &lo);
+               case 'a':
+               case 'A':
+                       fmtlen = param_get8(Cmd, cmdp+1);                       
+                       cmdp += 2;
+                       bool is_ftm_ok = FALSE;
+                       uint8_t ftms[] = {26,33,34,35,37};
+                       for ( uint8_t i = 0; i < sizeof(ftms); i++){
+                               if ( ftms[i] == fmtlen ) {
+                                       is_ftm_ok = TRUE;
+                               }
+                       }
+                       // negated
+                       errors = !is_ftm_ok;

                        break;
                        break;

-               }
-               case 38 : { 
-                       cardnum = (cn & 0xFFFFFFFF);
-                       calc37H(cardnum, &hi, &lo);
-                       getParity37H(&hi, &lo);
+               default:
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                       errors = true;

                        break;
                }
                        break;
                }

-               case 40 : {
-                       calc40(cn, &hi, &lo);
-                       break;
+       }
+       if ( fc == 0 ) errors = true;
+       if ( errors ) return usage_lf_hid_brute();
+       
+       PrintAndLog("Brute-forcing HID reader");
+       PrintAndLog("Press pm3-button to abort simulation or run another command");
+       
+       uint16_t up = cn;
+       uint16_t down = cn;
+       
+       for (;;){
+               
+               if ( offline ) {
+                       printf("Device offline\n");
+                       return  2;

                }
                }

-               case 44 : { break; }
-               case 84 : { break; }
+               
+               if (ukbhit()) {
+                       PrintAndLog("aborted via keyboard!");
+                       return sendPing();
+               }
+               
+               // Do one up
+               if ( up < 0xFFFF )
+                       if ( !sendTry(fmtlen, fc, up++, delay, bs)) return 1;
+               
+               // Do one down  (if cardnumber is given)
+               if ( cn > 1 )
+                       if ( down > 1 )
+                               if ( !sendTry(fmtlen, fc, --down, delay, bs)) return 1;

        }
        }

-       PrintAndLog("HID %d bit | FC: %d CN: %lld | Wiegand Code: %08X%08X", fmtlen, fc, cn, hi, lo);

        return 0;
 }
 
 static command_t CommandTable[] = {
        return 0;
 }
 
 static command_t CommandTable[] = {

-       {"help",      CmdHelp,        1, "This help"},
-       //{"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},
-       {"fskdemod",  CmdHIDDemodFSK, 0, "['1'] Realtime HID FSK demodulator (option '1' for one tag only)"},
-       {"sim",       CmdHIDSim,      0, "<ID> -- HID tag simulator"},
-       {"clone",     CmdHIDClone,    0, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},
-       {"wiegand",  CmdHIDWiegand,  1, "<oem> <fmtlen> <fc> <cardnum> -- convert facilitycode, cardnumber to Wiegand code"},
+       {"help",    CmdHelp,        1, "This help"},
+       {"fskdemod",CmdHIDDemodFSK, 0, "Realtime HID FSK demodulator"},
+       {"sim",     CmdHIDSim,      0, "HID tag simulator"},
+       {"clone",   CmdHIDClone,    0, "Clone HID to T55x7"},
+       {"wiegand", CmdHIDWiegand,  1, "Convert facility code/card number to Wiegand code"},
+       {"brute",   CmdHIDBrute,        0, "Bruteforce card number against reader"},

        {NULL, NULL, 0, NULL}
 };
 
 int CmdLFHID(const char *Cmd) {
        {NULL, NULL, 0, NULL}
 };
 
 int CmdLFHID(const char *Cmd) {

+       clearCommandBuffer();

        CmdsParse(CommandTable, Cmd);
        return 0;
 }
        CmdsParse(CommandTable, Cmd);
        return 0;
 }