Add EM410x bruteforcing error checks

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index da6c30945da360c557cb194dc5f66e31348b503a..cf20a96a3bc77245af23dab2c176e227a84620d2 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -83,12 +83,12 @@ void printEM410x(uint32_t hi, uint64_t id)
                            (id2lo & 0x000000000f)
                        );
                        uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;
                            (id2lo & 0x000000000f)
                        );
                        uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;

-                       PrintAndLog("}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64 "",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
+                       PrintAndLog("}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64 "",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));

                        PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);
 
                        uint32_t p1id = (id & 0xFFFFFF);
                        uint8_t arr[32] = {0x00};
                        PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);
 
                        uint32_t p1id = (id & 0xFFFFFF);
                        uint8_t arr[32] = {0x00};

-                       int i =0; 
+                       int i =0;

                        int j = 23;
                        for (; i < 24; ++i, --j ){
                                arr[i] = (p1id >> i) & 1;
                        int j = 23;
                        for (; i < 24; ++i, --j ){
                                arr[i] = (p1id >> i) & 1;


@@ -100,12 +100,12 @@ void printEM410x(uint32_t hi, uint64_t id)
                        p1 |= arr[22] << 23;
                        p1 |= arr[21] << 20;
                        p1 |= arr[20] << 22;
                        p1 |= arr[22] << 23;
                        p1 |= arr[21] << 20;
                        p1 |= arr[20] << 22;

-                               
+

                        p1 |= arr[19] << 18;
                        p1 |= arr[18] << 16;
                        p1 |= arr[17] << 19;
                        p1 |= arr[16] << 17;
                        p1 |= arr[19] << 18;
                        p1 |= arr[18] << 16;
                        p1 |= arr[17] << 19;
                        p1 |= arr[16] << 17;

-                               
+

                        p1 |= arr[15] << 13;
                        p1 |= arr[14] << 15;
                        p1 |= arr[13] << 12;
                        p1 |= arr[15] << 13;
                        p1 |= arr[14] << 15;
                        p1 |= arr[13] << 12;


@@ -279,7 +279,7 @@ int CmdEM410xSim(const char *Cmd)
 
                /* stop bit */
        AppendGraph(1, clock, 0);
 
                /* stop bit */
        AppendGraph(1, clock, 0);

- 
+

        CmdLFSim("0"); //240 start_gap.
        return 0;
 }
        CmdLFSim("0"); //240 start_gap.
        return 0;
 }


