CHG: @marshmellow42 's XL size, and em4x05 timmings.

[proxmark3-svn] / client / cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index a0bddb2af3779054c1d43746ff699e3b59b620a3..59a1eef3182a80d961a9cf926de86a2d4a309141 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -14,6 +14,20 @@ uint64_t g_em410xid = 0;
 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 

+int usage_lf_em410x_sim(void) {
+       PrintAndLog("Simulating EM410x tag");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf em 410xsim [h] <uid> <clock>");
+       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;
+}
+

 int CmdEMdemodASK(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);
 int CmdEMdemodASK(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);


@@ -33,35 +47,16 @@ int CmdEMdemodASK(const char *Cmd)
  */
 int CmdEM410xRead(const char *Cmd)
 {
  */
 int CmdEM410xRead(const char *Cmd)
 {

-       uint32_t hi=0;
-       uint64_t lo=0;
+       uint32_t hi = 0;
+       uint64_t lo = 0;

 
        if(!AskEm410xDemod("", &hi, &lo, false)) return 0;
 
        if(!AskEm410xDemod("", &hi, &lo, false)) return 0;

-       PrintAndLog("EM410x pattern found: ");
+

        printEM410x(hi, lo);
        printEM410x(hi, lo);

-       if (hi){
-               PrintAndLog ("EM410x XL pattern found");
-               return 0;
-       }

        g_em410xid = lo;
        return 1;
 }
 
        g_em410xid = lo;
        return 1;
 }
 

-
-int usage_lf_em410x_sim(void) {
-       PrintAndLog("Simulating EM410x tag");
-       PrintAndLog("");
-       PrintAndLog("Usage:  lf em4x em410xsim [h] <uid> <clock>");
-       PrintAndLog("Options:");
-       PrintAndLog("       h         - this help");
-       PrintAndLog("       uid       - uid (10 HEX symbols)");
-       PrintAndLog("       clock     - clock (32|64) (optional)");
-       PrintAndLog("samples:");
-       PrintAndLog("      lf em4x em410xsim 0F0368568B");
-       PrintAndLog("      lf em4x em410xsim 0F0368568B 32");
-       return 0;
-}
-

 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd)
 {
 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd)
 {


@@ -138,19 +133,15 @@ int CmdEM410xSim(const char *Cmd)
  *  Changed by martin, 4000 x 4 = 16000, 
  *  see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
 */
  *  Changed by martin, 4000 x 4 = 16000, 
  *  see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
 */

-int CmdEM410xWatch(const char *Cmd)
-{
+int CmdEM410xWatch(const char *Cmd) {

        do {
                if (ukbhit()) {
                        printf("\naborted via keyboard!\n");
                        break;
        do {
                if (ukbhit()) {
                        printf("\naborted via keyboard!\n");
                        break;

-               }
-               
+               }               

                CmdLFRead("s");
                CmdLFRead("s");

-               //getSamples("8201",true); //capture enough to get 2 complete preambles (4096*2+9)      

                getSamples("6144",true);
        } while (!CmdEM410xRead(""));
                getSamples("6144",true);
        } while (!CmdEM410xRead(""));

-

        return 0;
 }
 
        return 0;
 }
 


@@ -452,7 +443,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
                        }
                }
                if (!clk) {
                        }
                }
                if (!clk) {

-                       PrintAndLog("ERROR: EM4x50 - didn't find a clock");
+                       if (verbose || g_debugMode) PrintAndLog("ERROR: EM4x50 - didn't find a clock");

                        return 0;
                }
        } else tol = clk/8;
                        return 0;
                }
        } else tol = clk/8;


