FIX: the lua script hf_reader.lua now works with 14B tags.

[proxmark3-svn] / client / cmdlfawid.c

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 53980b237de879209db2cb354c9a975edbd9e323..6349fec7f0ea53cafc5f592318dc5ab940515790 100644 (file)
--- 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 "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);
 
  
 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("");
        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;
        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("");
        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");
        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){
 }
 
 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("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("");
        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;
        PrintAndLog("");
        PrintAndLog("Sample  : lf awid brute 224");
        return 0;


@@ -213,7 +214,7 @@ int CmdAWIDBrute(const char *Cmd){
        fc =  param_get8(Cmd, 0);
        if ( fc == 0) return usage_lf_awid_brute();
        
        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
        PrintAndLog("Press pm3-button to abort simulation or run another command");
 
        uint64_t arg1 = (10<<8) + 8; // fcHigh = 10, fcLow = 8


@@ -254,6 +255,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdLFAWID(const char *Cmd) {
 };
 
 int CmdLFAWID(const char *Cmd) {

+       clearCommandBuffer();

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