]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdlfem4x.c
gcc10 compiler fixes:
[proxmark3-svn] / client / cmdlfem4x.c
index 38bb5c5d19ee7e6b6f0a10c8c20792146e8efb26..d1bde91184e73e7a256dac95b227cd7c41ef4807 100644 (file)
@@ -8,10 +8,12 @@
 // Low frequency EM4x commands
 //-----------------------------------------------------------------------------
 
+#include "cmdlfem4x.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
-#include "proxmark3.h"
+#include "comms.h"
 #include "ui.h"
 #include "util.h"
 #include "graph.h"
 #include "cmddata.h"
 #include "cmdlf.h"
 #include "cmdmain.h"
-#include "cmdlfem4x.h"
 #include "lfdemod.h"
+#include "protocols.h"
+#include "util_posix.h"
 
-char *global_em410xId;
+uint64_t g_em410xId=0;
 
 static int CmdHelp(const char *Cmd);
+void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock);
 
 int CmdEMdemodASK(const char *Cmd)
 {
@@ -36,6 +40,103 @@ int CmdEMdemodASK(const char *Cmd)
        return 0;
 }
 
+//by marshmellow
+//print 64 bit EM410x ID in multiple formats
+void printEM410x(uint32_t hi, uint64_t id)
+{
+       if (id || hi){
+               uint64_t iii=1;
+               uint64_t id2lo=0;
+               uint32_t ii=0;
+               uint32_t i=0;
+               for (ii=5; ii>0;ii--){
+                       for (i=0;i<8;i++){
+                               id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));
+                       }
+               }
+               if (hi){
+                       //output 88 bit em id
+                       PrintAndLog("\nEM TAG ID      : %06X%016" PRIX64, hi, id);
+               } else{
+                       //output 40 bit em id
+                       PrintAndLog("\nEM TAG ID      : %010" PRIX64, id);
+                       PrintAndLog("\nPossible de-scramble patterns");
+                       PrintAndLog("Unique TAG ID  : %010" PRIX64,  id2lo);
+                       PrintAndLog("HoneyWell IdentKey {");
+                       PrintAndLog("DEZ 8          : %08" PRIu64,id & 0xFFFFFF);
+                       PrintAndLog("DEZ 10         : %010" PRIu64,id & 0xFFFFFFFF);
+                       PrintAndLog("DEZ 5.5        : %05lld.%05" PRIu64,(id>>16LL) & 0xFFFF,(id & 0xFFFF));
+                       PrintAndLog("DEZ 3.5A       : %03lld.%05" PRIu64,(id>>32ll),(id & 0xFFFF));
+                       PrintAndLog("DEZ 3.5B       : %03lld.%05" PRIu64,(id & 0xFF000000) >> 24,(id & 0xFFFF));
+                       PrintAndLog("DEZ 3.5C       : %03lld.%05" PRIu64,(id & 0xFF0000) >> 16,(id & 0xFFFF));
+                       PrintAndLog("DEZ 14/IK2     : %014" PRIu64,id);
+                       PrintAndLog("DEZ 15/IK3     : %015" PRIu64,id2lo);
+                       PrintAndLog("DEZ 20/ZK      : %02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64,
+                           (id2lo & 0xf000000000) >> 36,
+                           (id2lo & 0x0f00000000) >> 32,
+                           (id2lo & 0x00f0000000) >> 28,
+                           (id2lo & 0x000f000000) >> 24,
+                           (id2lo & 0x0000f00000) >> 20,
+                           (id2lo & 0x00000f0000) >> 16,
+                           (id2lo & 0x000000f000) >> 12,
+                           (id2lo & 0x0000000f00) >> 8,
+                           (id2lo & 0x00000000f0) >> 4,
+                           (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("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);
+
+                       uint32_t p1id = (id & 0xFFFFFF);
+                       uint8_t arr[32] = {0x00};
+                       int i =0;
+                       int j = 23;
+                       for (; i < 24; ++i, --j ){
+                               arr[i] = (p1id >> i) & 1;
+                       }
+
+                       uint32_t p1  = 0;
+
+                       p1 |= arr[23] << 21;
+                       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[15] << 13;
+                       p1 |= arr[14] << 15;
+                       p1 |= arr[13] << 12;
+                       p1 |= arr[12] << 14;
+
+                       p1 |= arr[11] << 6;
+                       p1 |= arr[10] << 2;
+                       p1 |= arr[9]  << 7;
+                       p1 |= arr[8]  << 1;
+
+                       p1 |= arr[7]  << 0;
+                       p1 |= arr[6]  << 8;
+                       p1 |= arr[5]  << 11;
+                       p1 |= arr[4]  << 3;
+
+                       p1 |= arr[3]  << 10;
+                       p1 |= arr[2]  << 4;
+                       p1 |= arr[1]  << 5;
+                       p1 |= arr[0]  << 9;
+                       PrintAndLog("Pattern 1      : %d [0x%X]", p1, p1);
+
+                       uint16_t sebury1 = id & 0xFFFF;
+                       uint8_t  sebury2 = (id >> 16) & 0x7F;
+                       uint32_t sebury3 = id & 0x7FFFFF;
+                       PrintAndLog("Pattern Sebury : %d %d %d  [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
+               }
+       }
+       return;
+}
+
 /* Read the ID of an EM410x tag.
  * Format:
  *   1111 1111 1           <-- standard non-repeatable header
@@ -44,23 +145,63 @@ int CmdEMdemodASK(const char *Cmd)
  *   CCCC                  <-- each bit here is parity for the 10 bits above in corresponding column
  *   0                     <-- stop bit, end of tag
  */
-int CmdEM410xRead(const char *Cmd)
+int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
 {
-       uint32_t hi=0;
-       uint64_t lo=0;
-
-       if(!AskEm410xDemod("", &hi, &lo, false)) return 0;
-       PrintAndLog("EM410x pattern found: ");
-       printEM410x(hi, lo);
-       if (hi){
-               PrintAndLog ("EM410x XL pattern found");
+       size_t idx = 0;
+       uint8_t BitStream[512]={0};
+       size_t BitLen = sizeof(BitStream);
+       if ( !getDemodBuf(BitStream, &BitLen) ) return 0;
+
+       if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)) {
+               //set GraphBuffer for clone or sim command
+               setDemodBuf(DemodBuffer, (BitLen==40) ? 64 : 128, idx+1);
+               setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+1)*g_DemodClock));
+
+               if (g_debugMode) {
+                       PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
+                       printDemodBuff();
+               }
+               if (verbose) {
+                       PrintAndLog("EM410x pattern found: ");
+                       printEM410x(*hi, *lo);
+                       g_em410xId = *lo;
+               }
+               return 1;
+       }
+       return 0;
+}
+
+//askdemod then call Em410xdecode
+int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)
+{
+       bool st = true;
+       if (!ASKDemod_ext(Cmd, false, false, 1, &st)) return 0;
+       return AskEm410xDecode(verbose, hi, lo);
+}
+
+//by marshmellow
+//takes 3 arguments - clock, invert and maxErr as integers
+//attempts to demodulate ask while decoding manchester
+//prints binary found and saves in graphbuffer for further commands
+int CmdAskEM410xDemod(const char *Cmd)
+{
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') {
+               PrintAndLog("Usage:  lf em 410xdemod [clock] <0|1> [maxError]");
+               PrintAndLog("     [set clock as integer] optional, if not set, autodetect.");
+               PrintAndLog("     <invert>, 1 for invert output");
+               PrintAndLog("     [set maximum allowed errors], default = 100.");
+               PrintAndLog("");
+               PrintAndLog("    sample: lf em 410xdemod        = demod an EM410x Tag ID from GraphBuffer");
+               PrintAndLog("          : lf em 410xdemod 32     = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32");
+               PrintAndLog("          : lf em 410xdemod 32 1   = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32 and inverting data");
+               PrintAndLog("          : lf em 410xdemod 1      = demod an EM410x Tag ID from GraphBuffer while inverting data");
+               PrintAndLog("          : lf em 410xdemod 64 1 0 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/64 and inverting data and allowing 0 demod errors");
                return 0;
        }
