github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: textual fixes in help text

Browse source 
CHG: better exit message for 'lf awid bruteforce'
This commit is contained in:
iceman1001 2016-08-09 09:10:26 +02:00
commit 8a5b3c2a45
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/cmdlfawid.c
View file

@ -311,15 +311,23 @@ int CmdAWIDBrute(const char *Cmd){
for ( uint16_t cn = 1; cn < 0xFFFF; ++cn){ for ( uint16_t cn = 1; cn < 0xFFFF; ++cn){
if (ukbhit()) { if (ukbhit()) {
PrintAndLog("aborted via keyboard!"); UsbCommand resp;
UsbCommand ping = {CMD_PING}; UsbCommand ping = {CMD_PING};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&ping); SendCommand(&ping);
if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
PrintAndLog("aborted via keyboard!");
return 0;
}
PrintAndLog("Device didnt respond to ABORT");
return 1; return 1;
} }
PrintAndLog("Trying FC: %u; CN: %u", fc, cn); PrintAndLog("Trying FC: %u; CN: %u", fc, cn);
(void)getAWIDBits(fmtlen, fc, cn, bs); if ( !getAWIDBits(fmtlen, fc, cn, bs)) {
PrintAndLog("Error with tag bitstream generation.");
return 1;
}
memcpy(c.d.asBytes, bs, size); memcpy(c.d.asBytes, bs, size);
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
@ -332,9 +340,9 @@ int CmdAWIDBrute(const char *Cmd){
static command_t CommandTable[] = { static command_t CommandTable[] = {
{"help", CmdHelp, 1, "This help"}, {"help", CmdHelp, 1, "This help"},
{"fskdemod", CmdAWIDDemodFSK, 0, "['1'] Realtime AWID FSK demodulator (option '1' for one tag only)"}, {"fskdemod", CmdAWIDDemodFSK, 0, "['1'] Realtime AWID FSK demodulator (option '1' for one tag only)"},
{"sim", CmdAWIDSim, 0, "<Facility-Code> <Card Number> -- AWID tag simulator"}, {"sim", CmdAWIDSim, 0, "<facility-code> <card number> -- AWID tag simulator"},
{"clone", CmdAWIDClone, 0, "<Facility-Code> <Card Number> <Q5> -- Clone AWID to T55x7"}, {"clone", CmdAWIDClone, 0, "<facility-code> <card number> <Q5> -- Clone AWID to T55x7"},
{"brute", CmdAWIDBrute, 0, "<Facility-Code> -- bruteforce card number"}, {"brute", CmdAWIDBrute, 0, "<format> <facility-code> <delay> -- bruteforce card number given a FC"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };