X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1a4b907335746ab94eb8bb78e2625c6f98584ac3..9c624f67b3c3041d171abf75d954ba9fa0ae57a4:/client/cmdlfem4x.c?ds=sidebyside diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index b8509c75..e6db8026 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -147,7 +147,8 @@ int CmdEM410xWatch(const char *Cmd) } CmdLFRead("s"); - getSamples("8201",true); //capture enough to get 2 complete preambles (4096*2+9) + //getSamples("8201",true); //capture enough to get 2 complete preambles (4096*2+9) + getSamples("6144",true); } while (!CmdEM410xRead("")); return 0; @@ -159,7 +160,7 @@ int CmdEM410xWatchnSpoof(const char *Cmd) { // loops if the captured ID was in XL-format. CmdEM410xWatch(Cmd); - PrintAndLog("# Replaying captured ID: %llu", g_em410xid); + PrintAndLog("# Replaying captured ID: %" PRIu64 , g_em410xid); CmdLFaskSim(""); return 0; } @@ -225,30 +226,109 @@ int CmdEM410xWrite(const char *Cmd) bool EM_EndParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) { - if (rows*cols>size) return false; + if (rows*cols>size) return FALSE; uint8_t colP=0; //assume last col is a parity and do not test for (uint8_t colNum = 0; colNum < cols-1; colNum++) { for (uint8_t rowNum = 0; rowNum < rows; rowNum++) { colP ^= BitStream[(rowNum*cols)+colNum]; } - if (colP != pType) return false; + if (colP != pType) return FALSE; } - return true; + return TRUE; } bool EM_ByteParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) { - if (rows*cols>size) return false; + if (rows*cols>size) return FALSE; uint8_t rowP=0; //assume last row is a parity row and do not test for (uint8_t rowNum = 0; rowNum < rows-1; rowNum++) { for (uint8_t colNum = 0; colNum < cols; colNum++) { rowP ^= BitStream[(rowNum*cols)+colNum]; } - if (rowP != pType) return false; + if (rowP != pType) return FALSE; + } + return TRUE; +} + +// EM word parity test. +// 9*5 = 45 bits in total +// 012345678|r1 +// 012345678|r2 +// 012345678|r3 +// 012345678|r4 +// ------------ +//c012345678| 0 +// |- must be zero + +bool EMwordparitytest(uint8_t *bits){ + + // last row/col parity must be 0 + if (bits[44] != 0 ) return FALSE; + + // col parity check + uint8_t c1 = bytebits_to_byte(bits, 8) ^ bytebits_to_byte(bits+9, 8) ^ bytebits_to_byte(bits+18, 8) ^ bytebits_to_byte(bits+27, 8); + uint8_t c2 = bytebits_to_byte(bits+36, 8); + if ( c1 != c2 ) return FALSE; + + // row parity check + uint8_t rowP = 0; + for ( uint8_t i = 0; i < 36; ++i ) { + + rowP ^= bits[i]; + if ( i>0 && (i % 9) == 0) { + + if ( rowP != EVEN ) + return FALSE; + + rowP = 0; + } } - return true; + // all checks ok. + return TRUE; +} + + +//////////////// 4050 / 4450 commands +int usage_lf_em4x50_dump(void) { + PrintAndLog("Dump EM4x50/EM4x69. Tag must be on antenna. "); + PrintAndLog(""); + PrintAndLog("Usage: lf em 4x50dump [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" pwd - password (hex) (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 4x50dump"); + PrintAndLog(" lf em 4x50dump 11223344"); + return 0; +} +int usage_lf_em4x50_read(void) { + PrintAndLog("Read EM 4x50/EM4x69. Tag must be on antenna. "); + PrintAndLog(""); + PrintAndLog("Usage: lf em 4x50read [h]
"); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" address - memory address to read. (0-15)"); + PrintAndLog(" pwd - password (hex) (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 4x50read 1"); + PrintAndLog(" lf em 4x50read 1 11223344"); + return 0; +} +int usage_lf_em4x50_write(void) { + PrintAndLog("Write EM 4x50/4x69. Tag must be on antenna. "); + PrintAndLog(""); + PrintAndLog("Usage: lf em 4x50write [h]
"); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" address - memory address to write to. (0-15)"); + PrintAndLog(" data - data to write (hex)"); + PrintAndLog(" pwd - password (hex) (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 4x50write 1 deadc0de"); + PrintAndLog(" lf em 4x50write 1 deadc0de 11223344"); + return 0; } uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest) @@ -283,6 +363,8 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool } return code; } + + /* Read the transmitted data of an EM4x50 tag from the graphbuffer * Format: * @@ -303,8 +385,7 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool * Word Read values. UID is stored in block 32. */ //completed by Marshmellow -int EM4x50Read(const char *Cmd, bool verbose) -{ +int EM4x50Read(const char *Cmd, bool verbose) { uint8_t fndClk[] = {8,16,32,40,50,64,128}; int clk = 0; int invert = 0; @@ -495,41 +576,25 @@ int EM4x50Read(const char *Cmd, bool verbose) } int CmdEM4x50Read(const char *Cmd) { + uint8_t ctmp = param_getchar(Cmd, 0); + if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x50_read(); return EM4x50Read(Cmd, true); } - -int usage_lf_em_read(void) { - PrintAndLog("Read EM 4x05/4x50/EM4x69. Tag must be on antenna. "); - PrintAndLog(""); - PrintAndLog("Usage: lf em readword [h]
"); - PrintAndLog("Options:"); - PrintAndLog(" h - this help"); - PrintAndLog(" address - memory address to read. (0-15)"); - PrintAndLog(" pwd - password (hex) (optional)"); - PrintAndLog("samples:"); - PrintAndLog(" lf em readword 1"); - PrintAndLog(" lf em readword 1 11223344"); +int CmdEM4x50Write(const char *Cmd){ + uint8_t ctmp = param_getchar(Cmd, 0); + if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x50_write(); + PrintAndLog("no implemented yet"); return 0; } - -int usage_lf_em_write(void) { - PrintAndLog("Write EM 4x05/4x50/4x69. Tag must be on antenna. "); - PrintAndLog(""); - PrintAndLog("Usage: lf em writeword [h]
"); - PrintAndLog("Options:"); - PrintAndLog(" h - this help"); - PrintAndLog(" address - memory address to write to. (0-15)"); - PrintAndLog(" data - data to write (hex)"); - PrintAndLog(" pwd - password (hex) (optional)"); - PrintAndLog("samples:"); - PrintAndLog(" lf em writeword 1"); - PrintAndLog(" lf em writeword 1 deadc0de 11223344"); +int CmdEM4x50Dump(const char *Cmd){ + uint8_t ctmp = param_getchar(Cmd, 0); + if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x50_dump(); + PrintAndLog("no implemented yet"); return 0; } #define EM_PREAMBLE_LEN 6 -// download samples from device -// and copy them to Graphbuffer +// download samples from device and copy to Graphbuffer bool downloadSamplesEM(){ // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples) @@ -542,32 +607,23 @@ bool downloadSamplesEM(){ setGraphBuf(got, sizeof(got)); return TRUE; } -//search for given preamble in given BitStream and return success=1 or fail=0 and startIndex + +// em_demod bool doPreambleSearch(size_t *startIdx){ // sanity check - if ( DemodBufferLen < EM_PREAMBLE_LEN) + if ( DemodBufferLen < EM_PREAMBLE_LEN) { + if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 demodbuffer too small"); return FALSE; - - // skip first two 0 bits as they might have been missed in the demod - uint8_t preamble[EM_PREAMBLE_LEN] = {0,0,1,0,1,0}; - - // set size to 10 to only test first 4 positions for the preamble - size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10; - *startIdx = 0; - uint8_t found = 0; - - // em only sends preamble once, so look for it once in the first x bits - for (int idx = 0; idx < size - EM_PREAMBLE_LEN; idx++){ - if (memcmp(DemodBuffer+idx, preamble, EM_PREAMBLE_LEN) == 0){ - //first index found - *startIdx = idx; - found = 1; - break; - } } + + // set size to 20 to only test first 14 positions for the preamble + size_t size = (20 > DemodBufferLen) ? DemodBufferLen : 20; + *startIdx = 0; + // skip first two 0 bits as they might have been missed in the demod + uint8_t preamble[EM_PREAMBLE_LEN] = {0,0,1,0,1,0}; - if ( !found) { + if ( !preambleSearchEx(DemodBuffer, preamble, EM_PREAMBLE_LEN, &size, startIdx, TRUE)) { if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", *startIdx); return FALSE; } @@ -577,13 +633,13 @@ bool doPreambleSearch(size_t *startIdx){ bool detectFSK(){ // detect fsk clock if (!GetFskClock("", FALSE, FALSE)) { - if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: FSK clock failed"); + if (g_debugMode) PrintAndLog("DEBUG: Error - EM: FSK clock failed"); return FALSE; } // demod int ans = FSKrawDemod("0 0", FALSE); if (!ans) { - if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: FSK Demod failed"); + if (g_debugMode) PrintAndLog("DEBUG: Error - EM: FSK Demod failed"); return FALSE; } return TRUE; @@ -591,19 +647,33 @@ bool detectFSK(){ // PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... ) bool detectPSK(){ int ans = GetPskClock("", FALSE, FALSE); - if (!ans) { - if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: PSK clock failed"); + if (ans <= 0) { + if (g_debugMode) PrintAndLog("DEBUG: Error - EM: PSK clock failed"); return FALSE; } - PrintAndLog("PSK response possibly found, run `data rawd p1` to attempt to demod"); + //demod + //try psk1 -- 0 0 6 (six errors?!?) + ans = PSKDemod("0 0 6", FALSE); + if (!ans) { + if (g_debugMode) PrintAndLog("DEBUG: Error - EM: PSK1 Demod failed"); + + //try psk1 inverted + ans = PSKDemod("0 1 6", FALSE); + if (!ans) { + if (g_debugMode) PrintAndLog("DEBUG: Error - EM: PSK1 inverted Demod failed"); + return FALSE; + } + } + // either PSK1 or PSK1 inverted is ok from here. + // lets check PSK2 later. return TRUE; } // try manchester - NOTE: ST only applies to T55x7 tags. bool detectASK_MAN(){ bool stcheck = FALSE; - int ans = ASKDemod_ext("0 0 0", TRUE, FALSE, 1, &stcheck); + int ans = ASKDemod_ext("0 0 0", FALSE, FALSE, 1, &stcheck); if (!ans) { - if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed"); + if (g_debugMode) PrintAndLog("DEBUG: Error - EM: ASK/Manchester Demod failed"); return FALSE; } return TRUE; @@ -611,11 +681,11 @@ bool detectASK_MAN(){ bool detectASK_BI(){ int ans = ASKbiphaseDemod("0 0 1", FALSE); if (!ans) { - if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase normal demod failed"); + if (g_debugMode) PrintAndLog("DEBUG: Error - EM: ASK/biphase normal demod failed"); ans = ASKbiphaseDemod("0 1 1", FALSE); if (!ans) { - if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase inverted demod failed"); + if (g_debugMode) PrintAndLog("DEBUG: Error - EM: ASK/biphase inverted demod failed"); return FALSE; } } @@ -623,42 +693,128 @@ bool detectASK_BI(){ } // param: idx - start index in demoded data. -int setDemodBufferEM(uint8_t bitsNeeded, size_t idx){ - if ( bitsNeeded < DemodBufferLen) { - setDemodBuf(DemodBuffer + idx + EM_PREAMBLE_LEN, bitsNeeded, 0); - CmdPrintDemodBuff("x"); - return 1; +bool setDemodBufferEM(uint32_t *word, size_t idx){ + + //test for even parity bits. + uint8_t parity[45] = {0}; + memcpy( parity, DemodBuffer, 45); + if (!EMwordparitytest(parity) ){ + PrintAndLog("DEBUG: Error - EM Parity tests failed"); + return FALSE; + } + + if (!removeParity(DemodBuffer, idx + EM_PREAMBLE_LEN, 9, 0, 44)) { + if (g_debugMode) PrintAndLog("DEBUG: Error - EM, failed removing parity"); + return FALSE; } - return -1; + setDemodBuf(DemodBuffer, 40, 0); + *word = bytebits_to_byteLSBF(DemodBuffer, 32); + return TRUE; } // 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(uint8_t bitsNeeded) { - - size_t startIdx = 0; - - if (detectASK_MAN() && doPreambleSearch( &startIdx )) - return setDemodBufferEM(bitsNeeded, startIdx); +bool demodEM4x05resp(uint32_t *word) { + size_t idx = 0; - if (detectASK_BI() && doPreambleSearch( &startIdx )) - return setDemodBufferEM(bitsNeeded, startIdx); + if (detectASK_MAN() && doPreambleSearch( &idx )) + return setDemodBufferEM(word, idx); - if (detectFSK() && doPreambleSearch( &startIdx )) - return setDemodBufferEM(bitsNeeded, startIdx); + if (detectASK_BI() && doPreambleSearch( &idx )) + return setDemodBufferEM(word, idx); - if (detectPSK() && doPreambleSearch( &startIdx )) - return setDemodBufferEM(bitsNeeded, startIdx); + if (detectFSK() && doPreambleSearch( &idx )) + return setDemodBufferEM(word, idx); - return -1; + if (detectPSK()) { + if (doPreambleSearch( &idx )) + return setDemodBufferEM(word, idx); + + psk1TOpsk2(DemodBuffer, DemodBufferLen); + if (doPreambleSearch( &idx )) + return setDemodBufferEM(word, idx); + } + return FALSE; +} + +//////////////// 4205 / 4305 commands +int usage_lf_em4x05_dump(void) { + PrintAndLog("Dump EM4x05/EM4x69. Tag must be on antenna. "); + PrintAndLog(""); + PrintAndLog("Usage: lf em 4x05dump [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" pwd - password (hex) (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 4x05dump"); + PrintAndLog(" lf em 4x05dump 11223344"); + return 0; +} +int usage_lf_em4x05_read(void) { + PrintAndLog("Read EM4x05/EM4x69. Tag must be on antenna. "); + PrintAndLog(""); + PrintAndLog("Usage: lf em 4x05read [h]
"); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" address - memory address to read. (0-15)"); + PrintAndLog(" pwd - password (hex) (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 4x05read 1"); + PrintAndLog(" lf em 4x05read 1 11223344"); + return 0; +} +int usage_lf_em4x05_write(void) { + PrintAndLog("Write EM4x05/4x69. Tag must be on antenna. "); + PrintAndLog(""); + PrintAndLog("Usage: lf em 4x05write [h]
"); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" address - memory address to write to. (0-15)"); + PrintAndLog(" data - data to write (hex)"); + PrintAndLog(" pwd - password (hex) (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 4x05write 1 deadc0de"); + PrintAndLog(" lf em 4x05write 1 deadc0de 11223344"); + return 0; } -int CmdReadWord(const char *Cmd) { +int CmdEM4x05Dump(const char *Cmd) { + uint8_t addr = 0; + uint32_t pwd = 0; + bool usePwd = false; + uint8_t ctmp = param_getchar(Cmd, 0); + if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_dump(); + + // 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; + + int success = 1; + PrintAndLog("Addr | data | ascii"); + PrintAndLog("-----+--------+------"); + for (; addr < 16; addr++) { + if (addr == 2) { + if (usePwd) { + PrintAndLog(" %02u | %08X", addr, pwd); + } else { + PrintAndLog(" 02 | cannot read"); + } + } else { + //success &= EM4x05Read(addr, pwd, usePwd); + } + } + + return success; +} +//ICEMAN; mentalnote to self: -1 is not doable for uint32_t.. +int CmdEM4x05Read(const char *Cmd) { int addr, pwd; bool usePwd = false; uint8_t ctmp = param_getchar(Cmd, 0); - if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_read(); + if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_read(); addr = param_get8ex(Cmd, 0, -1, 10); pwd = param_get32ex(Cmd, 1, -1, 16); @@ -692,14 +848,20 @@ int CmdReadWord(const char *Cmd) { return -1; } - //attempt demod: - //need 32 bits from a read word - return demodEM4x05resp(44); + //attempt demod + uint32_t word = 0; + int isOk = demodEM4x05resp(&word); + if (isOk) + PrintAndLog("Got Address %02d | %08X",addr, word); + else + PrintAndLog("Read failed"); + + return isOk; } -int CmdWriteWord(const char *Cmd) { +int CmdEM4x05Write(const char *Cmd) { uint8_t ctmp = param_getchar(Cmd, 0); - if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write(); + if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_write(); bool usePwd = false; int addr = 16; // default to invalid address @@ -727,7 +889,7 @@ int CmdWriteWord(const char *Cmd) { clearCommandBuffer(); SendCommand(&c); UsbCommand resp; - if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){ + if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){ PrintAndLog("Error occurred, device did not respond during write operation."); return -1; } @@ -735,28 +897,31 @@ int CmdWriteWord(const char *Cmd) { if (!downloadSamplesEM()) return -1; - //todo: check response for 00001010 then write data for write confirmation! - + //attempt demod: //need 0 bits demoded (after preamble) to verify write cmd - int result = demodEM4x05resp(0); - if (result == 1) + uint32_t dummy = 0; + int isOk = demodEM4x05resp(&dummy); + if (isOk) PrintAndLog("Write Verified"); - return result; + return isOk; } static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, - {"em410xdemod", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"}, - {"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag in GraphBuffer"}, - {"em410xsim", CmdEM410xSim, 0, " -- Simulate EM410x tag"}, - {"em410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"}, - {"em410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" }, - {"em410xwrite", CmdEM410xWrite, 0, " <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"}, - {"em4x50read", CmdEM4x50Read, 1, "demod data from EM4x50 tag from the graphbuffer"}, - {"readword", CmdReadWord, 1, "read EM4x05/4x69 data"}, - {"writeword", CmdWriteWord, 1, "write EM405/4x69 data"}, + {"410xdemod", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"}, + {"410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag in GraphBuffer"}, + {"410xsim", CmdEM410xSim, 0, " -- Simulate EM410x tag"}, + {"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"}, + {"4x05read", CmdEM4x05Read, 0, "read word data from EM4205/4305"}, + {"4x05write", CmdEM4x05Write, 0, "write word data to EM4205/4305"}, + {"4x05dump", CmdEM4x05Dump, 0, "dump EM4205/4305 tag"}, + {"4x50read", CmdEM4x50Read, 0, "read word data from EM4x50"}, + {"4x50write", CmdEM4x50Write, 0, "write word data to EM4x50"}, + {"4x50dump", CmdEM4x50Dump, 0, "dump EM4x50 tag"}, {NULL, NULL, 0, NULL} };