-       char id[12] = {0x00};
-       sprintf(id, "%010"PRIx64,lo);
-       
-       global_em410xId = id;
-       return 1;
+       uint64_t lo = 0;
+       uint32_t hi = 0;
+       return AskEm410xDemod(Cmd, &hi, &lo, true);
 }
 
 int usage_lf_em410x_sim(void) {
@@ -77,11 +218,54 @@ int usage_lf_em410x_sim(void) {
        return 0;
 }
 
-// emulate an EM410X tag
-int CmdEM410xSim(const char *Cmd)
+// Construct the graph for emulating an EM410X tag
+void ConstructEM410xEmulGraph(const char *uid,const  uint8_t clock)
 {
        int i, n, j, binary[4], parity[4];
+       /* 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(&uid[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[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);
+}
+
+// emulate an EM410X tag
+int CmdEM410xSim(const char *Cmd)
+{
        char cmdp = param_getchar(Cmd, 0);
        uint8_t uid[5] = {0x00};
 
@@ -96,62 +280,156 @@ int CmdEM410xSim(const char *Cmd)
        param_getdec(Cmd,1, &clock);
 
        PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
-       PrintAndLog("Press pm3-button to about simulation");
+       PrintAndLog("Press pm3-button to abort simulation");
 
+       ConstructEM410xEmulGraph(Cmd, clock);
+       
+       CmdLFSim("0"); //240 start_gap.
+       return 0;
+}
 
-       /* clear our graph */
-       ClearGraph(0);
+int usage_lf_em410x_brute(void) {
+       PrintAndLog("Bruteforcing by emulating EM410x tag");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf em 410xbrute [h] ids.txt [d 2000] [c clock]");
+       PrintAndLog("Options:");
+       PrintAndLog("       h             - this help");
+       PrintAndLog("       ids.txt       - file with UIDs in HEX format, one per line");
+       PrintAndLog("       d (2000)      - pause delay in milliseconds between UIDs simulation, default 1000 ms (optional)");
+       PrintAndLog("       c (32)        - clock (32|64), default 64 (optional)");
+       PrintAndLog("samples:");
+       PrintAndLog("      lf em 410xbrute ids.txt");
+       PrintAndLog("      lf em 410xbrute ids.txt c 32");
+       PrintAndLog("      lf em 410xbrute ids.txt d 3000");
+       PrintAndLog("      lf em 410xbrute ids.txt d 3000 c 32");
+       return 0;
+}
 
-               /* write 9 start bits */
-               for (i = 0; i < 9; i++)
-                       AppendGraph(0, clock, 1);
+int CmdEM410xBrute(const char *Cmd)
+{
+       char filename[FILE_PATH_SIZE]={0};
+       FILE *f = NULL;
+       char buf[11];
+       uint32_t uidcnt = 0;
+       uint8_t stUidBlock = 20;
+       uint8_t *uidBlock = NULL, *p = NULL;
+       int ch;
+       uint8_t uid[5] = {0x00};
+       /* clock is 64 in EM410x tags */
+       uint8_t clock = 64;
+       /* default pause time: 1 second */
+       uint32_t delay = 1000;
+       
+       char cmdp = param_getchar(Cmd, 0);
+       
+       if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_brute();
+       
 
-               /* for each hex char */
-               parity[0] = parity[1] = parity[2] = parity[3] = 0;
-               for (i = 0; i < 10; i++)
-               {
-                       /* read each hex char */
-                       sscanf(&Cmd[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[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.
+       cmdp = param_getchar(Cmd, 1);
+       
+       if (cmdp == 'd' || cmdp == 'D') {
+               delay = param_get32ex(Cmd, 2, 1000, 10);
+               param_getdec(Cmd, 4, &clock);
+       } else if (cmdp == 'c' || cmdp == 'C') {
+               param_getdec(Cmd, 2, &clock);
+               delay = param_get32ex(Cmd, 4, 1000, 10);
+       }
+
+       param_getstr(Cmd, 0, filename, sizeof(filename));
+       
+       uidBlock = calloc(stUidBlock, 5);
+       if (uidBlock == NULL) return 1;
+
+       if (strlen(filename) > 0) {
+               if ((f = fopen(filename, "r")) == NULL) {
+                       PrintAndLog("Error: Could not open UIDs file [%s]",filename);
+                       free(uidBlock);
+                       return 1;
+               }
+       } else {
+               PrintAndLog("Error: Please specify a filename");
+               free(uidBlock);
+               return 1;
+       }
+
+       while( fgets(buf, sizeof(buf), f) ) {
+               if (strlen(buf) < 10 || buf[9] == '\n') continue;
+               while (fgetc(f) != '\n' && !feof(f));  //goto next line
+
+               //The line start with # is comment, skip
+               if( buf[0]=='#' ) continue;
+               
+               if (param_gethex(buf, 0, uid, 10)) {
+                       PrintAndLog("UIDs must include 10 HEX symbols");
+                       free(uidBlock);
+                       fclose(f);
+                       return 1;
+               }
+               
+               buf[10] = 0;
+               
+               if ( stUidBlock - uidcnt < 2) {
+                               p = realloc(uidBlock, 5*(stUidBlock+=10));
+                               if (!p) {
+                                       PrintAndLog("Cannot allocate memory for UIDs");
+                                       free(uidBlock);
+                                       fclose(f);
+                                       return 1;
+                               }
+                               uidBlock = p;
+               }
+               memset(uidBlock + 5 * uidcnt, 0, 5);
+               num_to_bytes(strtoll(buf, NULL, 16), 5, uidBlock + 5*uidcnt);
+               uidcnt++;
+               memset(buf, 0, sizeof(buf));
+       }
+       fclose(f);
+       
+       if (uidcnt == 0) {
+               PrintAndLog("No UIDs found in file");
+               free(uidBlock);
+               return 1;
+       }
+       PrintAndLog("Loaded %d UIDs from %s, pause delay: %d ms", uidcnt, filename, delay);
+       
+       // loop
+       for(uint32_t c = 0; c < uidcnt; ++c ) {
+               char testuid[11];
+               testuid[10] = 0;
+               
+               if (ukbhit()) {
+                       ch = getchar();
+                       (void)ch;
+                       printf("\nAborted via keyboard!\n");
+                       free(uidBlock);
+                       return 0;
+               }
+                               
+               sprintf(testuid, "%010" PRIX64, bytes_to_num(uidBlock + 5*c, 5));
+               PrintAndLog("Bruteforce %d / %d: simulating UID  %s, clock %d", c + 1, uidcnt, testuid, clock);
+               
+               ConstructEM410xEmulGraph(testuid, clock);
+               
+               CmdLFSim("0"); //240 start_gap.
+
+               msleep(delay);
+       }
+       
+       free(uidBlock);
        return 0;
 }
 
+
 /* 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
- *  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
 */
 int CmdEM410xWatch(const char *Cmd)
 {
@@ -160,10 +438,8 @@ int CmdEM410xWatch(const char *Cmd)
                        printf("\naborted via keyboard!\n");
                        break;
                }
-               
-               CmdLFRead("s");
-               getSamples("8201",true); //capture enough to get 2 complete preambles (4096*2+9)        
-       } while (!CmdEM410xRead(""));
+               lf_read(true, 8201);
+       } while (!CmdAskEM410xDemod(""));
 
        return 0;
 }
@@ -172,7 +448,7 @@ int CmdEM410xWatch(const char *Cmd)
 int CmdEM410xWatchnSpoof(const char *Cmd)
 {
        CmdEM410xWatch(Cmd);
-       PrintAndLog("# Replaying captured ID: %s",global_em410xId);
+       PrintAndLog("# Replaying captured ID: %010"PRIx64, g_em410xId);
        CmdLFaskSim("");
        return 0;
 }
@@ -183,7 +459,7 @@ int CmdEM410xWrite(const char *Cmd)
        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) {
@@ -319,7 +595,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 clk = 0; 
+       int clk = 0;
        int invert = 0;
        int tol = 0;
        int i, j, startblock, skip, block, start, end, low, high, minClk;
@@ -330,13 +606,10 @@ int EM4x50Read(const char *Cmd, bool verbose)
        char tmp2[20];
        int phaseoff;
        high = low = 0;
-       memset(tmpbuff, 0, MAX_GRAPH_TRACE_LEN / 64);
+       memset(tmpbuff, 0, sizeof(tmpbuff));
 
        // get user entry if any
        sscanf(Cmd, "%i %i", &clk, &invert);
-       
-       // save GraphBuffer - to restore it later       
-       save_restoreGB(1);
 
        // first get high and low values
        for (i = 0; i < GraphTraceLen; i++) {
@@ -378,7 +651,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
        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;
                        }
@@ -403,7 +676,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
 
        // 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;
@@ -434,7 +707,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);
-       // get rid of leading crap 
+       // save GraphBuffer - to restore it later
+       save_restoreGB(GRAPH_SAVE);
+       // get rid of leading crap
        snprintf(tmp, sizeof(tmp), "%i", skip);
        CmdLtrim(tmp);
        bool pTest;
@@ -445,7 +720,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
        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];
@@ -461,13 +736,13 @@ int EM4x50Read(const char *Cmd, bool verbose)
                        phaseoff = 0;
                i += 2;
                if (ASKDemod(tmp2, false, false, 1) < 1) {
-                       save_restoreGB(0);
+                       save_restoreGB(GRAPH_RESTORE);
                        return 0;
                }
                //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
@@ -486,7 +761,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
                        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]);
