X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/508b37ba9ce74eed6553ce59deb79f49b5311d11..b62cbadb6198fcfcf7b6787acac01b5b7262eea6:/client/cmdlfawid.c?ds=sidebyside diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c index e7dee935..cd494dbb 100644 --- a/client/cmdlfawid.c +++ b/client/cmdlfawid.c @@ -19,62 +19,74 @@ #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); 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("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("Usage: lf awid fskdemod ['1']"); + PrintAndLog("Usage: lf awid fskdemod [h] [1]"); PrintAndLog("Options :"); - PrintAndLog(" 1 : (optional) stop after reading a single card"); + PrintAndLog(" h : This help"); + PrintAndLog(" 1 : (optional) stop after reading a single card"); 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) { - 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("Per AWID26 format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated."); PrintAndLog(""); - PrintAndLog("Usage: lf awid sim "); + PrintAndLog("Usage: lf awid sim [h] "); PrintAndLog("Options :"); - PrintAndLog(" : 8-bit value AWID facility code"); - PrintAndLog(" : 16-bit value AWID card number"); + PrintAndLog(" h : This help"); + PrintAndLog(" : format length 26|50"); + PrintAndLog(" : 8|16bit value facility code"); + PrintAndLog(" : 16|32-bit value card number"); 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) { - 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("Per AWID26 format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated."); PrintAndLog(""); - PrintAndLog("Usage: lf awid clone "); + PrintAndLog("Usage: lf awid clone [h] [Q5]"); PrintAndLog("Options :"); - PrintAndLog(" : 8-bit value AWID facility code"); - PrintAndLog(" : 16-bit value AWID card number"); - PrintAndLog(" Q5 : optional - clone to Q5 (T5555) instead of T55x7 chip"); + PrintAndLog(" h : This help"); + PrintAndLog(" : format length 26|50"); + PrintAndLog(" : 8|16bit value facility code"); + PrintAndLog(" : 16|32-bit value card number"); + PrintAndLog(" Q5 : optional - clone to Q5 (T5555) instead of T55x7 chip"); 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){ - PrintAndLog("Enables bruteforce of AWID26 card with specified facility-code."); - PrintAndLog("Per AWID26 format, the facility-code (FC) is 8-bit and the card number is 16-bit."); + PrintAndLog("Enables bruteforce of AWID reader with specified facility-code."); + PrintAndLog("This is a incremental attack against reader."); PrintAndLog(""); - PrintAndLog("Usage: lf awid brute "); + PrintAndLog("Usage: lf awid brute [h] "); PrintAndLog("Options :"); - PrintAndLog(" : 8-bit value AWID facility code"); + PrintAndLog(" h : This help"); + PrintAndLog(" : format length 26|50"); + PrintAndLog(" : 8|16bit value facility code"); PrintAndLog(""); - PrintAndLog("Sample : lf awid brute 224"); + PrintAndLog("Samples"); + PrintAndLog(" lf awid brute 26 224"); + PrintAndLog(" lf awid brute 50 2001"); return 0; } @@ -90,48 +102,81 @@ int CmdAWIDDemodFSK(const char *Cmd) { } //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)); - 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); + // add formatlength + num_to_bytebits(fmtlen, 8, pre); + + // add facilitycode, cardnumber and wiegand parity bits + if ( fmtlen == 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)); + } else { + 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)); + } + + // add AWID 4bit parity + size_t bitLen = addParity(pre, bits+8, 66, 4, 1); - 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 fc = 0, cn = 0; + uint8_t fmtlen = 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(); - - 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); + switch(fmtlen) { + case 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; + case 50: + if ((fc & 0xFFFF) != fc) { + fc &= 0xFFFF; + PrintAndLog("Facility-Code Truncated to 16-bits (AWID50): %u", fc); + } + break; + default: break; + } - 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"); - if (!getAWIDBits(fc, cn, bs)) { + if (!getAWIDBits(fmtlen, fc, cn, bs)) { PrintAndLog("Error with tag bitstream generation."); return 1; } @@ -148,27 +193,47 @@ int CmdAWIDSim(const char *Cmd) { int CmdAWIDClone(const char *Cmd) { uint32_t blocks[4] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 3< 3 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_awid_brute(); + if (strlen(Cmd) > 4 || 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(); + fmtlen = param_get8(Cmd, 0); + fc = param_get32ex(Cmd, 1, 0, 10); + if ( !fc ) return usage_lf_awid_brute(); - PrintAndLog("Bruteforceing AWID26"); + 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 run another command"); uint64_t arg1 = (10<<8) + 8; // fcHigh = 10, fcLow = 8 @@ -235,7 +316,7 @@ int CmdAWIDBrute(const char *Cmd){ return 1; } - (void)getAWIDBits(fc, cn, bs); + (void)getAWIDBits(fmtlen, fc, cn, bs); memcpy(c.d.asBytes, bs, size); clearCommandBuffer(); SendCommand(&c); @@ -257,6 +338,7 @@ static command_t CommandTable[] = { }; int CmdLFAWID(const char *Cmd) { + clearCommandBuffer(); CmdsParse(CommandTable, Cmd); return 0; }