From: root Date: Sat, 1 Jul 2017 11:57:30 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: v3.1.0~196^2~8 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/30e37e973d9d6855eaae9fdebaecbaba91d85b4e?hp=1cbb352b71bf3c1858b567a35c454a4534d18e8e Merge remote-tracking branch 'upstream/master' --- diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index e84cccf9..167042d7 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -23,6 +23,7 @@ #include "cmdmain.h" #include "lfdemod.h" #include "protocols.h" +#include "util_posix.h" uint64_t g_em410xId=0; @@ -82,12 +83,12 @@ void printEM410x(uint32_t hi, uint64_t id) (id2lo & 0x000000000f) ); uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff)) + 0x143e00; - PrintAndLog("}\nOther : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64 "",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF)); + PrintAndLog("}\nOther : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64 "",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF)); PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton); uint32_t p1id = (id & 0xFFFFFF); uint8_t arr[32] = {0x00}; - int i =0; + int i =0; int j = 23; for (; i < 24; ++i, --j ){ arr[i] = (p1id >> i) & 1; @@ -99,12 +100,12 @@ void printEM410x(uint32_t hi, uint64_t id) p1 |= arr[22] << 23; p1 |= arr[21] << 20; p1 |= arr[20] << 22; - + p1 |= arr[19] << 18; p1 |= arr[18] << 16; p1 |= arr[17] << 19; p1 |= arr[16] << 17; - + p1 |= arr[15] << 13; p1 |= arr[14] << 15; p1 |= arr[13] << 12; @@ -235,7 +236,7 @@ int CmdEM410xSim(const char *Cmd) param_getdec(Cmd,1, &clock); PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock); - PrintAndLog("Press pm3-button to about simulation"); + PrintAndLog("Press pm3-button to abort simulation"); /* clear our graph */ @@ -278,18 +279,131 @@ int CmdEM410xSim(const char *Cmd) /* stop bit */ AppendGraph(1, clock, 0); - + CmdLFSim("0"); //240 start_gap. return 0; } +int usage_lf_em410x_brute(void) { + PrintAndLog("Bruteforcing by emulating EM410x tag"); + PrintAndLog(""); + PrintAndLog("Usage: lf em 410xbrute [h] ids.txt"); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" ids.txt - file with id in HEX format one per line"); + PrintAndLog(" clock - clock (32|64) (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 410xbrute ids.txt"); + PrintAndLog(" lf em 410xbrute ids.txt 32"); + return 0; +} + +int CmdEM410xBrute(const char *Cmd) +{ + char filename[FILE_PATH_SIZE]={0}; + FILE *f = NULL; + char buf[11]; + int i, n, j, binary[4], parity[4]; + + char cmdp = param_getchar(Cmd, 0); + uint8_t uid[5] = {0x00}; + + if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim(); + /* clock is 64 in EM410x tags */ + uint8_t clock = 64; + + param_getdec(Cmd,1, &clock); + + param_getstr(Cmd, 0, filename); + + if (strlen(filename) > 0) { + if ((f = fopen(filename, "r")) == NULL) { + PrintAndLog("Error: Could not open IDs file [%s]",filename); + return 1; + } + } else { + PrintAndLog("Error: Please specify a filename"); + return 1; + } + + + while( fgets(buf, sizeof(buf), f) ) { + msleep(1000); + if (strlen(buf) < 10 || buf[9] == '\n') continue; + while (fgetc(f) != '\n' && !feof(f)); //goto next line + + //The line start with # is comment, skip + if( buf[0]=='#' ) continue; + + buf[10] = 0; + //PrintAndLog("ID: %s", buf); + + if (param_gethex(buf, 0, uid, 10)) { + PrintAndLog("UID must include 10 HEX symbols"); + return 0; + } + + PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock); + + /* clear our graph */ + ClearGraph(0); + + /* write 9 start bits */ + for (i = 0; i < 9; i++) + AppendGraph(0, clock, 1); + + /* for each hex char */ + parity[0] = parity[1] = parity[2] = parity[3] = 0; + for (i = 0; i < 10; i++){ + /* read each hex char */ + sscanf(&buf[i], "%1x", &n); + for (j = 3; j >= 0; j--, n/= 2) + binary[j] = n % 2; + + /* append each bit */ + AppendGraph(0, clock, binary[0]); + AppendGraph(0, clock, binary[1]); + AppendGraph(0, clock, binary[2]); + AppendGraph(0, clock, binary[3]); + + /* append parity bit */ + AppendGraph(0, clock, binary[0] ^ binary[1] ^ binary[2] ^ binary[3]); + + /* keep track of column parity */ + parity[0] ^= binary[0]; + parity[1] ^= binary[1]; + parity[2] ^= binary[2]; + parity[3] ^= binary[3]; + } + + /* parity columns */ + AppendGraph(0, clock, parity[0]); + AppendGraph(0, clock, parity[1]); + AppendGraph(0, clock, parity[2]); + AppendGraph(0, clock, parity[3]); + + /* stop bit */ + AppendGraph(1, clock, 0); + + CmdLFSim("0"); //240 start_gap. + + memset(buf, 0, sizeof(buf)); + + } + + fclose(f); + + return 0; +} + + /* Function is equivalent of lf read + data samples + em410xread - * looped until an EM410x tag is detected - * + * looped until an EM410x tag is detected + * * Why is CmdSamples("16000")? * TBD: Auto-grow sample size based on detected sample rate. IE: If the * rate gets lower, then grow the number of samples - * Changed by martin, 4000 x 4 = 16000, + * Changed by martin, 4000 x 4 = 16000, * see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235 * * EDIT -- capture enough to get 2 complete preambles at the slowest data rate known to be used (rf/64) (64*64*2+9 = 8201) marshmellow @@ -458,7 +572,7 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool int EM4x50Read(const char *Cmd, bool verbose) { uint8_t fndClk[] = {8,16,32,40,50,64,128}; - int clk = 0; + int clk = 0; int invert = 0; int tol = 0; int i, j, startblock, skip, block, start, end, low, high, minClk; @@ -473,7 +587,7 @@ int EM4x50Read(const char *Cmd, bool verbose) // get user entry if any sscanf(Cmd, "%i %i", &clk, &invert); - + // first get high and low values for (i = 0; i < GraphTraceLen; i++) { if (GraphBuffer[i] > high) @@ -514,7 +628,7 @@ int EM4x50Read(const char *Cmd, bool verbose) if (!clk) { for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) { tol = fndClk[clkCnt]/8; - if (minClk >= fndClk[clkCnt]-tol && minClk <= fndClk[clkCnt]+1) { + if (minClk >= fndClk[clkCnt]-tol && minClk <= fndClk[clkCnt]+1) { clk=fndClk[clkCnt]; break; } @@ -539,7 +653,7 @@ int EM4x50Read(const char *Cmd, bool verbose) // skip over the remainder of LW skip += tmpbuff[i+1] + tmpbuff[i+2] + clk; - if (tmpbuff[i+3]>clk) + if (tmpbuff[i+3]>clk) phaseoff = tmpbuff[i+3]-clk; else phaseoff = 0; @@ -570,9 +684,9 @@ int EM4x50Read(const char *Cmd, bool verbose) } else if (start < 0) return 0; start = skip; snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47); - // save GraphBuffer - to restore it later + // save GraphBuffer - to restore it later save_restoreGB(GRAPH_SAVE); - // get rid of leading crap + // get rid of leading crap snprintf(tmp, sizeof(tmp), "%i", skip); CmdLtrim(tmp); bool pTest; @@ -583,7 +697,7 @@ int EM4x50Read(const char *Cmd, bool verbose) while (block < 6) { if (verbose || g_debugMode) PrintAndLog("\nBlock %i:", block); skip = phaseoff; - + // look for LW before start of next block for ( ; i < j - 4 ; ++i) { skip += tmpbuff[i]; @@ -605,7 +719,7 @@ int EM4x50Read(const char *Cmd, bool verbose) //set DemodBufferLen to just one block DemodBufferLen = skip/clk; //test parities - pTest = EM_ByteParityTest(DemodBuffer,DemodBufferLen,5,9,0); + pTest = EM_ByteParityTest(DemodBuffer,DemodBufferLen,5,9,0); pTest &= EM_EndParityTest(DemodBuffer,DemodBufferLen,5,9,0); AllPTest &= pTest; //get output @@ -624,7 +738,7 @@ int EM4x50Read(const char *Cmd, bool verbose) PrintAndLog("Partial data - no end found!"); PrintAndLog("Try again with more samples."); } - PrintAndLog("Found data at sample: %i - using clock: %i", start, clk); + PrintAndLog("Found data at sample: %i - using clock: %i", start, clk); end = block; for (block=0; block < end; block++){ PrintAndLog("Block %d: %08x",block,Code[block]); @@ -666,7 +780,7 @@ int usage_lf_em_read(void) { // download samples from device and copy them to the Graphbuffer bool downloadSamplesEM() { // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples) - uint8_t got[6000]; + uint8_t got[6000]; GetFromBigBuf(got, sizeof(got), 0); if ( !WaitForResponseTimeout(CMD_ACK, NULL, 4000) ) { PrintAndLog("command execution time out"); @@ -698,7 +812,7 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) { return false; } // test for even parity bits and remove them. (leave out the end row of parities so 36 bits) - if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,36) == 0 ) { + if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,36) == 0 ) { if (g_debugMode) PrintAndLog("DEBUG: Error - Parity not detected"); return false; } @@ -711,7 +825,7 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) { return true; } -// FSK, PSK, ASK/MANCHESTER, ASK/BIPHASE, ASK/DIPHASE +// FSK, PSK, ASK/MANCHESTER, ASK/BIPHASE, ASK/DIPHASE // should cover 90% of known used configs // the rest will need to be manually demoded for now... int demodEM4x05resp(uint32_t *word, bool readCmd) { @@ -778,7 +892,7 @@ int demodEM4x05resp(uint32_t *word, bool readCmd) { //try biphase ans = ASKbiphaseDemod("0 0 1", false); - if (!ans) { + if (!ans) { if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans); } else { if (EM4x05testDemodReadData(word, readCmd)) { @@ -788,7 +902,7 @@ int demodEM4x05resp(uint32_t *word, bool readCmd) { //try diphase (differential biphase or inverted) ans = ASKbiphaseDemod("0 1 1", false); - if (!ans) { + if (!ans) { if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans); } else { if (EM4x05testDemodReadData(word, readCmd)) { @@ -803,7 +917,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *wordDa UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}}; clearCommandBuffer(); SendCommand(&c); - UsbCommand resp; + UsbCommand resp; if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){ PrintAndLog("Command timed out"); return -1; @@ -841,7 +955,7 @@ int CmdEM4x05ReadWord(const char *Cmd) { addr = param_get8ex(Cmd, 0, 50, 10); // for now use default input of 1 as invalid (unlikely 1 will be a valid password...) pwd = param_get32ex(Cmd, 1, 1, 16); - + if ( (addr > 15) ) { PrintAndLog("Address must be between 0 and 15"); return 1; @@ -878,7 +992,7 @@ int CmdEM4x05dump(const char *Cmd) { // for now use default input of 1 as invalid (unlikely 1 will be a valid password...) pwd = param_get32ex(Cmd, 0, 1, 16); - + if ( pwd != 1 ) { usePwd = true; } @@ -906,7 +1020,7 @@ int usage_lf_em_write(void) { PrintAndLog("Options:"); PrintAndLog(" h - this help"); PrintAndLog(" a
- memory address to write to. (0-15)"); - PrintAndLog(" d - data to write (hex)"); + PrintAndLog(" d - data to write (hex)"); PrintAndLog(" p - password (hex) (optional)"); PrintAndLog(" s - swap the data bit order before write"); PrintAndLog(" i - invert the data bits before write"); @@ -1082,10 +1196,10 @@ void printEM4x05config(uint32_t wordData) { PrintAndLog(" PSK CF: %u | %s", PSKcf, cf); PrintAndLog(" Delay: %u | %s", delay, cdelay); PrintAndLog(" LastWordR: %02u | Address of last word for default read - meaning %u blocks are output", LWR, numblks); - PrintAndLog(" ReadLogin: %u | Read Login is %s", readLogin, readLogin ? "Required" : "Not Required"); - PrintAndLog(" ReadHKL: %u | Read Housekeeping Words Login is %s", readHKL, readHKL ? "Required" : "Not Required"); - PrintAndLog("WriteLogin: %u | Write Login is %s", writeLogin, writeLogin ? "Required" : "Not Required"); - PrintAndLog(" WriteHKL: %u | Write Housekeeping Words Login is %s", writeHKL, writeHKL ? "Required" : "Not Required"); + PrintAndLog(" ReadLogin: %u | Read Login is %s", readLogin, readLogin ? "Required" : "Not Required"); + PrintAndLog(" ReadHKL: %u | Read Housekeeping Words Login is %s", readHKL, readHKL ? "Required" : "Not Required"); + PrintAndLog("WriteLogin: %u | Write Login is %s", writeLogin, writeLogin ? "Required" : "Not Required"); + PrintAndLog(" WriteHKL: %u | Write Housekeeping Words Login is %s", writeHKL, writeHKL ? "Required" : "Not Required"); PrintAndLog(" R.A.W.: %u | Read After Write is %s", raw, raw ? "On" : "Off"); PrintAndLog(" Disable: %u | Disable Command is %s", disable, disable ? "Accepted" : "Not Accepted"); PrintAndLog(" R.T.F.: %u | Reader Talk First is %s", rtf, rtf ? "Enabled" : "Disabled"); @@ -1142,20 +1256,20 @@ int CmdEM4x05info(const char *Cmd) { // for now use default input of 1 as invalid (unlikely 1 will be a valid password...) pwd = param_get32ex(Cmd, 0, 1, 16); - + if ( pwd != 1 ) { usePwd = true; } // read word 0 (chip info) // block 0 can be read even without a password. - if ( !EM4x05Block0Test(&wordData) ) + if ( !EM4x05Block0Test(&wordData) ) return -1; - + uint8_t chipType = (wordData >> 1) & 0xF; uint8_t cap = (wordData >> 5) & 3; uint16_t custCode = (wordData >> 9) & 0x3FF; - + // read word 1 (serial #) doesn't need pwd wordData = 0; if (EM4x05ReadWord_ext(1, 0, false, &wordData) != 1) { @@ -1163,7 +1277,7 @@ int CmdEM4x05info(const char *Cmd) { } printEM4x05info(chipType, cap, custCode, wordData); - // read word 4 (config block) + // read word 4 (config block) // needs password if one is set wordData = 0; if ( EM4x05ReadWord_ext(4, pwd, usePwd, &wordData) != 1 ) { @@ -1199,9 +1313,10 @@ int CmdEM4x05info(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, - {"410xread", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"}, + {"410xread", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"}, {"410xdemod", CmdAskEM410xDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"}, {"410xsim", CmdEM410xSim, 0, " [clock rate] -- Simulate EM410x tag"}, + {"410xbrute", CmdEM410xBrute, 0, "ids.txt [clock rate] -- Bruteforcing by simulating EM410x tags (1 UID/s)"}, {"410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"}, {"410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" }, {"410xwrite", CmdEM410xWrite, 0, " <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},