@@ -500,7 +775,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
        }
 
        //restore GraphBuffer
-       save_restoreGB(0);
+       save_restoreGB(GRAPH_RESTORE);
        return (int)AllPTest;
 }
 
@@ -528,9 +803,8 @@ 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)
-       uint8_t got[6000]; 
-       GetFromBigBuf(got, sizeof(got), 0);
-       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 4000) ) {
+       uint8_t got[6000];
+       if (!GetFromBigBuf(got, sizeof(got), 0, NULL, 4000, true)) {
                PrintAndLog("command execution time out");
                return false;
        }
@@ -560,18 +834,20 @@ 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)
-               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;
                }
 
                setDemodBuf(DemodBuffer, 32, 0);
+               //setClockGrid(0,0);
+
                *word = bytebits_to_byteLSBF(DemodBuffer, 32);
        }
        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) {
@@ -638,7 +914,7 @@ int demodEM4x05resp(uint32_t *word, bool readCmd) {
 
        //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)) {
@@ -648,7 +924,7 @@ int demodEM4x05resp(uint32_t *word, bool readCmd) {
 
        //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)) {
@@ -663,7 +939,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 resp;        
+       UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
                PrintAndLog("Command timed out");
                return -1;
@@ -673,7 +949,6 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *wordDa
        }
        int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000;
        if (graphJustNoise(GraphBuffer, testLen)) {
-               PrintAndLog("no tag not found");
                return -1;
        }
        //attempt demod:
@@ -701,7 +976,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);
-       
+
        if ( (addr > 15) ) {
                PrintAndLog("Address must be between 0 and 15");
                return 1;
@@ -738,7 +1013,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);
-       
+
        if ( pwd != 1 ) {
                usePwd = true;
        }
@@ -762,50 +1037,44 @@ int CmdEM4x05dump(const char *Cmd) {
 int usage_lf_em_write(void) {
        PrintAndLog("Write EM4x05/EM4x69.  Tag must be on antenna. ");
        PrintAndLog("");
-       PrintAndLog("Usage:  lf em 4x05writeword [h] <address> <data> <pwd>");
+       PrintAndLog("Usage:  lf em 4x05writeword [h] a <address> d <data> p <pwd> [s] [i]");
        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("       h           - this help");
+       PrintAndLog("       a <address> - memory address to write to. (0-15)");
+       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("samples:");
-       PrintAndLog("      lf em 4x05writeword 1");
-       PrintAndLog("      lf em 4x05writeword 1 deadc0de 11223344");
+       PrintAndLog("      lf em 4x05writeword a 5 d 11223344");
+       PrintAndLog("      lf em 4x05writeword a 5 p deadc0de d 11223344 s i");
        return 0;
 }
 
-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 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, 16, 10);
-       data = param_get32ex(Cmd, 1, 0, 16);
-       pwd =  param_get32ex(Cmd, 2, 1, 16);
-       
-       
+// note: em4x05 doesn't have a way to invert data output so we must invert the data prior to writing
+//         it if invertion is needed. (example FSK2a vs FSK)
+//       also em4x05 requires swapping word data when compared to the data used for t55xx chips.
+int EM4x05WriteWord(uint8_t addr, uint32_t data, uint32_t pwd, bool usePwd, bool swap, bool invert) {
+       if (swap) data = SwapBits(data, 32);
+
+       if (invert) data ^= 0xFFFFFFFF;
+
        if ( (addr > 15) ) {
                PrintAndLog("Address must be between 0 and 15");
-               return 1;
+               return -1;
        }
-       if ( pwd == 1 )
-               PrintAndLog("Writing address %d data %08X", addr, data);        
-       else {
-               usePwd = true;
-               PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);               
+       if ( !usePwd ) {
+               PrintAndLog("Writing address %d data %08X", addr, data);
+       } else {
+               PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);
        }
-       
+
        uint16_t flag = (addr << 8 ) | usePwd;
-       
+
        UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
        clearCommandBuffer();
        SendCommand(&c);
-       UsbCommand resp;        
+       UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){
                PrintAndLog("Error occurred, device did not respond during write operation.");
                return -1;
@@ -813,7 +1082,7 @@ int CmdEM4x05WriteWord(const char *Cmd) {
        if ( !downloadSamplesEM() ) {
                return -1;
        }
-       //check response for 00001010 for write confirmation!   
+       //check response for 00001010 for write confirmation!
        //attempt demod:
        uint32_t dummy = 0;
        int result = demodEM4x05resp(&dummy,false);
@@ -825,8 +1094,188 @@ int CmdEM4x05WriteWord(const char *Cmd) {
        return result;
 }
 
+int CmdEM4x05WriteWord(const char *Cmd) {
+       bool errors = false;
+       bool usePwd = false;
+       uint32_t data = 0xFFFFFFFF;
+       uint32_t pwd = 0xFFFFFFFF;
+       bool swap = false;
+       bool invert = false;
+       uint8_t addr = 16; // default to invalid address
+       bool gotData = false;
+       char cmdp = 0;
+       while(param_getchar(Cmd, cmdp) != 0x00)
+       {
+               switch(param_getchar(Cmd, cmdp))
+               {
+               case 'h':
+               case 'H':
+                       return usage_lf_em_write();
+               case 'a':
+               case 'A':
+                       addr = param_get8ex(Cmd, cmdp+1, 16, 10);
+                       cmdp += 2;
+                       break;
+               case 'd':
+               case 'D':
+                       data = param_get32ex(Cmd, cmdp+1, 0, 16);
+                       gotData = true;
+                       cmdp += 2;
+                       break;
+               case 'i':
+               case 'I':
+                       invert = true;
+                       cmdp++;
+                       break;
+               case 'p':
+               case 'P':
+                       pwd = param_get32ex(Cmd, cmdp+1, 1, 16);
+                       if (pwd == 1) {
+                               PrintAndLog("invalid pwd");
+                               errors = true;
+                       }
+                       usePwd = true;
+                       cmdp += 2;
+                       break;
+               case 's':
+               case 'S':
+                       swap = true;
+                       cmdp++;
+                       break;
+               default:
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                       errors = true;
+                       break;
+               }
+               if(errors) break;
+       }
+       //Validations
+       if(errors) return usage_lf_em_write();
+
+       if ( strlen(Cmd) == 0 ) return usage_lf_em_write();
+
+       if (!gotData) {
+               PrintAndLog("You must enter the data you want to write");
+               return usage_lf_em_write();
+       }
+       return EM4x05WriteWord(addr, data, pwd, usePwd, swap, invert);
+}
+
+int usage_lf_em_protect(void) {
+       PrintAndLog("Protect EM4x05.  Tag must be on antenna. ");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf em 4x05protect [h] d <data> p <pwd> [s] [i]");
+       PrintAndLog("Options:");
+       PrintAndLog("       h           - this help");
+       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("samples:");
+       PrintAndLog("      lf em 4x05protect d 11223344");
+       PrintAndLog("      lf em 4x05protect p deadc0de d 11223344 s i");
+       return 0;
+}
+
+int EM4x05Protect(uint32_t data, uint32_t pwd, bool usePwd, bool swap, bool invert) {
+       if (swap) data = SwapBits(data, 32);
+
+       if (invert) data ^= 0xFFFFFFFF;
+
+       if ( !usePwd ) {
+               PrintAndLog("Writing Protect data %08X", data);
+       } else {
+               PrintAndLog("Writing Protect data %08X using password %08X", data, pwd);
+       }
+
+       uint16_t flag = usePwd;
+
+       UsbCommand c = {CMD_EM4X_PROTECT, {flag, data, pwd}};
+       clearCommandBuffer();
+       SendCommand(&c);
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){
+               PrintAndLog("Error occurred, device did not respond during protect operation.");
+               return -1;
+       }
+       if ( !downloadSamplesEM() ) {
+               return -1;
+       }
+       //check response for 00001010 for write confirmation!
+       //attempt demod:
+       uint32_t dummy = 0;
+       int result = demodEM4x05resp(&dummy,false);
+       if (result == 1) {
+               PrintAndLog("Protect Verified");
+       } else {
+               PrintAndLog("Protect could not be verified");
+       }
+       return result;
+}
+
+int CmdEM4x05ProtectWrite(const char *Cmd) {
+       bool errors = false;
+       bool usePwd = false;
+       uint32_t data = 0xFFFFFFFF;
+       uint32_t pwd = 0xFFFFFFFF;
+       bool swap = false;
+       bool invert = false;
+       bool gotData = false;
+       char cmdp = 0;
+       while(param_getchar(Cmd, cmdp) != 0x00)
+       {
+               switch(param_getchar(Cmd, cmdp))
+               {
+               case 'h':
+               case 'H':
+                       return usage_lf_em_write();
+               case 'd':
+               case 'D':
+                       data = param_get32ex(Cmd, cmdp+1, 0, 16);
+                       gotData = true;
+                       cmdp += 2;
+                       break;
+               case 'i':
+               case 'I':
+                       invert = true;
+                       cmdp++;
+                       break;
+               case 'p':
+               case 'P':
+                       pwd = param_get32ex(Cmd, cmdp+1, 1, 16);
+                       if (pwd == 1) {
+                               PrintAndLog("invalid pwd");
+                               errors = true;
+                       }
+                       usePwd = true;
+                       cmdp += 2;
+                       break;
+               case 's':
+               case 'S':
+                       swap = true;
+                       cmdp++;
+                       break;
+               default:
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                       errors = true;
+                       break;
+               }
+               if(errors) break;
+       }
+       //Validations
+       if(errors) return usage_lf_em_protect();
+
+       if ( strlen(Cmd) == 0 ) return usage_lf_em_protect();
+
+       if (!gotData) {
+               PrintAndLog("You must enter the data you want to write");
+               return usage_lf_em_protect();
+       }
+       return EM4x05Protect(data, pwd, usePwd, swap, invert);
+}
+
 void printEM4x05config(uint32_t wordData) {
-       uint16_t datarate = (((wordData & 0x3F)+1)*2);
+       uint16_t datarate = EM4x05_GET_BITRATE(wordData);
        uint8_t encoder = ((wordData >> 6) & 0xF);
        char enc[14];
        memset(enc,0,sizeof(enc));
@@ -837,8 +1286,8 @@ void printEM4x05config(uint32_t wordData) {
        uint8_t delay = (wordData >> 12) & 0x3;
        char cdelay[33];
        memset(cdelay,0,sizeof(cdelay));
-       uint8_t LWR = (wordData >> 14) & 0xF; //last word read
-
+       uint8_t numblks = EM4x05_GET_NUM_BLOCKS(wordData);
+       uint8_t LWR = numblks+5-1; //last word read
        switch (encoder) {
                case 0: snprintf(enc,sizeof(enc),"NRZ"); break;
                case 1: snprintf(enc,sizeof(enc),"Manchester"); break;
@@ -866,21 +1315,29 @@ void printEM4x05config(uint32_t wordData) {
                case 2: snprintf(cdelay, sizeof(cdelay),"BP/4 or 1/4th bit period delay"); break;
                case 3: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
        }
+       uint8_t readLogin = (wordData & EM4x05_READ_LOGIN_REQ)>>18;
+       uint8_t readHKL = (wordData & EM4x05_READ_HK_LOGIN_REQ)>>19;
+       uint8_t writeLogin = (wordData & EM4x05_WRITE_LOGIN_REQ)>>20;
+       uint8_t writeHKL = (wordData & EM4x05_WRITE_HK_LOGIN_REQ)>>21;
+       uint8_t raw = (wordData & EM4x05_READ_AFTER_WRITE)>>22;
+       uint8_t disable = (wordData & EM4x05_DISABLE_ALLOWED)>>23;
+       uint8_t rtf = (wordData & EM4x05_READER_TALK_FIRST)>>24;
+       uint8_t pigeon = (wordData & (1<<26))>>26;
        PrintAndLog("ConfigWord: %08X (Word 4)\n", wordData);
-       PrintAndLog("Config Breakdown:", wordData);
+       PrintAndLog("Config Breakdown:");
        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");
+       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("    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("    Pigeon:   %u | Pigeon Mode is %s\n", pigeon, pigeon ? "Enabled" : "Disabled");
 }
 
 void printEM4x05info(uint8_t chipType, uint8_t cap, uint16_t custCode, uint32_t serial) {
@@ -933,20 +1390,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);
-       
+
        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;
-       
+
        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) {
@@ -954,11 +1411,12 @@ int CmdEM4x05info(const char *Cmd) {
        }
        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 ) {
                //failed
+               PrintAndLog("Config block read failed - might be password protected.");
                return 0;
        }
        printEM4x05config(wordData);
@@ -988,18 +1446,20 @@ int CmdEM4x05info(const char *Cmd) {
 
 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"},
-       {"410xsim", CmdEM410xSim, 0, "<UID> [clock rate] -- Simulate EM410x tag"},
+       {"help",      CmdHelp, 1, "This help"},
+       {"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 [d (delay in ms)] [c (clock rate)] -- Reader bruteforce attack by simulating EM410x tags"},
        {"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"},
+       {"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"},
+       {"4x05protect",   CmdEM4x05ProtectWrite, 0, "<data> (pwd) -- Write Protection to EM4x05"},
+       {"4x50read",  CmdEM4x50Read, 1, "demod data from EM4x50 tag from the graph buffer"},
        {NULL, NULL, 0, NULL}
 };
 
Impressum, Datenschutz