X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/34ff898553f3392c66c50d1a524070882d237fb5..bad2eb8587f2c611060d434251ec1e2cec96f65b:/client/cmdlfem4x.c?ds=inline diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index d1245306..6a076e33 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -14,6 +14,7 @@ #include "proxmark3.h" #include "ui.h" #include "util.h" +#include "data.h" #include "graph.h" #include "cmdparser.h" #include "cmddata.h" @@ -63,6 +64,20 @@ int CmdEM410xRead(const char *Cmd) return 1; } +int usage_lf_em410x_sim(void) { + PrintAndLog("Simulating EM410x tag"); + PrintAndLog(""); + PrintAndLog("Usage: lf em 410xsim [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" uid - uid (10 HEX symbols)"); + PrintAndLog(" clock - clock (32|64) (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 410xsim 0F0368568B"); + PrintAndLog(" lf em 410xsim 0F0368568B 32"); + return 0; +} + // emulate an EM410X tag int CmdEM410xSim(const char *Cmd) { @@ -71,12 +86,7 @@ int CmdEM410xSim(const char *Cmd) char cmdp = param_getchar(Cmd, 0); uint8_t uid[5] = {0x00}; - if (cmdp == 'h' || cmdp == 'H') { - PrintAndLog("Usage: lf em 410xsim "); - PrintAndLog(""); - PrintAndLog(" sample: lf em 410xsim 0F0368568B"); - return 0; - } + if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim(); /* clock is 64 in EM410x tags */ uint8_t clock = 64; @@ -174,7 +184,7 @@ int CmdEM410xWrite(const char *Cmd) int card = 0xFF; // invalid card value unsigned int clock = 0; // invalid clock value - sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock); + sscanf(Cmd, "%" SCNx64 " %d %d", &id, &card, &clock); // Check ID if (id == 0xFFFFFFFFFFFFFFFF) { @@ -540,7 +550,7 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) { // sanity check size = (size > DemodBufferLen) ? DemodBufferLen : size; // test preamble - if ( !onePreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx) ) { + if ( !preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx, true) ) { if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx); return false; } @@ -550,13 +560,13 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) { if (g_debugMode) PrintAndLog("DEBUG: Error - End Parity check failed"); return false; } - // test for even parity bits. - if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,44) == 0 ) { + // 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 (g_debugMode) PrintAndLog("DEBUG: Error - Parity not detected"); return false; } - setDemodBuf(DemodBuffer, 40, 0); + setDemodBuf(DemodBuffer, 32, 0); *word = bytebits_to_byteLSBF(DemodBuffer, 32); } return true; @@ -675,7 +685,7 @@ int EM4x05ReadWord(uint8_t addr, uint32_t pwd, bool usePwd) { uint32_t wordData = 0; int success = EM4x05ReadWord_ext(addr, pwd, usePwd, &wordData); if (success == 1) - PrintAndLog(" Got Address %02d | %08X",addr,wordData); + PrintAndLog("%s Address %02d | %08X", (addr>13) ? "Lock":" Got",addr,wordData); else PrintAndLog("Read Address %02d | failed",addr); @@ -753,9 +763,10 @@ int CmdEM4x05dump(const char *Cmd) { int usage_lf_em_write(void) { PrintAndLog("Write EM4x05/EM4x69. Tag must be on antenna. "); PrintAndLog(""); - PrintAndLog("Usage: lf em 4x05writeword [h]
"); + PrintAndLog("Usage: lf em 4x05writeword [h] [s]
"); PrintAndLog("Options:"); PrintAndLog(" h - this help"); + PrintAndLog(" s - swap data bit order before write"); PrintAndLog(" address - memory address to write to. (0-15)"); PrintAndLog(" data - data to write (hex)"); PrintAndLog(" pwd - password (hex) (optional)"); @@ -768,18 +779,23 @@ int usage_lf_em_write(void) { int CmdEM4x05WriteWord(const char *Cmd) { uint8_t ctmp = param_getchar(Cmd, 0); if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write(); - + bool usePwd = false; - + uint8_t addr = 16; // default to invalid address uint32_t data = 0xFFFFFFFF; // default to blank data uint32_t pwd = 0xFFFFFFFF; // default to blank password - - addr = param_get8ex(Cmd, 0, 16, 10); - data = param_get32ex(Cmd, 1, 0, 16); - pwd = param_get32ex(Cmd, 2, 1, 16); - - + char swap = 0; + + int p = 0; + swap = param_getchar(Cmd, 0); + if (swap == 's' || swap=='S') p++; + addr = param_get8ex(Cmd, p++, 16, 10); + data = param_get32ex(Cmd, p++, 0, 16); + pwd = param_get32ex(Cmd, p++, 1, 16); + + if (swap == 's' || swap=='S') data = SwapBits(data, 32); + if ( (addr > 15) ) { PrintAndLog("Address must be between 0 and 15"); return 1; @@ -788,15 +804,15 @@ int CmdEM4x05WriteWord(const char *Cmd) { PrintAndLog("Writing address %d data %08X", addr, data); else { usePwd = true; - PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd); + PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd); } - + uint16_t flag = (addr << 8 ) | usePwd; - + UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}}; clearCommandBuffer(); SendCommand(&c); - UsbCommand resp; + UsbCommand resp; if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){ PrintAndLog("Error occurred, device did not respond during write operation."); return -1; @@ -804,7 +820,7 @@ int CmdEM4x05WriteWord(const char *Cmd) { if ( !downloadSamplesEM() ) { return -1; } - //check response for 00001010 for write confirmation! + //check response for 00001010 for write confirmation! //attempt demod: uint32_t dummy = 0; int result = demodEM4x05resp(&dummy,false); @@ -859,11 +875,11 @@ void printEM4x05config(uint32_t wordData) { } PrintAndLog("ConfigWord: %08X (Word 4)\n", wordData); PrintAndLog("Config Breakdown:", wordData); - PrintAndLog(" Data Rate: %02X | RF/%u", wordData & 0x3F, datarate); + PrintAndLog(" Data Rate: %02u | RF/%u", wordData & 0x3F, datarate); PrintAndLog(" Encoder: %u | %s", encoder, enc); PrintAndLog(" PSK CF: %u | %s", PSKcf, cf); PrintAndLog(" Delay: %u | %s", delay, cdelay); - PrintAndLog(" LastWordR: %02u | Address of last default word read", LWR); + PrintAndLog(" LastWordR: %02u | Address of last word for default read", LWR); PrintAndLog(" ReadLogin: %u | Read Login is %s", (wordData & 0x40000)>>18, (wordData & 0x40000) ? "Required" : "Not Required"); PrintAndLog(" ReadHKL: %u | Read Housekeeping Words Login is %s", (wordData & 0x80000)>>19, (wordData & 0x80000) ? "Required" : "Not Required"); PrintAndLog("WriteLogin: %u | Write Login is %s", (wordData & 0x100000)>>20, (wordData & 0x100000) ? "Required" : "Not Required"); @@ -898,8 +914,11 @@ void printEM4x05info(uint8_t chipType, uint8_t cap, uint16_t custCode, uint32_t } void printEM4x05ProtectionBits(uint32_t wordData) { - for (uint8_t i = 0; i < 14; i++) { - PrintAndLog(" Word: %02u | %s", i, (((1 << i) & wordData ) || i < 2) ? "Is Locked" : "Is Not Locked"); + for (uint8_t i = 0; i < 15; i++) { + PrintAndLog(" Word: %02u | %s", i, (((1 << i) & wordData ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked"); + if (i==14) { + PrintAndLog(" Word: %02u | %s", i+1, (((1 << i) & wordData ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked"); + } } }