@@ -301,27 +301,31 @@ int usage_lf_em410x_brute(void) {
 int CmdEM410xBrute(const char *Cmd)
 {
        char filename[FILE_PATH_SIZE]={0};
 int CmdEM410xBrute(const char *Cmd)
 {
        char filename[FILE_PATH_SIZE]={0};

-       char buf[11];   
+       FILE *f = NULL;
+       char buf[11];

        int i, n, j, binary[4], parity[4];
 
        int i, n, j, binary[4], parity[4];
 

-        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') return usage_lf_em410x_sim();
-        /* clock is 64 in EM410x tags */
-        uint8_t clock = 64;
+  if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();
+  /* clock is 64 in EM410x tags */
+  uint8_t clock = 64;

 
 

-       param_getdec(Cmd,1, &clock);    
+       param_getdec(Cmd,1, &clock);

 
        param_getstr(Cmd, 0, filename);
 
        param_getstr(Cmd, 0, filename);

-        PrintAndLog("Filename: %s", filename);

 
 

-        FILE *f = fopen(filename, "r");
+       if (strlen(filename) > 0) {
+               if ((f = fopen(filename, "r")) == NULL) {
+                       PrintAndLog("Error: Could not open IDs file [%s]",filename);
+                       return 1;
+               }
+       } else {
+               PrintAndLog("Error: Please specify a filename");
+               return 1;
+       }

 
 

-        if(!f) {
-               PrintAndLog("Couldn't open '%s'", Cmd);
-                return 0;
-        }

 
        while( fgets(buf, sizeof(buf), f) ) {
                msleep(1000);
 
        while( fgets(buf, sizeof(buf), f) ) {
                msleep(1000);


@@ -329,82 +333,78 @@ int CmdEM410xBrute(const char *Cmd)
                while (fgetc(f) != '\n' && !feof(f));  //goto next line
 
                //The line start with # is comment, skip
                while (fgetc(f) != '\n' && !feof(f));  //goto next line
 
                //The line start with # is comment, skip

-               if( buf[0]=='#' ) continue;     
-               
+               if( buf[0]=='#' ) continue;
+

                buf[10] = 0;
                //PrintAndLog("ID: %s", buf);
                buf[10] = 0;
                //PrintAndLog("ID: %s", buf);

-       
-               if (param_gethex(buf, 0, uid, 10)) {
-                       PrintAndLog("UID must include 10 HEX symbols");
-                       return 0;
-               }
-       
-               PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
-       
-       
-               /* clear our graph */
-               ClearGraph(0);
-       
-                       /* write 9 start bits */
-                       for (i = 0; i < 9; i++)
-                               AppendGraph(0, clock, 1);
-       
-                       /* for each hex char */
-                       parity[0] = parity[1] = parity[2] = parity[3] = 0;
-                       for (i = 0; i < 10; i++)
-                       {
-                               /* read each hex char */
-                               sscanf(&buf[i], "%1x", &n);
-                               for (j = 3; j >= 0; j--, n/= 2)
-                                       binary[j] = n % 2;
-       
-                               /* append each bit */
-                               AppendGraph(0, clock, binary[0]);
+
+         if (param_gethex(buf, 0, uid, 10)) {
+               PrintAndLog("UID must include 10 HEX symbols");
+                       return 0;
+               }
+
+               PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
+
+               /* clear our graph */
+               ClearGraph(0);
+
+               /* write 9 start bits */
+               for (i = 0; i < 9; i++)
+                       AppendGraph(0, clock, 1);
+
+                       /* for each hex char */
+                       parity[0] = parity[1] = parity[2] = parity[3] = 0;
+                       for (i = 0; i < 10; i++)
+                       {
+                               /* read each hex char */
+                               sscanf(&buf[i], "%1x", &n);
+                               for (j = 3; j >= 0; j--, n/= 2)
+                                       binary[j] = n % 2;
+
+                               /* append each bit */
+                               AppendGraph(0, clock, binary[0]);

                                AppendGraph(0, clock, binary[1]);
                                AppendGraph(0, clock, binary[1]);

-                               AppendGraph(0, clock, binary[2]);
-                               AppendGraph(0, clock, binary[3]);
-       
-                               /* append parity bit */
-                               AppendGraph(0, clock, binary[0] ^ binary[1] ^ binary[2] ^ binary[3]);
-       
-                               /* keep track of column parity */
-                               parity[0] ^= binary[0];
-                               parity[1] ^= binary[1];
-                               parity[2] ^= binary[2];
-                               parity[3] ^= binary[3];
-                       }
-       
-                       /* parity columns */
-                       AppendGraph(0, clock, parity[0]);
-                       AppendGraph(0, clock, parity[1]);
-                       AppendGraph(0, clock, parity[2]);
-                       AppendGraph(0, clock, parity[3]);
-       
-                       /* stop bit */
-               AppendGraph(1, clock, 0);
-       
-               CmdLFSim("0"); //240 start_gap.
-        
-       
-                memset(buf, 0, sizeof(buf));
+                               AppendGraph(0, clock, binary[2]);
+                               AppendGraph(0, clock, binary[3]);

 
 

-       }
+                               /* append parity bit */
+                               AppendGraph(0, clock, binary[0] ^ binary[1] ^ binary[2] ^ binary[3]);
+
+                               /* keep track of column parity */
+                               parity[0] ^= binary[0];
+                               parity[1] ^= binary[1];
+                               parity[2] ^= binary[2];
+                               parity[3] ^= binary[3];
+                       }
+
+                       /* parity columns */
+                       AppendGraph(0, clock, parity[0]);
+                       AppendGraph(0, clock, parity[1]);
+                       AppendGraph(0, clock, parity[2]);
+                       AppendGraph(0, clock, parity[3]);
+
+                       /* stop bit */
+                       AppendGraph(1, clock, 0);

 
 

-       fclose(f);
-       
+                       CmdLFSim("0"); //240 start_gap.

 
 

+                       memset(buf, 0, sizeof(buf));

 
 

-        return 0;
+               }
+
+               fclose(f);
+
+               return 0;

 }
 
 
 /* Function is equivalent of lf read + data samples + em410xread
 }
 
 
 /* Function is equivalent of lf read + data samples + em410xread

- * looped until an EM410x tag is detected 
- * 
+ * looped until an EM410x tag is detected
+ *

  * Why is CmdSamples("16000")?
  *  TBD: Auto-grow sample size based on detected sample rate.  IE: If the
  *       rate gets lower, then grow the number of samples
  * Why is CmdSamples("16000")?
  *  TBD: Auto-grow sample size based on detected sample rate.  IE: If the
  *       rate gets lower, then grow the number of samples

- *  Changed by martin, 4000 x 4 = 16000, 
+ *  Changed by martin, 4000 x 4 = 16000,

  *  see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
  *
  *  EDIT -- capture enough to get 2 complete preambles at the slowest data rate known to be used (rf/64) (64*64*2+9 = 8201)    marshmellow
  *  see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
  *
  *  EDIT -- capture enough to get 2 complete preambles at the slowest data rate known to be used (rf/64) (64*64*2+9 = 8201)    marshmellow


@@ -573,7 +573,7 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
 int EM4x50Read(const char *Cmd, bool verbose)
 {
        uint8_t fndClk[] = {8,16,32,40,50,64,128};
 int EM4x50Read(const char *Cmd, bool verbose)
 {
        uint8_t fndClk[] = {8,16,32,40,50,64,128};

-       int clk = 0; 
+       int clk = 0;

        int invert = 0;
        int tol = 0;
        int i, j, startblock, skip, block, start, end, low, high, minClk;
        int invert = 0;
        int tol = 0;
        int i, j, startblock, skip, block, start, end, low, high, minClk;


@@ -588,7 +588,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
 
        // get user entry if any
        sscanf(Cmd, "%i %i", &clk, &invert);
 
        // get user entry if any
        sscanf(Cmd, "%i %i", &clk, &invert);

-       
+

        // first get high and low values
        for (i = 0; i < GraphTraceLen; i++) {
                if (GraphBuffer[i] > high)
        // first get high and low values
        for (i = 0; i < GraphTraceLen; i++) {
                if (GraphBuffer[i] > high)


@@ -629,7 +629,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
        if (!clk) {
                for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) {
                        tol = fndClk[clkCnt]/8;
        if (!clk) {
                for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) {
                        tol = fndClk[clkCnt]/8;

-                       if (minClk >= fndClk[clkCnt]-tol && minClk <= fndClk[clkCnt]+1) { 
+                       if (minClk >= fndClk[clkCnt]-tol && minClk <= fndClk[clkCnt]+1) {

                                clk=fndClk[clkCnt];
                                break;
                        }
                                clk=fndClk[clkCnt];
                                break;
                        }


@@ -654,7 +654,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
 
        // skip over the remainder of LW
        skip += tmpbuff[i+1] + tmpbuff[i+2] + clk;
 
        // skip over the remainder of LW
        skip += tmpbuff[i+1] + tmpbuff[i+2] + clk;

-       if (tmpbuff[i+3]>clk) 
+       if (tmpbuff[i+3]>clk)

                phaseoff = tmpbuff[i+3]-clk;
        else
                phaseoff = 0;
                phaseoff = tmpbuff[i+3]-clk;
        else
                phaseoff = 0;


@@ -685,9 +685,9 @@ int EM4x50Read(const char *Cmd, bool verbose)
        } else if (start < 0) return 0;
        start = skip;
        snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47);
        } else if (start < 0) return 0;
        start = skip;
        snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47);

-       // save GraphBuffer - to restore it later       
+       // save GraphBuffer - to restore it later

        save_restoreGB(GRAPH_SAVE);
        save_restoreGB(GRAPH_SAVE);

-       // get rid of leading crap 
+       // get rid of leading crap

        snprintf(tmp, sizeof(tmp), "%i", skip);
        CmdLtrim(tmp);
        bool pTest;
        snprintf(tmp, sizeof(tmp), "%i", skip);
        CmdLtrim(tmp);
        bool pTest;


@@ -698,7 +698,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
        while (block < 6) {
                if (verbose || g_debugMode) PrintAndLog("\nBlock %i:", block);
                skip = phaseoff;
        while (block < 6) {
                if (verbose || g_debugMode) PrintAndLog("\nBlock %i:", block);
                skip = phaseoff;

-               
+

                // look for LW before start of next block
                for ( ; i < j - 4 ; ++i) {
                        skip += tmpbuff[i];
                // look for LW before start of next block
                for ( ; i < j - 4 ; ++i) {
                        skip += tmpbuff[i];


@@ -720,7 +720,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
                //set DemodBufferLen to just one block
                DemodBufferLen = skip/clk;
                //test parities
                //set DemodBufferLen to just one block
                DemodBufferLen = skip/clk;
                //test parities

-               pTest = EM_ByteParityTest(DemodBuffer,DemodBufferLen,5,9,0);    
+               pTest = EM_ByteParityTest(DemodBuffer,DemodBufferLen,5,9,0);

                pTest &= EM_EndParityTest(DemodBuffer,DemodBufferLen,5,9,0);
                AllPTest &= pTest;
                //get output
                pTest &= EM_EndParityTest(DemodBuffer,DemodBufferLen,5,9,0);
                AllPTest &= pTest;
                //get output


@@ -739,7 +739,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
                        PrintAndLog("Partial data - no end found!");
                        PrintAndLog("Try again with more samples.");
                }
                        PrintAndLog("Partial data - no end found!");
                        PrintAndLog("Try again with more samples.");
                }

-               PrintAndLog("Found data at sample: %i - using clock: %i", start, clk);    
+               PrintAndLog("Found data at sample: %i - using clock: %i", start, clk);

                end = block;
                for (block=0; block < end; block++){
                        PrintAndLog("Block %d: %08x",block,Code[block]);
                end = block;
                for (block=0; block < end; block++){
                        PrintAndLog("Block %d: %08x",block,Code[block]);


@@ -781,7 +781,7 @@ int usage_lf_em_read(void) {
 // 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)
 // 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]; 
+       uint8_t got[6000];

        GetFromBigBuf(got, sizeof(got), 0);
        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 4000) ) {
                PrintAndLog("command execution time out");
        GetFromBigBuf(got, sizeof(got), 0);
        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 4000) ) {
                PrintAndLog("command execution time out");


@@ -813,7 +813,7 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
                        return false;
                }
                // test for even parity bits and remove them. (leave out the end row of parities so 36 bits)
                        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 ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,36) == 0 ) {

                        if (g_debugMode) PrintAndLog("DEBUG: Error - Parity not detected");
                        return false;
                }
                        if (g_debugMode) PrintAndLog("DEBUG: Error - Parity not detected");
                        return false;
                }


@@ -826,7 +826,7 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
        return true;
 }
 
        return true;
 }
 

-// FSK, PSK, ASK/MANCHESTER, ASK/BIPHASE, ASK/DIPHASE 
+// 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(uint32_t *word, bool readCmd) {
 // should cover 90% of known used configs
 // the rest will need to be manually demoded for now...
 int demodEM4x05resp(uint32_t *word, bool readCmd) {


@@ -893,7 +893,7 @@ int demodEM4x05resp(uint32_t *word, bool readCmd) {
 
        //try biphase
        ans = ASKbiphaseDemod("0 0 1", false);
 
        //try biphase
        ans = ASKbiphaseDemod("0 0 1", false);

-       if (!ans) { 
+       if (!ans) {

                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans);
        } else {
                if (EM4x05testDemodReadData(word, readCmd)) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans);
        } else {
                if (EM4x05testDemodReadData(word, readCmd)) {


@@ -903,7 +903,7 @@ int demodEM4x05resp(uint32_t *word, bool readCmd) {
 
        //try diphase (differential biphase or inverted)
        ans = ASKbiphaseDemod("0 1 1", false);
 
        //try diphase (differential biphase or inverted)
        ans = ASKbiphaseDemod("0 1 1", false);

-       if (!ans) { 
+       if (!ans) {

                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans);
        } else {
                if (EM4x05testDemodReadData(word, readCmd)) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/biphase Demod failed, ans: %d", ans);
        } else {
                if (EM4x05testDemodReadData(word, readCmd)) {


@@ -918,7 +918,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *wordDa
        UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
        clearCommandBuffer();
        SendCommand(&c);

-       UsbCommand resp;        
+       UsbCommand resp;

        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
                PrintAndLog("Command timed out");
                return -1;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
                PrintAndLog("Command timed out");
                return -1;


@@ -956,7 +956,7 @@ int CmdEM4x05ReadWord(const char *Cmd) {
        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);
        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 ( (addr > 15) ) {
                PrintAndLog("Address must be between 0 and 15");
                return 1;


@@ -993,7 +993,7 @@ int CmdEM4x05dump(const char *Cmd) {
 
        // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
        pwd = param_get32ex(Cmd, 0, 1, 16);
 
        // 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;
        }
        if ( pwd != 1 ) {
                usePwd = true;
        }


@@ -1021,7 +1021,7 @@ int usage_lf_em_write(void) {
        PrintAndLog("Options:");
        PrintAndLog("       h           - this help");
        PrintAndLog("       a <address> - memory address to write to. (0-15)");
        PrintAndLog("Options:");
        PrintAndLog("       h           - this help");
        PrintAndLog("       a <address> - memory address to write to. (0-15)");

-       PrintAndLog("       d <data>    - data to write (hex)");        
+       PrintAndLog("       d <data>    - data to write (hex)");

        PrintAndLog("       p <pwd>     - password (hex) (optional)");
        PrintAndLog("       s           - swap the data bit order before write");
        PrintAndLog("       i           - invert the data bits before write");
        PrintAndLog("       p <pwd>     - password (hex) (optional)");
        PrintAndLog("       s           - swap the data bit order before write");
        PrintAndLog("       i           - invert the data bits before write");


@@ -1197,10 +1197,10 @@ void printEM4x05config(uint32_t wordData) {
        PrintAndLog("    PSK CF:   %u | %s", PSKcf, cf);
        PrintAndLog("     Delay:   %u | %s", delay, cdelay);
        PrintAndLog(" LastWordR:  %02u | Address of last word for default read - meaning %u blocks are output", LWR, numblks);
        PrintAndLog("    PSK CF:   %u | %s", PSKcf, cf);
        PrintAndLog("     Delay:   %u | %s", delay, cdelay);
        PrintAndLog(" LastWordR:  %02u | Address of last word for default read - meaning %u blocks are output", LWR, numblks);

-       PrintAndLog(" ReadLogin:   %u | Read Login is %s", readLogin, readLogin ? "Required" : "Not Required"); 
-       PrintAndLog("   ReadHKL:   %u | Read Housekeeping Words Login is %s", readHKL, readHKL ? "Required" : "Not Required");  
-       PrintAndLog("WriteLogin:   %u | Write Login is %s", writeLogin, writeLogin ? "Required" : "Not Required");      
-       PrintAndLog("  WriteHKL:   %u | Write Housekeeping Words Login is %s", writeHKL, writeHKL ? "Required" : "Not Required");       
+       PrintAndLog(" ReadLogin:   %u | Read Login is %s", readLogin, readLogin ? "Required" : "Not Required");
+       PrintAndLog("   ReadHKL:   %u | Read Housekeeping Words Login is %s", readHKL, readHKL ? "Required" : "Not Required");
+       PrintAndLog("WriteLogin:   %u | Write Login is %s", writeLogin, writeLogin ? "Required" : "Not Required");
+       PrintAndLog("  WriteHKL:   %u | Write Housekeeping Words Login is %s", writeHKL, writeHKL ? "Required" : "Not Required");

        PrintAndLog("    R.A.W.:   %u | Read After Write is %s", raw, raw ? "On" : "Off");
        PrintAndLog("   Disable:   %u | Disable Command is %s", disable, disable ? "Accepted" : "Not Accepted");
        PrintAndLog("    R.T.F.:   %u | Reader Talk First is %s", rtf, rtf ? "Enabled" : "Disabled");
        PrintAndLog("    R.A.W.:   %u | Read After Write is %s", raw, raw ? "On" : "Off");
        PrintAndLog("   Disable:   %u | Disable Command is %s", disable, disable ? "Accepted" : "Not Accepted");
        PrintAndLog("    R.T.F.:   %u | Reader Talk First is %s", rtf, rtf ? "Enabled" : "Disabled");


@@ -1257,20 +1257,20 @@ int CmdEM4x05info(const char *Cmd) {
 
        // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
        pwd = param_get32ex(Cmd, 0, 1, 16);
 
        // 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;
        }
 
        // read word 0 (chip info)
        // block 0 can be read even without a password.
        if ( pwd != 1 ) {
                usePwd = true;
        }
 
        // read word 0 (chip info)
        // block 0 can be read even without a password.

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

                return -1;
                return -1;

-       
+

        uint8_t chipType = (wordData >> 1) & 0xF;
        uint8_t cap = (wordData >> 5) & 3;
        uint16_t custCode = (wordData >> 9) & 0x3FF;
        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
        wordData = 0;
        if (EM4x05ReadWord_ext(1, 0, false, &wordData) != 1) {
        // read word 1 (serial #) doesn't need pwd
        wordData = 0;
        if (EM4x05ReadWord_ext(1, 0, false, &wordData) != 1) {


@@ -1278,7 +1278,7 @@ int CmdEM4x05info(const char *Cmd) {
        }
        printEM4x05info(chipType, cap, custCode, wordData);
 
        }
        printEM4x05info(chipType, cap, custCode, wordData);
 

-       // read word 4 (config block) 
+       // read word 4 (config block)

        // needs password if one is set
        wordData = 0;
        if ( EM4x05ReadWord_ext(4, pwd, usePwd, &wordData) != 1 ) {
        // needs password if one is set
        wordData = 0;
        if ( EM4x05ReadWord_ext(4, pwd, usePwd, &wordData) != 1 ) {


@@ -1314,7 +1314,7 @@ int CmdEM4x05info(const char *Cmd) {
 static command_t CommandTable[] =
 {
        {"help",      CmdHelp, 1, "This help"},
 static command_t CommandTable[] =
 {
        {"help",      CmdHelp, 1, "This help"},

-       {"410xread",  CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},  
+       {"410xread",  CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},

        {"410xdemod", CmdAskEM410xDemod,  1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"},
        {"410xsim",   CmdEM410xSim, 0, "<UID> [clock rate] -- Simulate EM410x tag"},
        {"410xbrute",   CmdEM410xBrute, 0, "ids.txt [clock rate] -- Bruteforcing by simulating EM410x tags (1 UID/s)"},
        {"410xdemod", CmdAskEM410xDemod,  1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"},
        {"410xsim",   CmdEM410xSim, 0, "<UID> [clock rate] -- Simulate EM410x tag"},
        {"410xbrute",   CmdEM410xBrute, 0, "ids.txt [clock rate] -- Bruteforcing by simulating EM410x tags (1 UID/s)"},