ADD: first try to implement crc-16 for Legic Advant *not working yet* Can't verify it.

[proxmark3-svn] / client / cmdlfawid.c

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index e7dee935f539698f73edf7d737e4916483a3fb5f..d98dee4f9356f57a55c30e08fb12eb35f7a4b061 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);
 


@@ -67,8 +67,9 @@ 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 :");


@@ -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);
        num_to_bytebits(cn, 16, wiegand+8);
 
        wiegand_add_parity(pre+8, wiegand, 24);

-

        size_t bitLen = addParity(pre, AWIDBits+8, 66, 4, 1);
        size_t bitLen = addParity(pre, AWIDBits+8, 66, 4, 1);

+

        if (bitLen != 88) return 0;
        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) {
        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);
        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();
        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);
        
        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");
        
        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();
        
        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


@@ -257,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;
 }