X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/56f1aaa234318f51b77cc4ce555bd7705056c882..897a14c36fa58f88508c0349dbfd9df368d5de78:/client/cmdlfawid.c diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c index 2334e3e3..a323f52b 100644 --- a/client/cmdlfawid.c +++ b/client/cmdlfawid.c @@ -36,7 +36,7 @@ int usage_lf_awid_sim(void) { PrintAndLog("Usage: lf awid sim [h] "); PrintAndLog("Options:"); PrintAndLog(" h : This help"); - PrintAndLog(" : format length 26|50"); + PrintAndLog(" : format length 26|34|37|50"); PrintAndLog(" : 8|16bit value facility code"); PrintAndLog(" : 16|32-bit value card number"); PrintAndLog(""); @@ -53,7 +53,7 @@ int usage_lf_awid_clone(void) { PrintAndLog("Usage: lf awid clone [h] [Q5]"); PrintAndLog("Options:"); PrintAndLog(" h : This help"); - PrintAndLog(" : format length 26|50"); + PrintAndLog(" : format length 26|34|37|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"); @@ -84,6 +84,18 @@ int usage_lf_awid_brute(void){ 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); @@ -99,21 +111,9 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui clearCommandBuffer(); SendCommand(&c); msleep(delay); + sendPing(); return TRUE; } -static int sendPing(){ - UsbCommand resp; - UsbCommand ping = {CMD_PING}; - clearCommandBuffer(); SendCommand(&ping); - clearCommandBuffer(); SendCommand(&ping); - clearCommandBuffer(); SendCommand(&ping); - if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { - PrintAndLog("aborted via keyboard!"); - return 0; - } - PrintAndLog("Device didnt respond to ABORT"); - return 1; -} int CmdAWIDDemodFSK(const char *Cmd) { int findone = 0; @@ -126,6 +126,12 @@ int CmdAWIDDemodFSK(const char *Cmd) { return 0; } +int CmdAWIDRead(const char *Cmd) { + CmdLFRead("s"); + getSamples("12000", TRUE); + return CmdFSKdemodAWID(Cmd); +} + //refactored by marshmellow int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) { @@ -139,16 +145,35 @@ int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) { 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)); + 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 @@ -158,6 +183,49 @@ int getAWIDBits(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint8_t *bits) { 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) { uint32_t fc = 0, cn = 0; uint8_t fmtlen = 0; @@ -177,26 +245,7 @@ int CmdAWIDSim(const char *Cmd) { cn = param_get32ex(Cmd, 2, 0, 10); if ( !fc || !cn) return usage_lf_awid_sim(); - 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; - } + verify_values(&fmtlen, &fc, &cn); PrintAndLog("Emulating AWID %u -- FC: %u; CN: %u\n", fmtlen, fc, cn); PrintAndLog("Press pm3-button to abort simulation or run another command"); @@ -233,31 +282,12 @@ int CmdAWIDClone(const char *Cmd) { if ( !fc || !cn) return usage_lf_awid_clone(); - switch(fmtlen) { - case 50: - if ((fc & 0xFFFF) != fc) { - fc &= 0xFFFF; - PrintAndLog("Facility-Code Truncated to 16-bits (AWID50): %u", fc); - } - break; - 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; - } - 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<