X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/508b37ba9ce74eed6553ce59deb79f49b5311d11..77dee16f6464eac50c72c6f28c4bcd10402cdba3:/client/cmdlfawid.c

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index e7dee935..6349fec7 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -19,7 +19,7 @@
 #include "util.h"       // weigandparity
 #include "protocols.h"  // for T55xx config register definitions
 #include "cmdmain.h"
- #include "sleep.h"
+#include "sleep.h"
  
 static int CmdHelp(const char *Cmd);
 
@@ -44,8 +44,8 @@ int usage_lf_awid_sim(void) {
 	PrintAndLog("");
 	PrintAndLog("Usage:  lf awid sim <Facility-Code> <Card-Number>");
 	PrintAndLog("Options :");
-	PrintAndLog("  <Facility-Code> :  8-bit value AWID facility code");
-	PrintAndLog("  <Card Number>   : 16-bit value AWID card number");
+	PrintAndLog("  <Facility-Code> :  8-bit value facility code");
+	PrintAndLog("  <Card Number>   : 16-bit value card number");
 	PrintAndLog("");
 	PrintAndLog("Sample : lf awid sim 224 1337");
 	return 0;
@@ -58,8 +58,8 @@ int usage_lf_awid_clone(void) {
 	PrintAndLog("");
 	PrintAndLog("Usage:  lf awid clone <Facility-Code> <Card-Number>");
 	PrintAndLog("Options :");
-	PrintAndLog("  <Facility-Code> : 8-bit value AWID facility code");
-	PrintAndLog("  <Card Number>   : 16-bit value AWID card number");
+	PrintAndLog("  <Facility-Code> : 8-bit value facility code");
+	PrintAndLog("  <Card Number>   : 16-bit value card number");
 	PrintAndLog("  Q5              : optional - clone to Q5 (T5555) instead of T55x7 chip");
 	PrintAndLog("");
 	PrintAndLog("Sample  : lf awid clone 224 1337");
@@ -67,12 +67,13 @@ int usage_lf_awid_clone(void) {
 }
 
 int usage_lf_awid_brute(void){
-	PrintAndLog("Enables bruteforce of AWID26 card with specified facility-code.");
+	PrintAndLog("Enables bruteforce of AWID26 reader with specified facility-code.");
 	PrintAndLog("Per AWID26 format, the facility-code (FC) is 8-bit and the card number is 16-bit.");
+	PrintAndLog("This is a incremental attack against reader.");
 	PrintAndLog("");
 	PrintAndLog("Usage:  lf awid brute <Facility-Code>");
 	PrintAndLog("Options :");
-	PrintAndLog("  <Facility-Code> :  8-bit value AWID facility code");
+	PrintAndLog("  <Facility-Code> :  8-bit value facility code");
 	PrintAndLog("");
 	PrintAndLog("Sample  : lf awid brute 224");
 	return 0;
@@ -101,23 +102,20 @@ int getAWIDBits(uint32_t fc, uint32_t cn, uint8_t	*AWIDBits) {
 	num_to_bytebits(cn, 16, wiegand+8);
 
 	wiegand_add_parity(pre+8, wiegand, 24);
-
 	size_t bitLen = addParity(pre, AWIDBits+8, 66, 4, 1);
+
 	if (bitLen != 88) return 0;
-	//for (uint8_t i = 0; i<3; i++){
-	//	PrintAndLog("DEBUG: %08X", bytebits_to_byte(AWIDBits+(32*i),32));
-	//}
 	return 1;
 }
 
 int CmdAWIDSim(const char *Cmd) {
-	uint32_t fcode = 0, cnum = 0, fc=0, cn=0;
+	uint32_t fcode = 0, cnum = 0, fc = 0, cn = 0;
 	uint8_t bits[96];
 	uint8_t *bs = bits;
 	size_t size = sizeof(bits);
-	memset(bs, 0, size);
+	memset(bs, 0x00, size);
 
-	uint64_t arg1 = (10<<8) + 8; // fcHigh = 10, fcLow = 8
+	uint64_t arg1 = ( 10 << 8 ) + 8; // fcHigh = 10, fcLow = 8
 	uint64_t arg2 = 50; // clk RF/50 invert=0
   
 	if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_awid_sim();
@@ -125,8 +123,8 @@ int CmdAWIDSim(const char *Cmd) {
 	fcode = (fc & 0x000000FF);
 	cnum = (cn & 0x0000FFFF);
 	
-	if (fc!=fcode) PrintAndLog("Facility-Code (%u) truncated to 8-bits: %u", fc, fcode);
-	if (cn!=cnum)  PrintAndLog("Card number (%u) truncated to 16-bits: %u", cn, cnum);
+	if (fc != fcode) PrintAndLog("Facility-Code (%u) truncated to 8-bits: %u", fc, fcode);
+	if (cn != cnum)  PrintAndLog("Card number (%u) truncated to 16-bits: %u", cn, cnum);
 	
 	PrintAndLog("Emulating AWID26 -- FC: %u; CN: %u\n", fcode, cnum);
 	PrintAndLog("Press pm3-button to abort simulation or run another command");
@@ -216,7 +214,7 @@ int CmdAWIDBrute(const char *Cmd){
   	fc =  param_get8(Cmd, 0);
 	if ( fc == 0) return usage_lf_awid_brute();
 	
-	PrintAndLog("Bruteforceing AWID26");
+	PrintAndLog("Bruteforceing AWID26 Reader");
 	PrintAndLog("Press pm3-button to abort simulation or run another command");
 
 	uint64_t arg1 = (10<<8) + 8; // fcHigh = 10, fcLow = 8
@@ -257,6 +255,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdLFAWID(const char *Cmd) {
+	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }