X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6c283951062aaad9d0d1ba8670b02895047be438..507afbf3e6f2f0d27d1e8ad60066d945c27ee721:/client/cmdlfjablotron.c diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c index a97bb770..95fe2922 100644 --- a/client/cmdlfjablotron.c +++ b/client/cmdlfjablotron.c @@ -6,35 +6,45 @@ //----------------------------------------------------------------------------- // Low frequency Presco tag commands //----------------------------------------------------------------------------- + #include "cmdlfjablotron.h" static int CmdHelp(const char *Cmd); int usage_lf_jablotron_clone(void){ PrintAndLog("clone a Jablotron tag to a T55x7 tag."); - PrintAndLog("Usage: lf jablotron clone d "); - PrintAndLog("Options :"); - PrintAndLog(" d : jablotron card ID"); - PrintAndLog(" : specify write to Q5 (t5555 instead of t55x7)"); + PrintAndLog("Usage: lf jablotron clone [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h : This help"); + PrintAndLog(" : jablotron card ID"); + PrintAndLog(" : specify write to Q5 (t5555 instead of t55x7)"); PrintAndLog(""); - PrintAndLog("Sample : lf jablotron clone d 123456789"); + PrintAndLog("Sample: lf jablotron clone 112233"); return 0; } int usage_lf_jablotron_sim(void) { PrintAndLog("Enables simulation of jablotron card with specified card number."); PrintAndLog("Simulation runs until the button is pressed or another USB command is issued."); - PrintAndLog("Per jablotron format, the card number is 9 digit number and can contain *# chars. Larger values are truncated."); PrintAndLog(""); - PrintAndLog("Usage: lf jablotron sim d or H "); - PrintAndLog("Options :"); - PrintAndLog(" d : jablotron card number"); -// PrintAndLog(" H : 8 digit hex card number"); + PrintAndLog("Usage: lf jablotron sim [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h : This help"); + PrintAndLog(" : jablotron card ID"); PrintAndLog(""); - PrintAndLog("Sample : lf jablotron sim d 123456789"); + PrintAndLog("Sample: lf jablotron sim 112233"); return 0; } +static uint8_t jablontron_chksum(uint8_t *bits){ + uint8_t chksum = 0; + for (int i=16; i < 56; i += 8) { + chksum += bytebits_to_byte(bits+i,8); + } + chksum ^= 0x3A; + return chksum; +} + int getJablotronBits(uint64_t fullcode, uint8_t *bits) { //preamp num_to_bytebits(0xFFFF, 16, bits); @@ -43,66 +53,80 @@ int getJablotronBits(uint64_t fullcode, uint8_t *bits) { num_to_bytebits(fullcode, 40, bits+16); //chksum byte - uint8_t crc = 0; - for (int i=16; i < 56; i += 8) { - crc += bytebits_to_byte(bits+i,8); - } - crc ^= 0x3A; - num_to_bytebits(crc, 8, bits+56); - + uint8_t chksum = jablontron_chksum(bits); + num_to_bytebits(chksum, 8, bits+56); return 1; } +static uint64_t getJablontronCardId( uint64_t rawcode ){ + uint64_t id = 0; + uint8_t bytes[] = {0,0,0,0,0}; + num_to_bytes(rawcode, 5, bytes); + for ( int i = 4, j = 0; i > -1; --i, j += 2 ) { + id += NIBBLE_LOW( bytes[i] ) * (int)pow(10,j); + id += NIBBLE_HIGH( bytes[i] ) * (int)pow(10,j+1); + } + return id; +} + //see ASKDemod for what args are accepted int CmdJablotronDemod(const char *Cmd) { //Differential Biphase / di-phase (inverted biphase) //get binary from ask wave if (!ASKbiphaseDemod("0 64 1 0", FALSE)) { - if (g_debugMode) PrintAndLog("Error Jablotron: ASKbiphaseDemod failed"); + if (g_debugMode) PrintAndLog("DEBUG: Error - Jablotron ASKbiphaseDemod failed"); return 0; } size_t size = DemodBufferLen; int ans = JablotronDemod(DemodBuffer, &size); if (ans < 0){ if (g_debugMode){ - // if (ans == -5) - // PrintAndLog("DEBUG: Error - not enough samples"); - // else if (ans == -1) - // PrintAndLog("DEBUG: Error - only noise found"); - // else if (ans == -2) - // PrintAndLog("DEBUG: Error - problem during ASK/Biphase demod"); - if (ans == -3) - PrintAndLog("DEBUG: Error - Size not correct: %d", size); - else if (ans == -4) + if (ans == -1) + PrintAndLog("DEBUG: Error - Jablotron too few bits found"); + else if (ans == -2) PrintAndLog("DEBUG: Error - Jablotron preamble not found"); + else if (ans == -3) + PrintAndLog("DEBUG: Error - Jablotron size not correct: %d", size); + else if (ans == -5) + PrintAndLog("DEBUG: Error - Jablotron checksum failed"); else - PrintAndLog("DEBUG: Error - ans: %d", ans); + PrintAndLog("DEBUG: Error - Jablotron ans: %d", ans); } return 0; } - //got a good demod - uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32); - uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32); - uint64_t cardid = (raw1 & 0x0000FFFF); - cardid <<= 32; - cardid |= (raw2 >> 8); - - PrintAndLog("Jablotron Tag Found: Card ID %12X", cardid); - PrintAndLog("Raw: %08X%08X", raw1 ,raw2); setDemodBuf(DemodBuffer+ans, 64, 0); - //PrintAndLog("1410-%u-%u-%08X-%02X", fullcode); + //got a good demod + uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32); + uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32); + + uint64_t rawid = bytebits_to_byte(DemodBuffer+16, 40); + uint64_t id = getJablontronCardId(rawid); + + PrintAndLog("Jablotron Tag Found: Card ID %u", id); + PrintAndLog("Raw: %08X%08X", raw1 ,raw2); + + uint8_t chksum = raw2 & 0xFF; + PrintAndLog("Checksum: %02X [%s]", + chksum, + (chksum == jablontron_chksum(DemodBuffer)) ? "OK":"FAIL" + ); + + id = DEC2BCD(id); + // Printed format: 1410-nn-nnnn-nnnn + PrintAndLog("Printed: 1410-%02X-%04X-%04X", + (uint8_t)(id >> 32) & 0xFF, + (uint16_t)(id >> 16) & 0xFFFF, + (uint16_t)id & 0xFFFF + ); return 1; } int CmdJablotronRead(const char *Cmd) { - // read lf silently CmdLFRead("s"); - // get samples silently - getSamples("30000",false); - // demod and output Presco ID + getSamples("12000", TRUE); return CmdJablotronDemod(Cmd); } @@ -118,19 +142,20 @@ int CmdJablotronClone(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_jablotron_clone(); - fullcode = param_get64ex(Cmd, 1, 0, 16); + fullcode = param_get64ex(Cmd, 0, 0, 16); //Q5 - if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q') { + if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q') { //t5555 (Q5) BITRATE = (RF-2)/2 (iceman) blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<=0; i--) { + for (int i = 2; i >= 0; --i) { c.arg[0] = blocks[i]; 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; } @@ -169,7 +194,13 @@ int CmdJablotronSim(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_jablotron_sim(); - fullcode = param_get64ex(Cmd, 1, 0, 16); + fullcode = param_get64ex(Cmd, 0, 0, 16); + + // clearing the topbit needed for the preambl detection. + if ((fullcode & 0x7FFFFFFFFF) != fullcode) { + fullcode &= 0x7FFFFFFFFF; + PrintAndLog("Card Number Truncated to 39bits: %"PRIx64, fullcode); + } uint8_t clk = 64, encoding = 2, separator = 0, invert = 1; uint16_t arg1, arg2; @@ -177,7 +208,7 @@ int CmdJablotronSim(const char *Cmd) { arg1 = clk << 8 | encoding; arg2 = invert << 8 | separator; - PrintAndLog("Simulating Jablotron - FullCode: %12X", fullcode); + PrintAndLog("Simulating Jablotron - FullCode: %"PRIx64, fullcode); UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}}; getJablotronBits(fullcode, c.d.asBytes); @@ -188,9 +219,9 @@ int CmdJablotronSim(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, - {"read", CmdJablotronRead, 0, "Attempt to read and Extract tag data"}, - {"clone", CmdJablotronClone, 0, "h [Q5] clone jablotron tag"}, - {"sim", CmdJablotronSim, 0, "h simulate jablotron tag"}, + {"read", CmdJablotronRead, 0, "Attempt to read and extract tag data"}, + {"clone", CmdJablotronClone, 0, "clone jablotron tag"}, + {"sim", CmdJablotronSim, 0, "simulate jablotron tag"}, {NULL, NULL, 0, NULL} };