]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdlfawid.c
projects / proxmark3-svn / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
CHG: testing to set 460800 baudrate as default, if it fails, go to 115200 baudrate...
[proxmark3-svn] / client / cmdlfawid.c
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index d98dee4f9356f57a55c30e08fb12eb35f7a4b061..a323f52b098b5e7f46c5d505fcca43f05c97a106 100644 (file)
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -7,78 +7,114 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Low frequency AWID26 commands
+// Low frequency AWID26/50 commands
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-
-#include <stdio.h>      // sscanf
-#include "proxmark3.h"  // Definitions, USB controls, etc
-#include "ui.h"         // PrintAndLog
-#include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "cmdlfawid.h"  // AWID function declarations
 #include "cmdlfawid.h"  // AWID function declarations
-#include "lfdemod.h"    // parityTest
-#include "util.h"       // weigandparity
-#include "protocols.h"  // for T55xx config register definitions
-#include "cmdmain.h"
-#include "sleep.h"
  
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_awid_fskdemod(void) {
  
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_awid_fskdemod(void) {
-       PrintAndLog("Enables AWID26 compatible reader mode printing details of scanned AWID26 tags.");
+       PrintAndLog("Enables AWID compatible reader mode printing details of scanned AWID26 or AWID50 tags.");
        PrintAndLog("By default, values are printed and logged until the button is pressed or another USB command is issued.");
        PrintAndLog("By default, values are printed and logged until the button is pressed or another USB command is issued.");
-       PrintAndLog("If the ['1'] option is provided, reader mode is exited after reading a single AWID26 card.");
+       PrintAndLog("If the [1] option is provided, reader mode is exited after reading a single AWID card.");
        PrintAndLog("");
        PrintAndLog("");
-       PrintAndLog("Usage:  lf awid fskdemod ['1']");
-       PrintAndLog("Options :");
-       PrintAndLog("  1 : (optional) stop after reading a single card");
+       PrintAndLog("Usage:  lf awid fskdemod [h] [1]");
+       PrintAndLog("Options:");
+       PrintAndLog("      h :  This help");    
+       PrintAndLog("      1 : (optional) stop after reading a single card");
        PrintAndLog("");
        PrintAndLog("");
-       PrintAndLog("Samples : lf awid fskdemod");
-       PrintAndLog("          : lf awid fskdemod 1");
+       PrintAndLog("Samples:");
+       PrintAndLog("       lf awid fskdemod");
+       PrintAndLog("       lf awid fskdemod 1");
        return 0;
 }
 
 int usage_lf_awid_sim(void) {
        return 0;
 }
 
 int usage_lf_awid_sim(void) {
-       PrintAndLog("Enables simulation of AWID26 card with specified facility-code and card number.");
+       PrintAndLog("Enables simulation of AWID card with specified facility-code and card number.");
        PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
        PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
-       PrintAndLog("Per AWID26 format, the facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
        PrintAndLog("");
        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("Usage:  lf awid sim [h] <format> <facility-code> <card-number>");
+       PrintAndLog("Options:");
+       PrintAndLog("                h :  This help");  
+       PrintAndLog("         <format> :  format length 26|34|37|50");
+       PrintAndLog("  <facility-code> :  8|16bit value facility code");
+       PrintAndLog("    <card number> :  16|32-bit value card number");
        PrintAndLog("");
        PrintAndLog("");
-       PrintAndLog("Sample : lf awid sim 224 1337");
+       PrintAndLog("Samples:");
+       PrintAndLog("       lf awid sim 26 224 1337");
+       PrintAndLog("       lf awid sim 50 2001 13371337");
        return 0;
 }
 
 int usage_lf_awid_clone(void) {
        return 0;
 }
 
 int usage_lf_awid_clone(void) {
-       PrintAndLog("Enables cloning of AWID26 card with specified facility-code and card number onto T55x7.");
+       PrintAndLog("Enables cloning of AWID card with specified facility-code and card number onto T55x7.");
        PrintAndLog("The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
        PrintAndLog("The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
-       PrintAndLog("Per AWID26 format, the facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
        PrintAndLog("");
        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("  Q5              : optional - clone to Q5 (T5555) instead of T55x7 chip");
+       PrintAndLog("Usage:  lf awid clone [h] <format> <facility-code> <card-number> [Q5]");
+       PrintAndLog("Options:");
+       PrintAndLog("                h :  This help");  
+       PrintAndLog("         <format> :  format length 26|34|37|50");
+       PrintAndLog("  <facility-code> :  8|16bit value facility code");
+       PrintAndLog("    <card number> :  16|32-bit value card number");
+       PrintAndLog("               Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
        PrintAndLog("");
        PrintAndLog("");
-       PrintAndLog("Sample  : lf awid clone 224 1337");
+       PrintAndLog("Samples:");
+       PrintAndLog("       lf awid clone 26 224 1337");
+       PrintAndLog("       lf awid clone 50 2001 13371337");
        return 0;
 }
 
 int usage_lf_awid_brute(void){
        return 0;
 }
 
 int usage_lf_awid_brute(void){
-       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("Enables bruteforce of AWID reader with specified facility-code.");
+       PrintAndLog("This is a attack against reader. if cardnumber is given, it starts with it and goes up / down one step");
+       PrintAndLog("if cardnumber is not given, it starts with 1 and goes up to 65535");
        PrintAndLog("");
        PrintAndLog("");
-       PrintAndLog("Usage:  lf awid brute <Facility-Code>");
-       PrintAndLog("Options :");
-       PrintAndLog("  <Facility-Code> :  8-bit value AWID facility code");
+       PrintAndLog("Usage:  lf awid brute [h] a <format> f <facility-code> c <cardnumber> d <delay>");
+       PrintAndLog("Options:");
+       PrintAndLog("       h                 :  This help");
+       PrintAndLog("       a <format>        :  format length 26|50");
+       PrintAndLog("       f <facility-code> :  8|16bit value facility code");
+       PrintAndLog("       c <cardnumber>    :  (optional) cardnumber to start with, max 65535");
+       PrintAndLog("       d <delay>         :  delay betweens attempts in ms. Default 1000ms");
        PrintAndLog("");
        PrintAndLog("");
-       PrintAndLog("Sample  : lf awid brute 224");
+       PrintAndLog("Samples:");
+       PrintAndLog("       lf awid brute a 26 f 224");
+       PrintAndLog("       lf awid brute a 50 f 2001 d 2000");
+       PrintAndLog("       lf awid brute a 50 f 2001 c 200 d 2000");
        return 0;
 }
 
        return 0;
 }
 
+static int sendPing(void){
+       UsbCommand ping = {CMD_PING, {1, 2, 3}};
+       SendCommand(&ping);
+       SendCommand(&ping);     
+       SendCommand(&ping);     
+       clearCommandBuffer();
+       UsbCommand resp;
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
+               return 0;
+       return 1;
+}
+
+static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bs, size_t bs_len){
+
+       PrintAndLog("Trying FC: %u; CN: %u", fc, cn);           
+       if ( !getAWIDBits(fmtlen, fc, cn, bs)) {
+               PrintAndLog("Error with tag bitstream generation.");
+               return FALSE;
+       }
+
+       uint64_t arg1 = (10<<8) + 8; // fcHigh = 10, fcLow = 8
+       uint64_t arg2 = 50;              // clk RF/50 invert=0
+       UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, bs_len}};
+       memcpy(c.d.asBytes, bs, bs_len);
+       clearCommandBuffer();
+       SendCommand(&c);
+       msleep(delay);
+       sendPing();
+       return TRUE;
+}
+
 int CmdAWIDDemodFSK(const char *Cmd) {
        int findone = 0;
        if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_fskdemod();
 int CmdAWIDDemodFSK(const char *Cmd) {
        int findone = 0;
        if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_fskdemod();
@@ -90,26 +126,109 @@ int CmdAWIDDemodFSK(const char *Cmd) {
        return 0;   
 }
 
        return 0;   
 }
 
+int CmdAWIDRead(const char *Cmd) {
+       CmdLFRead("s");
+       getSamples("12000", TRUE);
+       return CmdFSKdemodAWID(Cmd);
+}
+
 //refactored by marshmellow
 //refactored by marshmellow
-int getAWIDBits(uint32_t fc, uint32_t cn, uint8_t      *AWIDBits) {
+int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) {
+
+       // the return bits, preamble 0000 0001 
+       bits[7] = 1;  
+       
        uint8_t pre[66];
        memset(pre, 0, sizeof(pre));
        uint8_t pre[66];
        memset(pre, 0, sizeof(pre));
-       AWIDBits[7]=1;
-       num_to_bytebits(26, 8, pre);
-
-       uint8_t wiegand[24];
-       num_to_bytebits(fc, 8, wiegand);
-       num_to_bytebits(cn, 16, wiegand+8);
 
 
-       wiegand_add_parity(pre+8, wiegand, 24);
-       size_t bitLen = addParity(pre, AWIDBits+8, 66, 4, 1);
+       // add formatlength
+       num_to_bytebits(fmtlen, 8, pre);
+       
+       // add facilitycode, cardnumber and wiegand parity bits
+       switch (fmtlen) {
+               case 26:{
+                       uint8_t wiegand[24];
+                       num_to_bytebits(fc, 8, wiegand);
+                       num_to_bytebits(cn, 16, wiegand+8);
+                       wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
+                       break;
+               }
+               case 34:{
+                       uint8_t wiegand[32];
+                       num_to_bytebits(fc, 8, wiegand);
+                       num_to_bytebits(cn, 24, wiegand+8);
+                       wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
+                       break;
+               }
+               case 37:{
+                       uint8_t wiegand[31];
+                       num_to_bytebits(fc, 13, wiegand);
+                       num_to_bytebits(cn, 18, wiegand+13);
+                       wiegand_add_parity(pre+8, wiegand,  sizeof(wiegand));
+                       break;
+               }
+               case 50: {
+                       uint8_t wiegand[48];
+                       num_to_bytebits(fc, 16, wiegand);
+                       num_to_bytebits(cn, 32, wiegand+16);
+                       wiegand_add_parity(pre+8, wiegand, sizeof(wiegand));
+                       break;
+               }
+       }
+       
+       // add AWID 4bit parity 
+       size_t bitLen = addParity(pre, bits+8, 66, 4, 1);
 
        if (bitLen != 88) return 0;
        return 1;
 }
 
 
        if (bitLen != 88) return 0;
        return 1;
 }
 
+static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn){
+       switch (*fmtlen) {
+               case 50:
+                       if ((*fc & 0xFFFF) != *fc) {
+                               *fc &= 0xFFFF;
+                               PrintAndLog("Facility-Code Truncated to 16-bits (AWID50): %u", *fc);
+                       }
+                       break;
+               case 37:
+                       if ((*fc & 0x1FFF) != *fc) {
+                               *fc &= 0x1FFF;
+                               PrintAndLog("Facility-Code Truncated to 13-bits (AWID37): %u", *fc);
+                       }
+                       if ((*cn & 0x3FFFF) != *cn) {
+                               *cn &= 0x3FFFF;
+                               PrintAndLog("Card Number Truncated to 18-bits (AWID37): %u", *cn);
+                       }                       
+                       break;
+               case 34:
+                       if ((*fc & 0xFF) != *fc) {
+                               *fc &= 0xFF;
+                               PrintAndLog("Facility-Code Truncated to 8-bits (AWID34): %u", *fc);
+                       }
+                       if ((*cn & 0xFFFFFF) != *cn) {
+                               *cn &= 0xFFFFFF;
+                               PrintAndLog("Card Number Truncated to 24-bits (AWID34): %u", *cn);
+                       }
+                       break;
+               case 26:
+               default:
+                       *fmtlen = 26;
+                       if ((*fc & 0xFF) != *fc) {
+                               *fc &= 0xFF;
+                               PrintAndLog("Facility-Code Truncated to 8-bits (AWID26): %u", *fc);
+                       }
+                       if ((*cn & 0xFFFF) != *cn) {
+                               *cn &= 0xFFFF;
+                               PrintAndLog("Card Number Truncated to 16-bits (AWID26): %u", *cn);
+                       }
+                       break;
+       }
+}
+
 int CmdAWIDSim(const char *Cmd) {
 int CmdAWIDSim(const char *Cmd) {
-       uint32_t fcode = 0, cnum = 0, fc = 0, cn = 0;
+       uint32_t fc = 0, cn = 0;
+       uint8_t fmtlen = 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);
@@ -118,18 +237,20 @@ int CmdAWIDSim(const char *Cmd) {
        uint64_t arg1 = ( 10 << 8 ) + 8; // fcHigh = 10, fcLow = 8
        uint64_t arg2 = 50; // clk RF/50 invert=0
   
        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();
-
-       fcode = (fc & 0x000000FF);
-       cnum = (cn & 0x0000FFFF);
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_sim();
+       
+       fmtlen = param_get8(Cmd, 0);
+       fc = param_get32ex(Cmd, 1, 0, 10);      
+       cn = param_get32ex(Cmd, 2, 0, 10);
+       if ( !fc || !cn) return usage_lf_awid_sim();
        
        
-       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);
+       verify_values(&fmtlen, &fc, &cn);
        
        
-       PrintAndLog("Emulating AWID26 -- FC: %u; CN: %u\n", fcode, cnum);
+       PrintAndLog("Emulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn);
        PrintAndLog("Press pm3-button to abort simulation or run another command");
        
        PrintAndLog("Press pm3-button to abort simulation or run another command");
        
-       if (!getAWIDBits(fc, cn, bs)) {
+       if (!getAWIDBits(fmtlen, fc, cn, bs)) {
                PrintAndLog("Error with tag bitstream generation.");
                return 1;
        }
                PrintAndLog("Error with tag bitstream generation.");
                return 1;
        }
@@ -146,27 +267,28 @@ int CmdAWIDSim(const char *Cmd) {
 
 int CmdAWIDClone(const char *Cmd) {
        uint32_t blocks[4] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 3<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
 
 int CmdAWIDClone(const char *Cmd) {
        uint32_t blocks[4] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 3<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0};
-       uint32_t fc=0,cn=0;
+       uint32_t fc = 0, cn = 0;
+       uint8_t fmtlen = 0;
        uint8_t bits[96];
        uint8_t *bs=bits;
        memset(bs,0,sizeof(bits));
        
        uint8_t bits[96];
        uint8_t *bs=bits;
        memset(bs,0,sizeof(bits));
        
-       if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_awid_clone();
-
-       if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
-               blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 50<<T5555_BITRATE_SHIFT | 3<<T5555_MAXBLOCK_SHIFT;
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_clone();
 
 
-       if ((fc & 0xFF) != fc) {
-               fc &= 0xFF;
-               PrintAndLog("Facility-Code Truncated to 8-bits (AWID26): %u", fc);
-       }
+       fmtlen = param_get8(Cmd, 0);
+       fc = param_get32ex(Cmd, 1, 0, 10);
+       cn = param_get32ex(Cmd, 2, 0, 10);
 
 
-       if ((cn & 0xFFFF) != cn) {
-               cn &= 0xFFFF;
-               PrintAndLog("Card Number Truncated to 16-bits (AWID26): %u", cn);
-       }
+       if ( !fc || !cn) return usage_lf_awid_clone();
        
        
-       if ( !getAWIDBits(fc, cn, bs)) {
+       if (param_getchar(Cmd, 4) == 'Q' || param_getchar(Cmd, 4) == 'q')
+               //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
+               blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 50<<T5555_BITRATE_SHIFT | 3<<T5555_MAXBLOCK_SHIFT;
+
+       verify_values(&fmtlen, &fc, &cn);
+               
+       if ( !getAWIDBits(fmtlen, fc, cn, bs)) {
                PrintAndLog("Error with tag bitstream generation.");
                return 1;
        }       
                PrintAndLog("Error with tag bitstream generation.");
                return 1;
        }       
@@ -175,8 +297,7 @@ int CmdAWIDClone(const char *Cmd) {
        blocks[2] = bytebits_to_byte(bs+32,32);
        blocks[3] = bytebits_to_byte(bs+64,32);
 
        blocks[2] = bytebits_to_byte(bs+32,32);
        blocks[3] = bytebits_to_byte(bs+64,32);
 
-       PrintAndLog("Preparing to clone AWID26 to T55x7 with FC: %u, CN: %u", 
-           fc, cn);
+       PrintAndLog("Preparing to clone AWID %u to T55x7 with FC: %u, CN: %u", fmtlen, fc, cn);
        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");
        PrintAndLog(" 00 | 0x%08x", blocks[0]);
        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");
        PrintAndLog(" 00 | 0x%08x", blocks[0]);
@@ -192,7 +313,7 @@ int CmdAWIDClone(const char *Cmd) {
                c.arg[1] = i;
                clearCommandBuffer();
                SendCommand(&c);
                c.arg[1] = i;
                clearCommandBuffer();
                SendCommand(&c);
-               if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+               if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
                        PrintAndLog("Error occurred, device did not respond during write operation.");
                        return -1;
                }
                        PrintAndLog("Error occurred, device did not respond during write operation.");
                        return -1;
                }
@@ -202,55 +323,106 @@ int CmdAWIDClone(const char *Cmd) {
 
 int CmdAWIDBrute(const char *Cmd){
        
 
 int CmdAWIDBrute(const char *Cmd){
        
-       uint8_t fc = 0x00;
+       bool errors = false;
+       uint32_t fc = 0, cn = 0, delay = 1000;
+       uint8_t fmtlen = 0;
        uint8_t bits[96];
        uint8_t *bs = bits;
        size_t size = sizeof(bits);
        memset(bs, 0x00, size);
        uint8_t bits[96];
        uint8_t *bs = bits;
        size_t size = sizeof(bits);
        memset(bs, 0x00, size);
-
-       char cmdp = param_getchar(Cmd, 0);
-       if (strlen(Cmd) > 3 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_brute();
-       
-       fc =  param_get8(Cmd, 0);
-       if ( fc == 0) return usage_lf_awid_brute();
+       uint8_t cmdp = 0;
        
        
-       PrintAndLog("Bruteforceing AWID26 Reader");
-       PrintAndLog("Press pm3-button to abort simulation or run another command");
+       while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
+               switch(param_getchar(Cmd, cmdp)) {
+               case 'h':
+               case 'H':
+                       return usage_lf_awid_brute();
+               case 'f':
+               case 'F':
+                       fc =  param_get32ex(Cmd ,cmdp+1, 0, 10);
+                       if ( !fc )
+                               errors = true;
+                       cmdp += 2;
+                       break;
+               case 'd':
+               case 'D':
+                       // delay between attemps,  defaults to 1000ms. 
+                       delay = param_get32ex(Cmd, cmdp+1, 1000, 10);
+                       cmdp += 2;
+                       break;
+               case 'c':
+               case 'C':
+                       cn = param_get32ex(Cmd, cmdp+1, 0, 10);
+                       // truncate cardnumber.
+                       cn &= 0xFFFF;
+                       cmdp += 2;
+                       break;
+               case 'a':
+               case 'A':
+                       fmtlen = param_get8(Cmd, cmdp+1);
+                       cmdp += 2;
+                       break;
+               default:
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                       errors = true;
+                       break;
+               }
+       }
+       if ( fc == 0 )errors = true;
+       if ( errors ) return usage_lf_awid_brute();
 
 
-       uint64_t arg1 = (10<<8) + 8; // fcHigh = 10, fcLow = 8
-       uint64_t arg2 = 50;              // clk RF/50 invert=0
-       UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};  
+       // limit fc according to selected format
+       switch(fmtlen) {
+               case 50:
+                       if ((fc & 0xFFFF) != fc) {
+                               fc &= 0xFFFF;
+                               PrintAndLog("Facility-code truncated to 16-bits (AWID50): %u", fc);
+                       }
+                       break;
+               default:
+                       if ((fc & 0xFF) != fc) {
+                               fc &= 0xFF;
+                               PrintAndLog("Facility-code truncated to 8-bits (AWID26): %u", fc);
+                       }
+                       break;
+       }
+       
+       PrintAndLog("Bruteforceing AWID %d Reader", fmtlen);
+       PrintAndLog("Press pm3-button to abort simulation or press key");
 
 
-       for ( uint16_t cn = 1; cn < 0xFFFF; ++cn){
+       uint16_t up = cn;
+       uint16_t down = cn;
+       
+       for (;;){
+       
+               if ( offline ) {
+                       printf("Device offline\n");
+                       return  2;
+               }
                if (ukbhit()) {
                        PrintAndLog("aborted via keyboard!");
                if (ukbhit()) {
                        PrintAndLog("aborted via keyboard!");
-                       c.cmd = CMD_PING;
-                       c.arg[0] = 0x00;
-                       c.arg[1] = 0x00;
-                       c.arg[2] = 0x00;
-                       clearCommandBuffer();
-                       SendCommand(&c);
-                       return 1;
+                       return sendPing();
                }
                }
-                       
-               (void)getAWIDBits(fc, cn, bs);
-               memcpy(c.d.asBytes, bs, size);
-               clearCommandBuffer();
-               SendCommand(&c);
                
                
-               PrintAndLog("Trying FC: %u; CN: %u", fc, cn);
-               // pause
-               sleep(1);
+               // Do one up
+               if ( up < 0xFFFF )
+                       if ( !sendTry(fmtlen, fc, up++, delay, bs, size)) return 1;
+               
+               // Do one down  (if cardnumber is given)
+               if ( cn > 1 )
+                       if ( down > 1 )
+                               if ( !sendTry(fmtlen, fc, --down, delay, bs, size)) return 1;
        }
        return 0;
 }
 
 static command_t CommandTable[] = {
        {"help",      CmdHelp,         1, "This help"},
        }
        return 0;
 }
 
 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"},
+       {"fskdemod",  CmdAWIDDemodFSK, 0, "Realtime AWID FSK demodulator"},
+       {"read",      CmdAWIDRead,     0, "Attempt to read and extract tag data"},
+       {"sim",       CmdAWIDSim,      0, "AWID tag simulator"},
+       {"clone",     CmdAWIDClone,    0, "Clone AWID to T55x7"},
+       {"brute",         CmdAWIDBrute,    0, "Bruteforce card number against reader"},
        {NULL, NULL, 0, NULL}
 };
 
        {NULL, NULL, 0, NULL}
 };
 
Proxmark3 GIT tracking
Impressum, Datenschutz