X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cb1ba30a5ef09f5998dda9e57f6f0a69e0fae783..8ad1e731c8561ba050db2e80daff7b1e97e575ca:/client/cmdlfem4x.c
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index b8fe069d..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;
+ 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;
+ }
+ }
+ // 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] <pwd>");
+ 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] <address> <pwd>");
+ 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] <address> <data> <pwd>");
+ 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,7 +363,9 @@ 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
@@ -303,21 +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)
-{
- /*
- char buf[30] = {0x00};
- char *cmdStr = buf;
- int ans = 0;
- bool ST = config.ST;
- uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
- DemodBufferLen = 0x00;
- snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
- ans = ASKDemod_ext(cmdStr, FALSE, FALSE, 1, &ST);
- snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );
- ans = ASKbiphaseDemod(cmdStr, FALSE);
- */
-
+int EM4x50Read(const char *Cmd, bool verbose) {
uint8_t fndClk[] = {8,16,32,40,50,64,128};
int clk = 0;
int invert = 0;
@@ -508,27 +576,245 @@ 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 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 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 to Graphbuffer
+bool downloadSamplesEM(){
+
+ // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
+ uint8_t got[6000];
+ GetFromBigBuf(got, sizeof(got), 0);
+ if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+ PrintAndLog("command execution time out");
+ return FALSE;
+ }
+ setGraphBuf(got, sizeof(got));
+ return TRUE;
+}
+
+// em_demod
+bool doPreambleSearch(size_t *startIdx){
+
+ // sanity check
+ if ( DemodBufferLen < EM_PREAMBLE_LEN) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 demodbuffer too small");
+ return FALSE;
+ }
+
+ // 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 ( !preambleSearchEx(DemodBuffer, preamble, EM_PREAMBLE_LEN, &size, startIdx, TRUE)) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", *startIdx);
+ return FALSE;
+ }
+ return TRUE;
+}
+
+bool detectFSK(){
+ // detect fsk clock
+ if (!GetFskClock("", FALSE, FALSE)) {
+ 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 - EM: FSK Demod failed");
+ return FALSE;
+ }
+ return TRUE;
+}
+// PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
+bool detectPSK(){
+ int ans = GetPskClock("", FALSE, FALSE);
+ if (ans <= 0) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM: PSK clock failed");
+ return FALSE;
+ }
+ //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", FALSE, FALSE, 1, &stcheck);
+ if (!ans) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - EM: ASK/Manchester Demod failed");
+ return FALSE;
+ }
+ return TRUE;
+}
+bool detectASK_BI(){
+ int ans = ASKbiphaseDemod("0 0 1", FALSE);
+ if (!ans) {
+ 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 - EM: ASK/biphase inverted demod failed");
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+
+// param: idx - start index in demoded data.
+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;
+ }
+ 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...
+bool demodEM4x05resp(uint32_t *word) {
+ size_t idx = 0;
+
+ if (detectASK_MAN() && doPreambleSearch( &idx ))
+ return setDemodBufferEM(word, idx);
+
+ if (detectASK_BI() && doPreambleSearch( &idx ))
+ return setDemodBufferEM(word, idx);
+
+ if (detectFSK() && doPreambleSearch( &idx ))
+ return setDemodBufferEM(word, idx);
+
+ if (detectPSK()) {
+ if (doPreambleSearch( &idx ))
+ return setDemodBufferEM(word, idx);
+
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);
+ if (doPreambleSearch( &idx ))
+ return setDemodBufferEM(word, idx);
+ }
+ return FALSE;
+}
-int usage_lf_em_read(void) {
- PrintAndLog("Read EM4x50. Tag must be on antenna. ");
+//////////////// 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] <pwd>");
+ 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 readword [h] <address> <pwd>");
+ PrintAndLog("Usage: lf em 4x05read [h] <address> <pwd>");
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");
+ 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] <address> <data> <pwd>");
+ 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);
@@ -552,38 +838,32 @@ int CmdReadWord(const char *Cmd) {
PrintAndLog("Command timed out");
return -1;
}
+
+ if (!downloadSamplesEM())
+ return -1;
- //uint8_t got[12288];
- uint8_t got[30000];
- GetFromBigBuf(got, sizeof(got), 0);
- if ( !WaitForResponseTimeout(CMD_ACK, NULL, 8000) ) {
- PrintAndLog("command execution time out");
- return 0;
+ int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
+ if (graphJustNoise(GraphBuffer, testLen)) {
+ PrintAndLog("Tag not found");
+ return -1;
}
- setGraphBuf(got, sizeof(got));
- return 1;
-}
-int usage_lf_em_write(void) {
- PrintAndLog("Write EM4x50. Tag must be on antenna. ");
- PrintAndLog("");
- PrintAndLog("Usage: lf em writeword [h] <address> <data> <pwd>");
- 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;
+ //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;
-
+ bool usePwd = false;
int addr = 16; // default to invalid address
int data = 0xFFFFFFFF; // default to blank data
int pwd = 0xFFFFFFFF; // default to blank password
@@ -592,7 +872,6 @@ int CmdWriteWord(const char *Cmd) {
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;
@@ -610,24 +889,39 @@ 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;
}
- return 0;
+
+ if (!downloadSamplesEM())
+ return -1;
+
+
+ //attempt demod:
+ //need 0 bits demoded (after preamble) to verify write cmd
+ uint32_t dummy = 0;
+ int isOk = demodEM4x05resp(&dummy);
+ if (isOk)
+ PrintAndLog("Write Verified");
+
+ 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, "<UID> -- 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, "<UID> <'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, "<word> <pwd> -- Read EM4xxx word data"},
- {"writeword", CmdWriteWord, 1, "<sata> <word> <pwd> -- Write EM4xxx word 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, "<UID> -- 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, "<UID> <'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}
};