RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-13 11:40:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

REM: code cleanup.

Browse source
This commit is contained in:
iceman1001 2016-01-08 14:31:27 +01:00
parent c46ea881a4
commit fcb1cdba15
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
client/cmdlfawid.c
View file

@ -101,23 +101,20 @@ int getAWIDBits(uint32_t fc, uint32_t cn, uint8_t *AWIDBits) {
num_to_bytebits(cn, 16, wiegand+8); num_to_bytebits(cn, 16, wiegand+8);
wiegand_add_parity(pre+8, wiegand, 24); 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; return 1;
} }
int CmdAWIDSim(const char *Cmd) { 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 bits[96];
uint8_t *bs = bits; uint8_t *bs = bits;
size_t size = sizeof(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 uint64_t arg2 = 50; // clk RF/50 invert=0
if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_awid_sim(); if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_awid_sim();
@ -125,8 +122,8 @@ int CmdAWIDSim(const char *Cmd) {
fcode = (fc & 0x000000FF); fcode = (fc & 0x000000FF);
cnum = (cn & 0x0000FFFF); cnum = (cn & 0x0000FFFF);
if (fc!=fcode) PrintAndLog("Facility-Code (%u) truncated to 8-bits: %u", fc, fcode); 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 (cn != cnum) PrintAndLog("Card number (%u) truncated to 16-bits: %u", cn, cnum);
PrintAndLog("Emulating AWID26 -- FC: %u; CN: %u\n", fcode, cnum); PrintAndLog("Emulating AWID26 -- FC: %u; CN: %u\n", fcode, cnum);
PrintAndLog("Press pm3-button to abort simulation or run another command"); PrintAndLog("Press pm3-button to abort simulation or run another command");