From 87c10b2a0f49b1542258b5a4ed6f83a125c5da8f Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 5 Jan 2017 15:55:19 +0100 Subject: [PATCH] CHG: some indala output is now only in debug mode CHG: added 34|37 bits AWID format. I'm guessing 37bit is wrong since the parity is still there. Which it shouldn't --- client/cmddata.c | 28 +++++++-- client/cmdlfawid.c | 137 +++++++++++++++++++++++++++------------------ client/cmdlfawid.h | 2 + 3 files changed, 110 insertions(+), 57 deletions(-) diff --git a/client/cmddata.c b/client/cmddata.c index 97d840c5..1e7947ff 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -1460,6 +1460,7 @@ int CmdFSKdemodAWID(const char *Cmd) uint32_t code1 = 0; uint32_t code2 = 0; uint8_t fmtLen = bytebits_to_byte(BitStream, 8); + switch(fmtLen) { case 26: fc = bytebits_to_byte(BitStream + 9, 8); @@ -1467,6 +1468,22 @@ int CmdFSKdemodAWID(const char *Cmd) code1 = bytebits_to_byte(BitStream + 8,fmtLen); PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo); break; + case 34: + fc = bytebits_to_byte(BitStream + 9, 8); + cardnum = bytebits_to_byte(BitStream + 17, 24); + code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) ); + code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32); + PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo); + break; + case 37: + fc = bytebits_to_byte(BitStream + 9, 13); + cardnum = bytebits_to_byte(BitStream + 22, 18); + code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) ); + code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32); + PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo); + break; + // case 40: + // break; case 50: fc = bytebits_to_byte(BitStream + 9, 16); cardnum = bytebits_to_byte(BitStream + 25, 32); @@ -1801,21 +1818,24 @@ int CmdIndalaDecode(const char *Cmd) if (invert) if (g_debugMode) PrintAndLog("DEBUG: Error - Indala had to invert bits"); - PrintAndLog("BitLen: %d",DemodBufferLen); //convert UID to HEX uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7; uid1 = bytebits_to_byte(DemodBuffer,32); uid2 = bytebits_to_byte(DemodBuffer+32,32); if (DemodBufferLen==64){ - PrintAndLog("Indala UID=%s (%x%08x)", sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2); + PrintAndLog("Indala Found - Bitlength %d, UID = (%x%08x)\n%s", + DemodBufferLen, uid1, uid2, sprint_bin_break(DemodBuffer,DemodBufferLen,32) + ); } else { uid3 = bytebits_to_byte(DemodBuffer+64,32); uid4 = bytebits_to_byte(DemodBuffer+96,32); uid5 = bytebits_to_byte(DemodBuffer+128,32); uid6 = bytebits_to_byte(DemodBuffer+160,32); uid7 = bytebits_to_byte(DemodBuffer+192,32); - PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", - sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2, uid3, uid4, uid5, uid6, uid7); + PrintAndLog("Indala Found - Bitlength %d, UID = (%x%08x%08x%08x%08x%08x%08x)\n%s", + DemodBufferLen, + uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer,DemodBufferLen,32) + ); } if (g_debugMode){ PrintAndLog("DEBUG: Indala - printing demodbuffer:"); diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c index 8e6e4073..8b04a3d6 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"); @@ -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<