X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/89603cbddc4f9ceb44fe7ef41fec4fcdd989a2d5..87c10b2a0f49b1542258b5a4ed6f83a125c5da8f:/client/cmdlfhid.c diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c index 16209660..d4fd1522 100644 --- a/client/cmdlfhid.c +++ b/client/cmdlfhid.c @@ -127,7 +127,7 @@ int CmdHIDSim(const char *Cmd) { int CmdHIDClone(const char *Cmd) { - unsigned int hi2 = 0, hi = 0, lo = 0; + uint32_t hi2 = 0, hi = 0, lo = 0; int n = 0, i = 0; UsbCommand c; @@ -428,12 +428,15 @@ int CmdHIDBrute(const char *Cmd){ 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 ) { - errors = FALSE; + is_ftm_ok = TRUE; } } + // negated + errors = !is_ftm_ok; break; default: PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); @@ -479,7 +482,7 @@ static command_t CommandTable[] = { {"fskdemod",CmdHIDDemodFSK, 0, "Realtime HID FSK demodulator"}, {"sim", CmdHIDSim, 0, "HID tag simulator"}, {"clone", CmdHIDClone, 0, "Clone HID to T55x7"}, - {"wiegand", CmdHIDWiegand, 0, "Convert facility code/card number to Wiegand code"}, + {"wiegand", CmdHIDWiegand, 1, "Convert facility code/card number to Wiegand code"}, {"brute", CmdHIDBrute, 0, "Bruteforce card number against reader"}, {NULL, NULL, 0, NULL} };