X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/daa4fbaeec9c1880b837f12a5057f55636d38d99..59f726c989e93a7a29fd23a442bd173839bfc845:/client/cmdlfem4x.c
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 559618bc..7d8d2931 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -18,11 +18,10 @@
#include "cmdparser.h"
#include "cmddata.h"
#include "cmdlf.h"
+#include "cmdmain.h"
#include "cmdlfem4x.h"
#include "lfdemod.h"
-#define llx PRIx64
-
char *global_em410xId;
static int CmdHelp(const char *Cmd);
@@ -58,7 +57,7 @@ int CmdEM410xRead(const char *Cmd)
return 0;
}
char id[12] = {0x00};
- sprintf(id, "%010llx",lo);
+ sprintf(id, "%010"PRIx64,lo);
global_em410xId = id;
return 1;
@@ -79,13 +78,13 @@ int CmdEM410xSim(const char *Cmd)
return 0;
}
/* clock is 64 in EM410x tags */
- int clock = 64;
+ uint8_t clock = 64;
if (param_gethex(Cmd, 0, uid, 10)) {
PrintAndLog("UID must include 10 HEX symbols");
return 0;
}
- param_getdec(Cmd,1,&clock);
+ 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");
@@ -287,7 +286,7 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
}
return code;
}
-/* Read the transmitted data of an EM4x50 tag
+/* Read the transmitted data of an EM4x50 tag from the graphbuffer
* Format:
*
* XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
@@ -500,53 +499,282 @@ int CmdEM4x50Read(const char *Cmd)
return EM4x50Read(Cmd, true);
}
-int CmdReadWord(const char *Cmd)
+int usage_lf_em_read(void) {
+ PrintAndLog("Read EM4x05/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");
+ return 0;
+}
+
+//search for given preamble in given BitStream and return success=1 or fail=0 and startIndex
+uint8_t EMpreambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t size, size_t *startIdx)
{
- int Word = -1; //default to invalid word
- UsbCommand c;
-
- sscanf(Cmd, "%d", &Word);
-
- if ( (Word > 15) | (Word < 0) ) {
- PrintAndLog("Word must be between 0 and 15");
+ // Sanity check. If preamble length is bigger than bitstream length.
+ if ( size <= pLen ) return 0;
+ // em only sends preamble once, so look for it once in the first x bits
+ uint8_t foundCnt = 0;
+ for (int idx = 0; idx < size - pLen; idx++){
+ if (memcmp(BitStream+idx, preamble, pLen) == 0){
+ //first index found
+ foundCnt++;
+ if (foundCnt == 1) {
+ *startIdx = idx;
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
+// 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) {
+ int ans = 0;
+ bool demodFound = false;
+ DemodBufferLen = 0x00;
+ // skip first two 0 bits as they might have been missed in the demod
+ uint8_t preamble[6] = {0,0,1,0,1,0};
+
+ // test for FSK wave (easiest to 99% ID)
+ if (GetFskClock("", FALSE, FALSE)) {
+ //valid fsk clocks found
+ ans = FSKrawDemod("0 0", false);
+ if (!ans) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: FSK Demod failed");
+ } else {
+ // set size to 10 to only test first 4 positions for the preamble
+ size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
+ size_t startIdx = 0;
+
+ if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
+
+ uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+ if ( errChk == 0) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+ } else {
+ //can't test size because the preamble doesn't repeat :(
+ //meaning chances of false positives are high.
+ demodFound = true;
+ }
+ }
+ }
+ // PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
+ if (!demodFound) {
+ ans = GetPskClock("", FALSE, FALSE);
+ if (ans>0) {
+ PrintAndLog("PSK response possibly found, run `data rawd p1` to attempt to demod");
+ }
+ }
+
+ // more common than biphase
+ if (!demodFound) {
+ DemodBufferLen = 0x00;
+ // try manchester - NOTE: ST only applies to T55x7 tags.
+ ans = ASKDemod_ext("0,0,1", false, false, 1, false);
+ if (!ans) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed");
+ } else {
+ // set size to 10 to only test first 4 positions for the preamble
+ size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
+ size_t startIdx = 0;
+
+ if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
+
+ uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+ if ( errChk == 0) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+ } else {
+ //can't test size because the preamble doesn't repeat :(
+ //meaning chances of false positives are high.
+ demodFound = true;
+ }
+ }
+ }
+
+ if (!demodFound) {
+ DemodBufferLen = 0x00;
+ //try biphase
+ ans = ASKbiphaseDemod("0 0 1", FALSE);
+ if (!ans) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed");
+ } else {
+ // set size to 10 to only test first 4 positions for the preamble
+ size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
+ size_t startIdx = 0;
+
+ if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
+
+ uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+ if ( errChk == 0) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+ } else {
+ //can't test size because the preamble doesn't repeat :(
+ //meaning chances of false positives are high.
+ demodFound = true;
+ }
+ }
+ }
+
+ if (!demodFound) {
+ DemodBufferLen = 0x00;
+ //try diphase (differential biphase or inverted)
+ ans = ASKbiphaseDemod("0 1 1", FALSE);
+ if (!ans) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed");
+ } else {
+ // set size to 10 to only test first 4 positions for the preamble
+ size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
+ size_t startIdx = 0;
+
+ if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
+
+ uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+ if ( errChk == 0) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+ } else {
+ //can't test size because the preamble doesn't repeat :(
+ //meaning chances of false positives are high.
+ demodFound = true;
+ }
+ }
+ }
+
+ if (demodFound && bitsNeeded < DemodBufferLen) {
+ if (bitsNeeded > 0) {
+ setDemodBuf(DemodBuffer + ans + sizeof(preamble), bitsNeeded, 0);
+ CmdPrintDemodBuff("x");
+ }
return 1;
}
+ return -1;
+}
+
+int CmdReadWord(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();
+
+ addr = param_get8ex(Cmd, 0, -1, 10);
+ pwd = param_get32ex(Cmd, 1, -1, 16);
- PrintAndLog("Reading word %d", Word);
+ if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+ PrintAndLog("Address must be between 0 and 15");
+ return 1;
+ }
+ if ( pwd == -1 )
+ PrintAndLog("Reading address %d", addr);
+ else {
+ usePwd = true;
+ PrintAndLog("Reading address %d | password %08X", addr, pwd);
+ }
- c.cmd = CMD_EM4X_READ_WORD;
- c.d.asBytes[0] = 0x0; //Normal mode
- c.arg[0] = 0;
- c.arg[1] = Word;
- c.arg[2] = 0;
+ UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
+ clearCommandBuffer();
SendCommand(&c);
+ UsbCommand resp;
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
+ PrintAndLog("Command timed out");
+ return -1;
+ }
+
+ uint8_t got[6000];
+ GetFromBigBuf(got, sizeof(got), 0);
+ if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+ PrintAndLog("command execution time out");
+ return -1;
+ }
+ setGraphBuf(got, sizeof(got));
+ int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
+ if (graphJustNoise(GraphBuffer, testLen)) {
+ PrintAndLog("no tag not found");
+ return -1;
+ }
+
+ //attempt demod:
+ //need 32 bits from a read word
+ return demodEM4x05resp(32);
+}
+
+int usage_lf_em_write(void) {
+ PrintAndLog("Write EM4x05/EM4x69. 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");
return 0;
}
-int CmdReadWordPWD(const char *Cmd)
-{
- int Word = -1; //default to invalid word
- int Password = 0xFFFFFFFF; //default to blank password
- UsbCommand c;
+int CmdWriteWord(const char *Cmd) {
+ uint8_t ctmp = param_getchar(Cmd, 0);
+ if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write();
- sscanf(Cmd, "%d %x", &Word, &Password);
+ bool usePwd = false;
+
+ int addr = 16; // default to invalid address
+ int data = 0xFFFFFFFF; // default to blank data
+ int pwd = 0xFFFFFFFF; // default to blank password
- if ( (Word > 15) | (Word < 0) ) {
- PrintAndLog("Word must be between 0 and 15");
+ addr = param_get8ex(Cmd, 0, -1, 10);
+ data = param_get32ex(Cmd, 1, -1, 16);
+ pwd = param_get32ex(Cmd, 2, -1, 16);
+
+
+ if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+ PrintAndLog("Address must be between 0 and 15");
return 1;
}
+ if ( pwd == -1 )
+ PrintAndLog("Writing address %d data %08X", addr, data);
+ else {
+ usePwd = true;
+ PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);
+ }
- PrintAndLog("Reading word %d with password %08X", Word, Password);
+ uint16_t flag = (addr << 8 ) | usePwd;
- c.cmd = CMD_EM4X_READ_WORD;
- c.d.asBytes[0] = 0x1; //Password mode
- c.arg[0] = 0;
- c.arg[1] = Word;
- c.arg[2] = Password;
+ UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
+ clearCommandBuffer();
SendCommand(&c);
- return 0;
+ UsbCommand resp;
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+ PrintAndLog("Error occurred, device did not respond during write operation.");
+ return -1;
+ }
+ //get response if there is one
+ uint8_t got[6000]; // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
+ GetFromBigBuf(got, sizeof(got), 0);
+ if ( !WaitForResponseTimeout(CMD_ACK, NULL, 8000) ) {
+ PrintAndLog("command execution time out");
+ return 0;
+ }
+ setGraphBuf(got, sizeof(got));
+ //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) {
+ PrintAndLog("Write Verified");
+ }
+ return result;
}
+/*
int CmdWriteWord(const char *Cmd)
{
int Word = 16; //default to invalid block
@@ -595,21 +823,21 @@ int CmdWriteWordPWD(const char *Cmd)
SendCommand(&c);
return 0;
}
-
+*/
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"},
+ {"em410xsim", CmdEM410xSim, 0, " [clock rate] -- 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, "Extract data from EM4x50 tag"},
- {"readword", CmdReadWord, 1, " -- Read EM4xxx word data"},
- {"readwordPWD", CmdReadWordPWD, 1, " -- Read EM4xxx word data in password mode"},
- {"writeword", CmdWriteWord, 1, " -- Write EM4xxx word data"},
- {"writewordPWD", CmdWriteWordPWD, 1, " -- Write EM4xxx word data in password mode"},
+ {"em4x50read", CmdEM4x50Read, 1, "demod data from EM4x50 tag from the graph buffer"},
+ {"readword", CmdReadWord, 1, " (pwd) -- Read EM4x05/EM4x69 word data"},
+ //{"readwordPWD", CmdReadWordPWD, 1, " -- Read EM4xxx word data in password mode"},
+ {"writeword", CmdWriteWord, 1, " (pwd) -- Write EM4x05/EM4x69 word data"},
+ //{"writewordPWD", CmdWriteWordPWD, 1, " -- Write EM4xxx word data in password mode"},
{NULL, NULL, 0, NULL}
};