@@ -718,7 +709,7 @@ bool setDemodBufferEM(uint32_t *word, size_t idx){
 // the rest will need to be manually demoded for now...
 bool demodEM4x05resp(uint32_t *word) {
        size_t idx = 0; 
 // the rest will need to be manually demoded for now...
 bool demodEM4x05resp(uint32_t *word) {
        size_t idx = 0; 

-       
+       *word = 0;

        if (detectASK_MAN() && doPreambleSearch( &idx ))
                return setDemodBufferEM(word, idx);
        
        if (detectASK_MAN() && doPreambleSearch( &idx ))
                return setDemodBufferEM(word, idx);
        


@@ -792,6 +783,26 @@ int usage_lf_em4x05_info(void) {
        return 0;
 }
 
        return 0;
 }
 

+int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) {
+       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;
+       }
+       if ( !downloadSamplesEM() ) {
+               return -1;
+       }
+       int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
+       if (graphJustNoise(GraphBuffer, testLen)) {
+               PrintAndLog("no tag found");
+               return -1;
+       }
+       return demodEM4x05resp(word);
+}
+

 int CmdEM4x05Dump(const char *Cmd) {
        uint8_t addr = 0;
        uint32_t pwd = 0;
 int CmdEM4x05Dump(const char *Cmd) {
        uint8_t addr = 0;
        uint32_t pwd = 0;


@@ -806,69 +817,53 @@ int CmdEM4x05Dump(const char *Cmd) {
                usePwd = true;
 
        int success = 1;
                usePwd = true;
 
        int success = 1;

+       uint32_t word = 0;

        PrintAndLog("Addr | data   | ascii");
        PrintAndLog("-----+--------+------");
        for (; addr < 16; addr++) {
        PrintAndLog("Addr | data   | ascii");
        PrintAndLog("-----+--------+------");
        for (; addr < 16; addr++) {

+               

                if (addr == 2) {
                        if (usePwd) {
                if (addr == 2) {
                        if (usePwd) {

-                               PrintAndLog(" %02u | %08X", addr, pwd);
+                               PrintAndLog(" %02u | %08X", addr, pwd, word );

                        } else {
                                PrintAndLog(" 02 | cannot read");
                        }
                } else {
                        } else {
                                PrintAndLog(" 02 | cannot read");
                        }
                } else {

-                       //success &= EM4x05Read(addr, pwd, usePwd);
+                       success &= EM4x05ReadWord_ext(addr, pwd, usePwd, &word);

                }
        }
 
        return success;
 }
                }
        }
 
        return success;
 }

-//ICEMAN;  mentalnote to self: -1 is not doable for uint32_t..
+

 int CmdEM4x05Read(const char *Cmd) {
 int CmdEM4x05Read(const char *Cmd) {

-       int addr, pwd;
+       uint8_t addr;
+       uint32_t pwd;

        bool usePwd = false;
        uint8_t ctmp = param_getchar(Cmd, 0);
        if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_read();
 
        bool usePwd = false;
        uint8_t ctmp = param_getchar(Cmd, 0);
        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);
+       addr = param_get8ex(Cmd, 0, 50, 10);
+       pwd =  param_get32ex(Cmd, 1, 1, 16);

        
        

-       if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+       if (addr > 15) {

                PrintAndLog("Address must be between 0 and 15");
                return 1;
        }
                PrintAndLog("Address must be between 0 and 15");
                return 1;
        }

-       if ( pwd == -1 )
-               PrintAndLog("Reading address %d", addr);
+       if ( pwd == 1 ) {
+               PrintAndLog("Reading address %02u", addr);
+       }

        else {
                usePwd = true;
        else {
                usePwd = true;

-               PrintAndLog("Reading address %d | password %08X", addr, pwd);
-       }
-       
-       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;
+               PrintAndLog("Reading address %02u | password %08X", addr, pwd);

        }
        }

-
-       if (!downloadSamplesEM())
-               return -1;

        
        

-       int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
-       if (graphJustNoise(GraphBuffer, testLen)) {
-               PrintAndLog("Tag not found");
-               return -1;
-       }
-
-       //attempt demod

        uint32_t word = 0;
        uint32_t word = 0;

-       int isOk = demodEM4x05resp(&word);
+       int isOk = EM4x05ReadWord_ext(addr, pwd, usePwd, &word);

        if (isOk)
        if (isOk)

-               PrintAndLog("Got Address %02d | %08X",addr, word);
+               PrintAndLog("Address %02d | %08X - %s", addr, word, (addr > 13) ? "Lock" : "");

        else
        else

-               PrintAndLog("Read failed");
-       
+               PrintAndLog("Read Address %02d | failed",addr);

        return isOk;
 }
 
        return isOk;
 }
 


@@ -877,19 +872,19 @@ int CmdEM4x05Write(const char *Cmd) {
        if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_write();
        
        bool usePwd = false;            
        if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_write();
        
        bool usePwd = false;            

-       int addr = 16; // default to invalid address
-       int data = 0xFFFFFFFF; // default to blank data
-       int pwd = 0xFFFFFFFF; // default to blank password
+       uint8_t addr = 50; // default to invalid address
+       uint32_t data = 0; // default to blank data
+       uint32_t pwd = 1; // default to blank password

        
        

-       addr = param_get8ex(Cmd, 0, -1, 10);
-       data = param_get32ex(Cmd, 1, -1, 16);
-       pwd =  param_get32ex(Cmd, 2, -1, 16);
+       addr = param_get8ex(Cmd, 0, 50, 10);
+       data = param_get32ex(Cmd, 1, 0, 16);
+       pwd =  param_get32ex(Cmd, 2, 1, 16);

        
        

-       if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+       if ( addr > 15 ) {

                PrintAndLog("Address must be between 0 and 15");
                return 1;
        }
                PrintAndLog("Address must be between 0 and 15");
                return 1;
        }

