X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9bfd93ec1501d9fd7ff09684fe881511d7d60fc9..3d4207f3b673c479e572b960d5a307b1f73a912d:/client/cmdlfawid.c?ds=sidebyside

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 1550af02..43f54a6f 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -311,15 +311,23 @@ int CmdAWIDBrute(const char *Cmd){
 	for ( uint16_t cn = 1; cn < 0xFFFF; ++cn){
 
 		if (ukbhit()) {
-			PrintAndLog("aborted via keyboard!");
+			UsbCommand resp;
 			UsbCommand ping = {CMD_PING};
 			clearCommandBuffer();
 			SendCommand(&ping);
+			if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+				PrintAndLog("aborted via keyboard!");
+				return 0;
+			}
+			PrintAndLog("Device didnt respond to ABORT");
 			return 1;
 		}
 
 		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);
 		clearCommandBuffer();
 		SendCommand(&c);
@@ -332,9 +340,9 @@ int CmdAWIDBrute(const char *Cmd){
 static command_t CommandTable[] = {
 	{"help",      CmdHelp,         1, "This help"},
 	{"fskdemod",  CmdAWIDDemodFSK, 0, "['1'] Realtime AWID FSK demodulator (option '1' for one tag only)"},
-	{"sim",       CmdAWIDSim,      0, "<Facility-Code> <Card Number> -- AWID tag simulator"},
-	{"clone",     CmdAWIDClone,    0, "<Facility-Code> <Card Number> <Q5> -- Clone AWID to T55x7"},
-	{"brute",	  CmdAWIDBrute,	   0, "<Facility-Code> -- bruteforce card number"},
+	{"sim",       CmdAWIDSim,      0, "<facility-code> <card number> -- AWID tag simulator"},
+	{"clone",     CmdAWIDClone,    0, "<facility-code> <card number> <Q5> -- Clone AWID to T55x7"},
+	{"brute",	  CmdAWIDBrute,	   0, "<format> <facility-code> <delay> -- bruteforce card number given a FC"},
 	{NULL, NULL, 0, NULL}
 };