Code cleanup: Refactoring nonce2key

[proxmark3-svn] / client / cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 7d8d2931aa0ea186d88898a6f1f34530c3e4e4a6..d2ccfae8ef05768320979b3ea0e4730d1f51f73a 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -14,6 +14,7 @@
 #include "proxmark3.h"
 #include "ui.h"
 #include "util.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "util.h"

+#include "data.h"

 #include "graph.h"
 #include "cmdparser.h"
 #include "cmddata.h"
 #include "graph.h"
 #include "cmdparser.h"
 #include "cmddata.h"


@@ -63,6 +64,20 @@ int CmdEM410xRead(const char *Cmd)
        return 1;
 }
 
        return 1;
 }
 

+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;
+}
+

 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd)
 {
 // 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};
 
        char cmdp = param_getchar(Cmd, 0);
        uint8_t uid[5] = {0x00};
 

-       if (cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Usage:  lf em4x em410xsim <UID> <clock>");
-               PrintAndLog("");
-               PrintAndLog("     sample: lf em4x em410xsim 0F0368568B");
-               return 0;
-       }
+       if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();

        /* clock is 64 in EM410x tags */
        uint8_t clock = 64;
 
        /* 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
 
        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) {
 
        // Check ID
        if (id == 0xFFFFFFFFFFFFFFFF) {


@@ -228,6 +238,7 @@ int CmdEM410xWrite(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

+//**************** Start of EM4x50 Code ************************

 bool EM_EndParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)
 {
        if (rows*cols>size) return false;
 bool EM_EndParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)
 {
        if (rows*cols>size) return false;


@@ -499,184 +510,157 @@ int CmdEM4x50Read(const char *Cmd)
        return EM4x50Read(Cmd, true);
 }
 
        return EM4x50Read(Cmd, true);
 }
 

+//**************** Start of EM4x05/EM4x69 Code ************************

 int usage_lf_em_read(void) {
        PrintAndLog("Read EM4x05/EM4x69.  Tag must be on antenna. ");
        PrintAndLog("");
 int usage_lf_em_read(void) {
        PrintAndLog("Read EM4x05/EM4x69.  Tag must be on antenna. ");
        PrintAndLog("");

-       PrintAndLog("Usage:  lf em readword [h] <address> <pwd>");
+       PrintAndLog("Usage:  lf em 4x05readword [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("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 4x05readword 1");
+       PrintAndLog("      lf em 4x05readword 1 11223344");

        return 0;
 }
 
        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)
-{
-       // 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;
-                       }
+// for command responses from em4x05 or em4x69
+// download samples from device and copy them to the 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, 4000) ) {
+               PrintAndLog("command execution time out");
+               return false;
+       }
+       setGraphBuf(got, sizeof(got));
+       return true;
+}
+
+bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
+       // em4x05/em4x69 command response preamble is 00001010
+       // skip first two 0 bits as they might have been missed in the demod
+       uint8_t preamble[] = {0,0,1,0,1,0};
+       size_t startIdx = 0;
+
+       // set size to 20 to only test first 14 positions for the preamble or less if not a read command
+       size_t size = (readCmd) ? 20 : 11;
+       // sanity check
+       size = (size > DemodBufferLen) ? DemodBufferLen : size;
+       // test preamble
+       if ( !preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx, true) ) {
+               if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+               return false;
+       }
+       // if this is a readword command, get the read bytes and test the parities
+       if (readCmd) {
+               if (!EM_EndParityTest(DemodBuffer + startIdx + sizeof(preamble), 45, 5, 9, 0)) {
+                       if (g_debugMode) PrintAndLog("DEBUG: Error - End Parity check failed");
+                       return false;

                }
                }

+               // 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, 32, 0);
+               *word = bytebits_to_byteLSBF(DemodBuffer, 32);

        }
        }

-       return 0;
+       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...
 }
 
 // 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 demodEM4x05resp(uint32_t *word, bool readCmd) {

        int ans = 0;
        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)
 
        // test for FSK wave (easiest to 99% ID)

-       if (GetFskClock("", FALSE, FALSE)) {
+       if (GetFskClock("", false, false)) {

                //valid fsk clocks found
                ans = FSKrawDemod("0 0", false);
                if (!ans) {
                //valid fsk clocks found
                ans = FSKrawDemod("0 0", false);
                if (!ans) {

-                       if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: FSK Demod failed");
+                       if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: FSK Demod failed, ans: %d", ans);

                } else {
                } 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 (EM4x05testDemodReadData(word, readCmd)) {
+                               return 1;

                        }
                }
        }
        // PSK clocks should be easy to detect ( but difficult to demod a non-repeating pattern... )
                        }
                }
        }
        // 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);
+       ans = GetPskClock("", false, false);
+       if (ans>0) {
+               //try psk1
+               ans = PSKDemod("0 0 6", false);

                if (!ans) {
                if (!ans) {

-                       if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed");
+                       if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: PSK1 Demod failed, ans: %d", ans);

                } else {
                } 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);
+                       if (EM4x05testDemodReadData(word, readCmd)) {
+                               return 1;

                        } else {
                        } else {

-                               //can't test size because the preamble doesn't repeat :(
-                               //meaning chances of false positives are high.
-                               demodFound = true;
+                               //try psk2
+                               psk1TOpsk2(DemodBuffer, DemodBufferLen);
+                               if (EM4x05testDemodReadData(word, readCmd)) {
+                                       return 1;
+                               }

                        }
                        }

-               }
-       }
-
-       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);
+                       //try psk1 inverted
+                       ans = PSKDemod("0 1 6", false);
+                       if (!ans) {
+                               if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: PSK1 Demod failed, ans: %d", ans);

                        } else {
                        } else {

-                               //can't test size because the preamble doesn't repeat :(
-                               //meaning chances of false positives are high.
-                               demodFound = true;
+                               if (EM4x05testDemodReadData(word, readCmd)) {
+                                       return 1;
+                               } else {
+                                       //try psk2
+                                       psk1TOpsk2(DemodBuffer, DemodBufferLen);
+                                       if (EM4x05testDemodReadData(word, readCmd)) {
+                                               return 1;
+                                       }
+                               }

                        }
                }
        }
 
                        }
                }
        }
 

-       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);
+       // manchester is more common than biphase... try first
+       bool stcheck = false;
+       // try manchester - NOTE: ST only applies to T55x7 tags.
+       ans = ASKDemod_ext("0,0,1", false, false, 1, &stcheck);
+       if (!ans) {
+               if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed, ans: %d", ans);
+       } else {
+               if (EM4x05testDemodReadData(word, readCmd)) {
+                       return 1;
+               }
+       }

 
 

-                       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;
-                       }
+       //try biphase
+       ans = ASKbiphaseDemod("0 0 1", false);
+       if (!ans) { 
+               if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans);
+       } else {
+               if (EM4x05testDemodReadData(word, readCmd)) {
+                       return 1;

                }
        }
 
                }
        }
 

-       if (demodFound && bitsNeeded < DemodBufferLen) {
-               if (bitsNeeded > 0) {
-                       setDemodBuf(DemodBuffer + ans + sizeof(preamble), bitsNeeded, 0);
-                       CmdPrintDemodBuff("x");                 
+       //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, ans: %d", ans);
+       } else {
+               if (EM4x05testDemodReadData(word, readCmd)) {
+                       return 1;

                }
                }

-               return 1;

        }
        }

+

        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);
-       
-       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);
-       }
-       
+int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *wordData) {

        UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
        clearCommandBuffer();
        SendCommand(&c);


@@ -685,60 +669,132 @@ int CmdReadWord(const char *Cmd) {
                PrintAndLog("Command timed out");
                return -1;
        }
                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");
+       if ( !downloadSamplesEM() ) {

                return -1;
        }
                return -1;
        }

-       setGraphBuf(got, sizeof(got));

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

-

        //attempt demod:
        //attempt demod:

-       //need 32 bits from a read word
-       return demodEM4x05resp(32);
+       return demodEM4x05resp(wordData, true);
+}
+
+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("%s Address %02d | %08X", (addr>13) ? "Lock":" Got",addr,wordData);
+       else
+               PrintAndLog("Read Address %02d | failed",addr);
+
+       return success;

 }
 
 }
 

+int CmdEM4x05ReadWord(const char *Cmd) {
+       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_em_read();
+
+       addr = param_get8ex(Cmd, 0, 50, 10);
+       // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
+       pwd =  param_get32ex(Cmd, 1, 1, 16);
+       
+       if ( (addr > 15) ) {
+               PrintAndLog("Address must be between 0 and 15");
+               return 1;
+       }
+       if ( pwd == 1 ) {
+               PrintAndLog("Reading address %02u", addr);
+       }       else {
+               usePwd = true;
+               PrintAndLog("Reading address %02u | password %08X", addr, pwd);
+       }
+
+       return EM4x05ReadWord(addr, pwd, usePwd);
+}
+
+int usage_lf_em_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 CmdEM4x05dump(const char *Cmd) {
+       uint8_t addr = 0;
+       uint32_t pwd;
+       bool usePwd = false;
+       uint8_t ctmp = param_getchar(Cmd, 0);
+       if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_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;
+       for (; addr < 16; addr++) {
+               if (addr == 2) {
+                       if (usePwd) {
+                               PrintAndLog(" PWD Address %02u | %08X",addr,pwd);
+                       } else {
+                               PrintAndLog(" PWD Address 02 | cannot read");
+                       }
+               } else {
+                       success &= EM4x05ReadWord(addr, pwd, usePwd);
+               }
+       }
+
+       return success;
+}
+
+

 int usage_lf_em_write(void) {
        PrintAndLog("Write EM4x05/EM4x69.  Tag must be on antenna. ");
        PrintAndLog("");
 int usage_lf_em_write(void) {
        PrintAndLog("Write EM4x05/EM4x69.  Tag must be on antenna. ");
        PrintAndLog("");

-       PrintAndLog("Usage:  lf em writeword [h] <address> <data> <pwd>");
+       PrintAndLog("Usage:  lf em 4x05writeword [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("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");
+       PrintAndLog("      lf em 4x05writeword 1");
+       PrintAndLog("      lf em 4x05writeword 1 deadc0de 11223344");

        return 0;
 }
 
        return 0;
 }
 

-int CmdWriteWord(const char *Cmd) {
+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 ctmp = param_getchar(Cmd, 0);
        if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_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 = 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, -1, 10);
-       data = param_get32ex(Cmd, 1, -1, 16);
-       pwd =  param_get32ex(Cmd, 2, -1, 16);
+       addr = param_get8ex(Cmd, 0, 16, 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;


@@ -751,93 +807,200 @@ int CmdWriteWord(const char *Cmd) {
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand resp;        
        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;
        }
                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;
+       if ( !downloadSamplesEM() ) {
+               return -1;

        }
        }

-       setGraphBuf(got, sizeof(got));
-       //todo: check response for 00001010 then write data for write confirmation!
-       
+       //check response for 00001010 for write confirmation!   

        //attempt demod:
        //attempt demod:

-       //need 0 bits demoded (after preamble) to verify write cmd
-       int result = demodEM4x05resp(0);
+       uint32_t dummy = 0;
+       int result = demodEM4x05resp(&dummy,false);

        if (result == 1) {
                PrintAndLog("Write Verified");
        if (result == 1) {
                PrintAndLog("Write Verified");

+       } else {
+               PrintAndLog("Write could not be verified");

        }
        return result;
 }
 
        }
        return result;
 }
 

-/*
-int CmdWriteWord(const char *Cmd)
-{
-       int Word = 16; //default to invalid block
-       int Data = 0xFFFFFFFF; //default to blank data
-       UsbCommand c;
-       
-       sscanf(Cmd, "%x %d", &Data, &Word);
-       
-       if (Word > 15) {
-               PrintAndLog("Word must be between 0 and 15");
-               return 1;
+void printEM4x05config(uint32_t wordData) {
+       uint16_t datarate = (((wordData & 0x3F)+1)*2);
+       uint8_t encoder = ((wordData >> 6) & 0xF);
+       char enc[14];
+       memset(enc,0,sizeof(enc));
+
+       uint8_t PSKcf = (wordData >> 10) & 0x3;
+       char cf[10];
+       memset(cf,0,sizeof(cf));
+       uint8_t delay = (wordData >> 12) & 0x3;
+       char cdelay[33];
+       memset(cdelay,0,sizeof(cdelay));
+       uint8_t LWR = (wordData >> 14) & 0xF; //last word read
+
+       switch (encoder) {
+               case 0: snprintf(enc,sizeof(enc),"NRZ"); break;
+               case 1: snprintf(enc,sizeof(enc),"Manchester"); break;
+               case 2: snprintf(enc,sizeof(enc),"Biphase"); break;
+               case 3: snprintf(enc,sizeof(enc),"Miller"); break;
+               case 4: snprintf(enc,sizeof(enc),"PSK1"); break;
+               case 5: snprintf(enc,sizeof(enc),"PSK2"); break;
+               case 6: snprintf(enc,sizeof(enc),"PSK3"); break;
+               case 7: snprintf(enc,sizeof(enc),"Unknown"); break;
+               case 8: snprintf(enc,sizeof(enc),"FSK1"); break;
+               case 9: snprintf(enc,sizeof(enc),"FSK2"); break;
+               default: snprintf(enc,sizeof(enc),"Unknown"); break;
+       }
+
+       switch (PSKcf) {
+               case 0: snprintf(cf,sizeof(cf),"RF/2"); break;
+               case 1: snprintf(cf,sizeof(cf),"RF/8"); break;
+               case 2: snprintf(cf,sizeof(cf),"RF/4"); break;
+               case 3: snprintf(cf,sizeof(cf),"unknown"); break;
+       }
+
+       switch (delay) {
+               case 0: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
+               case 1: snprintf(cdelay, sizeof(cdelay),"BP/8 or 1/8th bit period delay"); break;
+               case 2: snprintf(cdelay, sizeof(cdelay),"BP/4 or 1/4th bit period delay"); break;
+               case 3: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
+       }
+       PrintAndLog("ConfigWord: %08X (Word 4)\n", wordData);
+       PrintAndLog("Config Breakdown:", wordData);
+       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 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");    
+       PrintAndLog("  WriteHKL:   %u | Write Housekeeping Words Login is %s", (wordData & 0x200000)>>21, (wordData & 0x200000) ? "Required" : "Not Required"); 
+       PrintAndLog("    R.A.W.:   %u | Read After Write is %s", (wordData & 0x400000)>>22, (wordData & 0x400000) ? "On" : "Off");
+       PrintAndLog("   Disable:   %u | Disable Command is %s", (wordData & 0x800000)>>23, (wordData & 0x800000) ? "Accepted" : "Not Accepted");
+       PrintAndLog("    R.T.F.:   %u | Reader Talk First is %s", (wordData & 0x1000000)>>24, (wordData & 0x1000000) ? "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) {
+       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;
+               //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;
+               default: PrintAndLog("  Cap Type:   %u | unknown",cap); break;
+       }
+
+       PrintAndLog(" Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
+       if (serial != 0) {
+               PrintAndLog("\n  Serial #: %08X\n", serial);

        }
        }

-       
-       PrintAndLog("Writing word %d with data %08X", Word, Data);
-       
-       c.cmd = CMD_EM4X_WRITE_WORD;
-       c.d.asBytes[0] = 0x0; //Normal mode
-       c.arg[0] = Data;
-       c.arg[1] = Word;
-       c.arg[2] = 0;
-       SendCommand(&c);
-       return 0;

 }
 
 }
 

-int CmdWriteWordPWD(const char *Cmd)
-{
-       int Word = 16; //default to invalid word
-       int Data = 0xFFFFFFFF; //default to blank data
-       int Password = 0xFFFFFFFF; //default to blank password
-       UsbCommand c;
-       
-       sscanf(Cmd, "%x %d %x", &Data, &Word, &Password);
+void printEM4x05ProtectionBits(uint32_t wordData) {
+       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");
+               }
+       }
+}
+
+//quick test for EM4x05/EM4x69 tag
+bool EM4x05Block0Test(uint32_t *wordData) {
+       if (EM4x05ReadWord_ext(0,0,false,wordData) == 1) {
+               return true;
+       }
+       return false;
+}
+
+int CmdEM4x05info(const char *Cmd) {
+       //uint8_t addr = 0;
+       uint32_t pwd;
+       uint32_t wordData = 0;
+       bool usePwd = false;
+       uint8_t ctmp = param_getchar(Cmd, 0);
+       if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_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 (Word > 15) {
-               PrintAndLog("Word must be between 0 and 15");
-               return 1;
+       if ( pwd != 1 ) {
+               usePwd = true;

        }
        }

+
+       // read word 0 (chip info)
+       // block 0 can be read even without a password.
+       if ( !EM4x05Block0Test(&wordData) ) 
+               return -1;

        
        

-       PrintAndLog("Writing word %d with data %08X and password %08X", Word, Data, Password);
+       uint8_t chipType = (wordData >> 1) & 0xF;
+       uint8_t cap = (wordData >> 5) & 3;
+       uint16_t custCode = (wordData >> 9) & 0x3FF;

        
        

-       c.cmd = CMD_EM4X_WRITE_WORD;
-       c.d.asBytes[0] = 0x1; //Password mode
-       c.arg[0] = Data;
-       c.arg[1] = Word;
-       c.arg[2] = Password;
-       SendCommand(&c);
-       return 0;
+       // 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);
+
+       // read word 4 (config block) 
+       // needs password if one is set
+       wordData = 0;
+       if ( EM4x05ReadWord_ext(4, pwd, usePwd, &wordData) != 1 ) {
+               //failed
+               return 0;
+       }
+       printEM4x05config(wordData);
+
+       // 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 ) {
+               //failed
+               return 0;
+       }
+       // if status bit says this is not the used protection word
+       if (!(wordData & 0x8000)) {
+               if ( EM4x05ReadWord_ext(15, pwd, usePwd, &wordData) != 1 ) {
+                       //failed
+                       return 0;
+               }
+       }
+       if (!(wordData & 0x8000)) {
+               //something went wrong
+               return 0;
+       }
+       printEM4x05ProtectionBits(wordData);
+
+       return 1;

 }
 }

-*/
+
+

 static command_t CommandTable[] =
 {
        {"help", CmdHelp, 1, "This help"},
 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> [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, "<UID> <'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 graph buffer"},
-       {"readword", CmdReadWord, 1, "<Word> (pwd) -- Read EM4x05/EM4x69 word data"},
-       //{"readwordPWD", CmdReadWordPWD, 1, "<Word> <Password> -- Read EM4xxx word data in password mode"},
-       {"writeword", CmdWriteWord, 1, "<Word> <data> (pwd) -- Write EM4x05/EM4x69 word data"},
-       //{"writewordPWD", CmdWriteWordPWD, 1, "<Data> <Word> <Password> -- Write EM4xxx word data in password mode"},
+       {"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> [clock rate] -- 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, "(pwd) -- Read EM4x05/EM4x69 all word data"},
+       {"4x05info", CmdEM4x05info, 0, "(pwd) -- Get info from EM4x05/EM4x69 tag"},
+       {"4x05readword", CmdEM4x05ReadWord, 0, "<Word> (pwd) -- Read EM4x05/EM4x69 word data"},
+       {"4x05writeword", CmdEM4x05WriteWord, 0, "<Word> <data> (pwd) -- Write EM4x05/EM4x69 word data"},
+       {"4x50read", CmdEM4x50Read, 1, "demod data from EM4x50 tag from the graph buffer"},

        {NULL, NULL, 0, NULL}
 };
 
        {NULL, NULL, 0, NULL}
 };