-       if ( pwd == -1 )
+       if ( pwd == 1 )

                PrintAndLog("Writing address %d data %08X", addr, data);        
        else {
                usePwd = true;
                PrintAndLog("Writing address %d data %08X", addr, data);        
        else {
                usePwd = true;


@@ -910,8 +905,6 @@ int CmdEM4x05Write(const char *Cmd) {
        if (!downloadSamplesEM())
                return -1;
 
        if (!downloadSamplesEM())
                return -1;
 

-
-       //attempt demod:

        //need 0 bits demoded (after preamble) to verify write cmd
        uint32_t dummy = 0;
        int isOk = demodEM4x05resp(&dummy);
        //need 0 bits demoded (after preamble) to verify write cmd
        uint32_t dummy = 0;
        int isOk = demodEM4x05resp(&dummy);


@@ -980,48 +973,54 @@ void printEM4x05config(uint32_t wordData) {
        PrintAndLog("    Pigeon:   %u | Pigeon Mode is %s\n", (wordData & 0x4000000)>>26, (wordData & 0x4000000) ? "Enabled" : "Disabled");
 }
 
        PrintAndLog("    Pigeon:   %u | Pigeon Mode is %s\n", (wordData & 0x4000000)>>26, (wordData & 0x4000000) ? "Enabled" : "Disabled");
 }
 

-void printEM4x05info(uint8_t chipType, uint8_t cap, uint16_t custCode, uint32_t serial) {
+void printEM4x05info(uint32_t block0, uint32_t serial) {
+               
+       uint8_t chipType = (block0 >> 1) & 0xF;
+       uint8_t cap = (block0 >> 5) & 3;
+       uint16_t custCode = (block0 >> 9) & 0x3FF;
+       

        switch (chipType) {
        switch (chipType) {

-               case 9: PrintAndLog("\n Chip Type:   %u | EM4305", chipType); break;
-               case 4: PrintAndLog(" Chip Type:   %u | Unknown", chipType); break;
-               case 2: PrintAndLog(" Chip Type:   %u | EM4469", chipType); break;
+               case 9:  PrintAndLog("\n Chip Type:   %u | EM4305", chipType); break;
+               case 8:  PrintAndLog("\n Chip Type:   %u | EM4205", chipType); break;
+               case 4:  PrintAndLog(" Chip Type:   %u | Unknown", chipType); break;
+               case 2:  PrintAndLog(" Chip Type:   %u | EM4469", chipType); break;

                //add more here when known
                default: PrintAndLog(" Chip Type:   %u Unknown", chipType); break;
        }
 
        switch (cap) {
                //add more here when known
                default: PrintAndLog(" Chip Type:   %u Unknown", chipType); break;
        }
 
        switch (cap) {

-               case 3: PrintAndLog("  Cap Type:   %u | 330pF",cap); break;
-               case 2: PrintAndLog("  Cap Type:   %u | %spF",cap, (chipType==2)? "75":"210"); break;
-               case 1: PrintAndLog("  Cap Type:   %u | 250pF",cap); break;
-               case 0: PrintAndLog("  Cap Type:   %u | no resonant capacitor",cap); break;
+               case 3:  PrintAndLog("  Cap Type:   %u | 330pF",cap); break;
+               case 2:  PrintAndLog("  Cap Type:   %u | %spF",cap, (chipType==2)? "75":"210"); break;
+               case 1:  PrintAndLog("  Cap Type:   %u | 250pF",cap); break;
+               case 0:  PrintAndLog("  Cap Type:   %u | no resonant capacitor",cap); break;

                default: PrintAndLog("  Cap Type:   %u | unknown",cap); break;
        }
 
        PrintAndLog(" Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
                default: PrintAndLog("  Cap Type:   %u | unknown",cap); break;
        }
 
        PrintAndLog(" Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");

-       if (serial != 0) {
+       if (serial != 0)

                PrintAndLog("\n  Serial #: %08X\n", serial);
                PrintAndLog("\n  Serial #: %08X\n", serial);

-       }

 }
 
 }
 

-void printEM4x05ProtectionBits(uint32_t wordData) {
+void printEM4x05ProtectionBits(uint32_t word) {

        for (uint8_t i = 0; i < 15; i++) {
        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");
-               }
+               PrintAndLog("      Word:  %02u | %s", i, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");
+               if (i==14) 
+                       PrintAndLog("      Word:  %02u | %s", i+1, (((1 << i) & word ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");

        }
 }
 
 //quick test for EM4x05/EM4x69 tag
        }
 }
 
 //quick test for EM4x05/EM4x69 tag

-bool EM4x05Block0Test(uint32_t *wordData) {
-//     return (EM4x05ReadWord_ext(0,0,false,wordData) == 1);
-       return false;
+bool EM4x05IsBlock0(uint32_t *word) {
+       return EM4x05ReadWord_ext(0, 0, FALSE, word);

 }
 
 int CmdEM4x05Info(const char *Cmd) {
 }
 
 int CmdEM4x05Info(const char *Cmd) {

-       /*
+#define EM_SERIAL_BLOCK 1
+#define EM_CONFIG_BLOCK 4
+#define EM_PROT1_BLOCK 14
+#define EM_PROT2_BLOCK 15

        uint32_t pwd;
        uint32_t pwd;

-       uint32_t wordData = 0;
+       uint32_t word = 0, block0 = 0, serial = 0;

        bool usePwd = false;
        uint8_t ctmp = param_getchar(Cmd, 0);
        if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_info();
        bool usePwd = false;
        uint8_t ctmp = param_getchar(Cmd, 0);
        if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em4x05_info();


@@ -1034,46 +1033,33 @@ int CmdEM4x05Info(const char *Cmd) {
 
        // read word 0 (chip info)
        // block 0 can be read even without a password.
 
        // read word 0 (chip info)
        // block 0 can be read even without a password.

-       if ( !EM4x05Block0Test(&wordData) ) 
+       if ( !EM4x05IsBlock0(&block0) ) 

                return -1;
        
                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
        // read word 1 (serial #) doesn't need pwd

-       wordData = 0;
-       if (EM4x05ReadWord_ext(1, 0, false, &wordData) != 1) {
-               //failed, but continue anyway...
-       }
-       printEM4x05info(chipType, cap, custCode, wordData);
+       // continue if failed, .. non blocking fail.
+       EM4x05ReadWord_ext(EM_SERIAL_BLOCK, 0, false, &serial);
+       printEM4x05info(block0, serial);

 
        // read word 4 (config block) 
        // needs password if one is set
 
        // read word 4 (config block) 
        // needs password if one is set

-       wordData = 0;
-       if ( EM4x05ReadWord_ext(4, pwd, usePwd, &wordData) != 1 )
+       if ( EM4x05ReadWord_ext(EM_CONFIG_BLOCK, pwd, usePwd, &word) != 1 )

                return 0;
        
                return 0;
        

-       printEM4x05config(wordData);
+       printEM4x05config(word);

 
        // read word 14 and 15 to see which is being used for the protection bits
 
        // read word 14 and 15 to see which is being used for the protection bits

-       wordData = 0;
-       if ( EM4x05ReadWord_ext(14, pwd, usePwd, &wordData) != 1 ) {
+       if ( EM4x05ReadWord_ext(EM_PROT1_BLOCK, pwd, usePwd, &word) != 1 ) {

                return 0;
        }
        // if status bit says this is not the used protection word
                return 0;
        }
        // if status bit says this is not the used protection word

-       if (!(wordData & 0x8000)) {
-               if ( EM4x05ReadWord_ext(15, pwd, usePwd, &wordData) != 1 ) {
+       if (!(word & 0x8000)) {
+               if ( EM4x05ReadWord_ext(EM_PROT2_BLOCK, pwd, usePwd, &word) != 1 )

                        return 0;
                        return 0;

-               }

        }
        }

-       if (!(wordData & 0x8000)) {
-               //something went wrong
-               return 0;
-       }
-       printEM4x05ProtectionBits(wordData);
-       
-       */
+       //something went wrong
+       if (!(word & 0x8000)) return 0;
+       printEM4x05ProtectionBits(word);

        return 1;
 }
 
        return 1;
 }
 


@@ -1081,12 +1067,12 @@ static command_t CommandTable[] = {
        {"help",                CmdHelp,                        1, "This help"},
        {"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"},
        {"help",                CmdHelp,                        1, "This help"},
        {"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"},
+       {"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, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
        {"4x05dump",    CmdEM4x05Dump,          0, "dump EM4205/4305 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"},
        {"4x05dump",    CmdEM4x05Dump,          0, "dump EM4205/4305 tag"},

-       {"4x05info",    CmdEM4x05Info,      0, "Tag information EM4x05/EM4x69"},
+       {"4x05info",    CmdEM4x05Info,      0, "tag information EM4x05/EM4x69"},

        {"4x05read",    CmdEM4x05Read,          0, "read word data from EM4205/4305"},
        {"4x05write",   CmdEM4x05Write,         0, "write word data to EM4205/4305"},
        {"4x50read",    CmdEM4x50Read,          0, "read word data from EM4x50"},
        {"4x05read",    CmdEM4x05Read,          0, "read word data from EM4205/4305"},
        {"4x05write",   CmdEM4x05Write,         0, "write word data to EM4205/4305"},
        {"4x50read",    CmdEM4x50Read,          0, "read word data from EM4x50"},