From 29f1147aadc64bf9bbcaf9bafcb856da4ece1e68 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 20 Oct 2020 01:00:23 +0200
Subject: [PATCH] make style

---
 armsrc/appmain.c                  |  20 ++--
 armsrc/em4x50.c                   |  22 ++--
 armsrc/iclass.c                   |  30 +++---
 armsrc/iso14443a.c                |   2 +-
 armsrc/iso15693.c                 |  12 +--
 armsrc/mifarecmd.c                |  18 ++--
 client/deps/cliparser/cliparser.c |  16 +--
 client/src/cmdhf14a.c             |  22 ++--
 client/src/cmdhf14b.c             |   2 +-
 client/src/cmdhf15.c              |  22 ++--
 client/src/cmdhficlass.c          |  70 ++++++-------
 client/src/cmdhfmfp.c             |   4 +-
 client/src/cmdhfmfu.c             |  80 +++++++-------
 client/src/cmdhfst.c              |   6 +-
 client/src/cmdlf.c                |   2 +-
 client/src/cmdlfdestron.c         |   8 +-
 client/src/cmdlfem4x05.c          | 168 +++++++++++++++---------------
 client/src/cmdlfem4x50.c          |   2 +-
 client/src/cmdlffdxb.c            |   6 +-
 client/src/cmdlfindala.c          |   4 +-
 client/src/cmdlfmotorola.c        |   8 +-
 client/src/scripting.c            |  18 ++--
 doc/commands.md                   |  25 ++++-
 include/pm3_cmd.h                 |   2 +-
 24 files changed, 292 insertions(+), 277 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 02d6f1d23..6b127c831 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1481,12 +1481,12 @@ static void PacketReceived(PacketCommandNG *packet) {
             MifareU_Otp_Tearoff(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
             break;
         }
-        case CMD_HF_MFU_COUNTER_TEAROFF: {            
+        case CMD_HF_MFU_COUNTER_TEAROFF: {
             struct p {
                 uint8_t counter;
                 uint32_t tearoff_time;
             } PACKED;
-            struct p *payload = (struct p *) packet->data.asBytes;             
+            struct p *payload = (struct p *) packet->data.asBytes;
             MifareU_Counter_Tearoff(payload->counter, payload->tearoff_time);
             break;
         }
@@ -1520,13 +1520,13 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         }
         case CMD_HF_ICLASS_SIMULATE: {
-/*
-            struct p {
-                uint8_t reader[4];
-                uint8_t mac[4];
-            } PACKED;
-            struct p *payload = (struct p *) packet->data.asBytes;
-*/
+            /*
+                        struct p {
+                            uint8_t reader[4];
+                            uint8_t mac[4];
+                        } PACKED;
+                        struct p *payload = (struct p *) packet->data.asBytes;
+            */
 
             SimulateIClass(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
             break;
@@ -1562,7 +1562,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         }
         case CMD_HF_ICLASS_RESTORE: {
-            iClass_Restore( (iclass_restore_req_t *)packet->data.asBytes);
+            iClass_Restore((iclass_restore_req_t *)packet->data.asBytes);
             break;
         }
 #endif
diff --git a/armsrc/em4x50.c b/armsrc/em4x50.c
index bce422908..9ab8dcf35 100644
--- a/armsrc/em4x50.c
+++ b/armsrc/em4x50.c
@@ -889,18 +889,18 @@ static int write(uint8_t word[4], uint8_t address) {
             return PM3_ETEAROFF;
         } else {
 
-                // wait for T0 * EM4X50_T_TAG_TWA (write access time)
-                wait_timer(FPGA_TIMER_0, T0 * EM4X50_T_TAG_TWA);
+            // wait for T0 * EM4X50_T_TAG_TWA (write access time)
+            wait_timer(FPGA_TIMER_0, T0 * EM4X50_T_TAG_TWA);
 
-                // look for ACK sequence
-                if (check_ack(false)) {
+            // look for ACK sequence
+            if (check_ack(false)) {
 
-                    // now EM4x50 needs T0 * EM4X50_T_TAG_TWEE (EEPROM write time)
-                    // for saving data and should return with ACK
-                    if (check_ack(false))
-                        return PM3_SUCCESS;
+                // now EM4x50 needs T0 * EM4X50_T_TAG_TWEE (EEPROM write time)
+                // for saving data and should return with ACK
+                if (check_ack(false))
+                    return PM3_SUCCESS;
 
-                }
+            }
         }
 
     } else {
@@ -985,7 +985,7 @@ void em4x50_write(em4x50_data_t *etd) {
             lf_finalize();
             return;
         }
-        
+
         if (res == PM3_SUCCESS) {
             // to verify result reset EM4x50
             if (reset()) {
@@ -1033,7 +1033,7 @@ void em4x50_write_password(em4x50_data_t *etd) {
 
         // login and change password
         if (login(etd->password)) {
-            
+
             int res = write_password(etd->password, etd->new_password);
             if (res == PM3_ETEAROFF) {
                 lf_finalize();
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 204cd9ea1..03f7dcbba 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -1367,7 +1367,7 @@ static bool select_iclass_tag_ex(picopass_hdr *hdr, bool use_credit_key, uint32_
         *status |= FLAG_ICLASS_CC;
 
     }  else {
-        
+
         // on NON_SECURE_PAGEMODE cards, AIA is on block2..
 
         // read App Issuer Area block 2
@@ -1443,7 +1443,7 @@ void ReaderIClass(uint8_t flags) {
     // with 0xFF:s in block 3 and 4.
 
     LED_B_ON();
-    reply_mix(CMD_ACK, result_status, 0, 0, (uint8_t*)&hdr, sizeof(hdr));
+    reply_mix(CMD_ACK, result_status, 0, 0, (uint8_t *)&hdr, sizeof(hdr));
 
     //Send back to client, but don't bother if we already sent this -
     //  only useful if looping in arm (not try_once && not abort_after_read)
@@ -1489,9 +1489,9 @@ bool authenticate_iclass_tag(iclass_auth_req_t *payload, picopass_hdr *hdr, uint
 
     memcpy(ccnr, hdr->epurse, sizeof(hdr->epurse));
 
-    if ( payload->use_replay) {
+    if (payload->use_replay) {
 
-        memcpy(pmac, payload->key + 4, 4);        
+        memcpy(pmac, payload->key + 4, 4);
         memcpy(cmd_check + 1, payload->key, 8);
 
     } else {
@@ -1780,7 +1780,7 @@ static bool iclass_writeblock_ext(uint8_t blockno, uint8_t *data, uint8_t *mac)
 
     // write command: cmd, 1 blockno, 8 data, 4 mac
     uint8_t write[16] = { 0x80 | ICLASS_CMD_UPDATE, blockno };
-    memcpy(write + 2, data, 8); 
+    memcpy(write + 2, data, 8);
     memcpy(write + 10, mac, 4);
     AddCrc(write + 1, 13);
 
@@ -1872,11 +1872,11 @@ void iClass_WriteBlock(uint8_t *msg) {
         iclass_send_as_reader(write, sizeof(write), &start_time, &eof_time);
 
         if (tearoff_hook() == PM3_ETEAROFF) { // tearoff occured
-                res = false;
-                switch_off();
-                if (payload->req.send_reply)
-                    reply_ng(CMD_HF_ICLASS_WRITEBL, PM3_ETEAROFF, (uint8_t *)&res, sizeof(uint8_t));
-                return;
+            res = false;
+            switch_off();
+            if (payload->req.send_reply)
+                reply_ng(CMD_HF_ICLASS_WRITEBL, PM3_ETEAROFF, (uint8_t *)&res, sizeof(uint8_t));
+            return;
         } else {
 
             if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_UPDATE, &eof_time) == 10) {
@@ -1885,7 +1885,7 @@ void iClass_WriteBlock(uint8_t *msg) {
             }
         }
     }
-    
+
     if (tries == 0) {
         res = false;
         goto out;
@@ -1932,7 +1932,7 @@ void iClass_Restore(iclass_restore_req_t *msg) {
         if (msg->req.send_reply) {
             reply_ng(CMD_HF_ICLASS_RESTORE, PM3_ESOFT, NULL, 0);
         }
-        return;        
+        return;
     }
 
     LED_A_ON();
@@ -1942,7 +1942,7 @@ void iClass_Restore(iclass_restore_req_t *msg) {
     uint32_t eof_time = 0;
     picopass_hdr hdr = {0};
 
-    // select 
+    // select
     bool res = select_iclass_tag(&hdr, msg->req.use_credit_key, &eof_time);
     if (res == false) {
         goto out;
@@ -1974,7 +1974,7 @@ void iClass_Restore(iclass_restore_req_t *msg) {
             doMAC_N(wb, sizeof(wb), hdr.key_c, mac);
         else
             doMAC_N(wb, sizeof(wb), hdr.key_d, mac);
-        
+
         // data + mac
         if (iclass_writeblock_ext(item.blockno, item.data, mac)) {
             Dbprintf("Write block [%02x] " _GREEN_("successful"), item.blockno);
@@ -1983,7 +1983,7 @@ void iClass_Restore(iclass_restore_req_t *msg) {
             Dbprintf("Write block [%02x] " _RED_("failed"), item.blockno);
         }
     }
-    
+
 out:
 
     switch_off();
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index d40080ae1..6e1e22738 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2629,7 +2629,7 @@ int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *p_card, uint32
         AddCrc14A(rats, 2);
         ReaderTransmit(rats, sizeof(rats), NULL);
         int len = ReaderReceive(resp, resp_par);
-        if (len == 0) 
+        if (len == 0)
             return 0;
 
         if (p_card) {
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 00af14c4f..bacceb165 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -1474,13 +1474,13 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, bool speed_fast, uint8_t
     int res = 0;
     tosend_t *ts = get_tosend();
     TransmitTo15693Tag(ts->buf, ts->max, &start_time);
-    
+
     if (tearoff_hook() == PM3_ETEAROFF) { // tearoff occured
 
         res = PM3_ETEAROFF;
 
     } else {
-    
+
         *eof_time = start_time + 32 * ((8 * ts->max) - 4); // substract the 4 padding bits after EOF
         LogTrace_ISO15693(send, sendlen, (start_time * 4), (*eof_time * 4), NULL, true);
         if (recv != NULL) {
@@ -1595,11 +1595,11 @@ void ReaderIso15693(uint32_t parameter) {
     uint32_t start_time = 0;
     uint32_t eof_time;
     int recvlen = SendDataTag(cmd, sizeof(cmd), true, true, answer, ISO15693_MAX_RESPONSE_LENGTH, start_time, ISO15693_READER_TIMEOUT, &eof_time);
-    
+
     if (recvlen == PM3_ETEAROFF) { // tearoff occured
         reply_mix(CMD_ACK, recvlen, 0, 0, NULL, 0);
     } else {
-        
+
         start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
 
         // we should do a better check than this
@@ -1634,7 +1634,7 @@ void ReaderIso15693(uint32_t parameter) {
             }
         } else {
             DbpString("Failed to select card");
-            reply_mix(CMD_ACK, 0, 0, 0, NULL, 0);            
+            reply_mix(CMD_ACK, 0, 0, 0, NULL, 0);
         }
     }
     switch_off();
@@ -1869,7 +1869,7 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
         }
 
         if (recv) {
-            recvlen = MIN(recvlen,ISO15693_MAX_RESPONSE_LENGTH);
+            recvlen = MIN(recvlen, ISO15693_MAX_RESPONSE_LENGTH);
             reply_mix(CMD_ACK, recvlen, 0, 0, recvbuf, recvlen);
         } else {
             reply_mix(CMD_ACK, 1, 0, 0, NULL, 0);
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index f442166f4..11c89a98b 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -2752,15 +2752,15 @@ void MifareU_Counter_Tearoff(uint8_t counter, uint32_t tearoff_time) {
 
     // Send MFU counter increase cmd
     uint8_t cmd[] = {
-            MIFARE_ULEV1_INCR_CNT,
-            counter,
-            0,  // lsb
-            0,  
-            0,  // msb
-            0,  // rfu
-            0,
-            0,
-        };
+        MIFARE_ULEV1_INCR_CNT,
+        counter,
+        0,  // lsb
+        0,
+        0,  // msb
+        0,  // rfu
+        0,
+        0,
+    };
     AddCrc14A(cmd, sizeof(cmd) - 2);
 
     // anticollision / select card
diff --git a/client/deps/cliparser/cliparser.c b/client/deps/cliparser/cliparser.c
index a601e6490..258346c00 100644
--- a/client/deps/cliparser/cliparser.c
+++ b/client/deps/cliparser/cliparser.c
@@ -205,9 +205,9 @@ int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
 
     int tmplen = 0;
     uint8_t tmpstr[(256 * 2) + 1] = {0};
-    
+
     // concat all strings in argstr into tmpstr[]
-    // 
+    //
     int res = CLIParamStrToBuf(argstr, tmpstr, sizeof(tmpstr), &tmplen);
     if (res) {
         return res;
@@ -216,7 +216,7 @@ int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
         return res;
     }
 
-    res = param_gethex_to_eol((char*)tmpstr, 0, data, maxdatalen, datalen);
+    res = param_gethex_to_eol((char *)tmpstr, 0, data, maxdatalen, datalen);
     switch (res) {
         case 1:
             printf("Parameter error: Invalid HEX value\n");
@@ -241,20 +241,20 @@ int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
     int ibuf = 0;
 
     for (int i = 0; i < argstr->count; i++) {
-        
+
         int len = strlen(argstr->sval[i]);
-            
-        if (len > ( (sizeof(tmpstr) / 2 ) - ibuf)) {
+
+        if (len > ((sizeof(tmpstr) / 2) - ibuf)) {
             printf("Parameter error: string too long (%i chars), expect MAX %zu chars\n", len + ibuf, (sizeof(tmpstr) / 2));
             fflush(stdout);
             return 2;
         }
-                
+
         memcpy(&tmpstr[ibuf], argstr->sval[i], len);
 
         ibuf += len;
     }
-    
+
     ibuf = MIN(ibuf, (sizeof(tmpstr) / 2));
     tmpstr[ibuf] = 0;
 
diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c
index 837311062..dac2193c6 100644
--- a/client/src/cmdhf14a.c
+++ b/client/src/cmdhf14a.c
@@ -1843,30 +1843,30 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
                     if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
                         tip = "-> MIFARE Plus X 2K/4K (SL3)";
                     } else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
-                        
+
                         if ((card.atqa[0] & 0x02) == 0x02)
                             tip = "-> MIFARE Plus S 2K (SL3)";
                         else if ((card.atqa[0] & 0x04) == 0x04)
                             tip = "-> MIFARE Plus S 4K (SL3)";
-                        
+
                     } else if (memcmp(card.ats + pos, "\xC1\x05\x21\x30\x00\xF6\xD1", 7) == 0) {
                         tip = "-> MIFARE Plus SE 1K (17pF)";
-                    } else if (memcmp(card.ats + pos, "\xC1\x05\x21\x30\x10\xF6\xD1", 7) == 0) {    
+                    } else if (memcmp(card.ats + pos, "\xC1\x05\x21\x30\x10\xF6\xD1", 7) == 0) {
                         tip = "-> MIFARE Plus SE 1K (70pF)";
                     }
-                
-                } else {  //SAK B4,5,6 
-                
-                    if ((card.sak & 0x20) == 0x20) {  // and no GetVersion()..    
-                    
-                        
+
+                } else {  //SAK B4,5,6
+
+                    if ((card.sak & 0x20) == 0x20) {  // and no GetVersion()..
+
+
                         if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
                             tip = "-> MIFARE Plus X 2K (SL1)";
                         } else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
                             tip = "-> MIFARE Plus S 2K (SL1)";
                         } else if (memcmp(card.ats + pos, "\xC1\x05\x21\x30\x00\xF6\xD1", 7) == 0) {
                             tip = "-> MIFARE Plus SE 1K (17pF)";
-                        } else if (memcmp(card.ats + pos, "\xC1\x05\x21\x30\x10\xF6\xD1", 7) == 0) {    
+                        } else if (memcmp(card.ats + pos, "\xC1\x05\x21\x30\x10\xF6\xD1", 7) == 0) {
                             tip = "-> MIFARE Plus SE 1K (70pF)";
                         }
                     } else {
@@ -1874,7 +1874,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
                             tip = "-> MIFARE Plus X 4K (SL1)";
                         } else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
                             tip = "-> MIFARE Plus S 4K (SL1)";
-                        }                            
+                        }
                     }
                 }
 
diff --git a/client/src/cmdhf14b.c b/client/src/cmdhf14b.c
index 85898fe04..73f8c2a8f 100644
--- a/client/src/cmdhf14b.c
+++ b/client/src/cmdhf14b.c
@@ -149,7 +149,7 @@ static int CmdHF14BSim(const char *Cmd) {
         PrintAndLogEx(FAILED, "failed to read pupi");
         return PM3_EINVARG;
     }
-    
+
     PrintAndLogEx(INFO, "Simulate with PUPI : " _GREEN_("%s"), sprint_hex_inrow(pupi, sizeof(pupi)));
     PrintAndLogEx(INFO, "Press pm3-button to abort simulation");
     clearCommandBuffer();
diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c
index b4cde234f..6d276617c 100644
--- a/client/src/cmdhf15.c
+++ b/client/src/cmdhf15.c
@@ -656,13 +656,13 @@ static int CmdHF15Demod(const char *Cmd) {
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);
     CLIParserFree(ctx);
-    
+
     // The sampling rate is 106.353 ksps/s, for T = 18.8 us
     int i, j;
     int max = 0, maxPos = 0;
     int skip = 4;
 
-    if (GraphTraceLen < 1000) {        
+    if (GraphTraceLen < 1000) {
         PrintAndLogEx(FAILED, "Too few samples in GraphBuffer. Need more than 1000");
         PrintAndLogEx(HINT, "Run " _YELLOW_("`hf 15 samples`") " to collect and download data");
         return PM3_ESOFT;
@@ -733,8 +733,8 @@ static int CmdHF15Demod(const char *Cmd) {
         PrintAndLogEx(WARNING, "Warning, uneven octet! (discard extra bits!)");
         PrintAndLogEx(INFO, "   mask = %02x", mask);
     }
-    
-    if ( k == 0 ) {
+
+    if (k == 0) {
         return PM3_SUCCESS;
     }
 
@@ -744,7 +744,7 @@ static int CmdHF15Demod(const char *Cmd) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(SUCCESS, " idx | data");
     PrintAndLogEx(SUCCESS, "-----+-------------------------------------------------");
-    if ( k / 16 > 0) {
+    if (k / 16 > 0) {
         for (; i < k; i += 16) {
             PrintAndLogEx(SUCCESS, " %3i | %s", i, sprint_hex(outBuf + i, 16));
         }
@@ -824,7 +824,7 @@ static int NxpSysInfo(uint8_t *uid) {
     if (status == PM3_ETEAROFF) {
         return status;
     }
-    
+
     if (status < 2) {
         PrintAndLogEx(WARNING, "iso15693 card doesn't answer to NXP systeminfo command");
         return PM3_EWRONGANSWER;
@@ -1058,7 +1058,7 @@ static int CmdHF15Sniff(const char *Cmd) {
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);
     CLIParserFree(ctx);
-    
+
     PacketResponseNG resp;
     clearCommandBuffer();
     SendCommandNG(CMD_HF_ISO15693_SNIFF, NULL, 0);
@@ -1111,7 +1111,7 @@ static int CmdHF15Sim(const char *Cmd) {
     struct {
         uint8_t uid[8];
     } PACKED payload;
-    
+
     int uidlen = 0;
     CLIGetHexWithReturn(ctx, 1, payload.uid, &uidlen);
     CLIParserFree(ctx);
@@ -1904,11 +1904,11 @@ static int CmdHF15CSetUID(const char *Cmd) {
     struct {
         uint8_t uid[8];
     } PACKED payload;
-    
+
     int uidlen = 0;
     CLIGetHexWithReturn(ctx, 1, payload.uid, &uidlen);
     CLIParserFree(ctx);
-    
+
     if (uidlen != 8) {
         PrintAndLogEx(WARNING, "UID must include 16 HEX symbols got ");
         return PM3_EINVARG;
@@ -1936,7 +1936,7 @@ static int CmdHF15CSetUID(const char *Cmd) {
     if (WaitForResponseTimeout(CMD_HF_ISO15693_CSETUID, &resp, 2000) == false) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply");
         DropField();
-        return PM3_ESOFT;        
+        return PM3_ESOFT;
     }
 
     PrintAndLogEx(INFO, "getting updated card details...");
diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c
index e9aaa1880..782e782eb 100644
--- a/client/src/cmdhficlass.c
+++ b/client/src/cmdhficlass.c
@@ -427,7 +427,7 @@ static void fuse_config(const picopass_hdr *hdr) {
 
     uint16_t otp = (hdr->conf.otp[1] << 8 | hdr->conf.otp[0]);
 
-    PrintAndLogEx(INFO, "    Raw: " _YELLOW_("%s"), sprint_hex((uint8_t*)&hdr->conf, 8));
+    PrintAndLogEx(INFO, "    Raw: " _YELLOW_("%s"), sprint_hex((uint8_t *)&hdr->conf, 8));
     PrintAndLogEx(INFO, "         " _YELLOW_("%02X") ".....................  app limit", hdr->conf.app_limit);
     PrintAndLogEx(INFO, "            " _YELLOW_("%04X") " ( %5u )......  OTP", otp, otp);
     PrintAndLogEx(INFO, "                  " _YELLOW_("%02X") "............  block write lock", hdr->conf.block_writelock);
@@ -1540,7 +1540,7 @@ static int CmdHFiClassDump(const char *Cmd) {
                 PrintAndLogEx(SUCCESS, "Using " _YELLOW_("replay NR/MAC mode"));
                 use_replay = true;
                 cmdp++;
-                break; 
+                break;
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
                 errors = true;
@@ -1552,7 +1552,7 @@ static int CmdHFiClassDump(const char *Cmd) {
         PrintAndLogEx(FAILED, "Can not use a combo of 'e', 'r', 'n'");
         errors = true;
     }
-    
+
     if (errors) return usage_hf_iclass_dump();
 
     uint32_t flags = (FLAG_ICLASS_READER_INIT | FLAG_ICLASS_READER_CLEARTRACE);
@@ -1788,7 +1788,7 @@ write_dump:
 }
 
 static int iclass_write_block(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_credit_key, bool elite, bool rawkey, bool replay, bool verbose) {
- 
+
     iclass_writeblock_req_t payload = {
         .req.use_raw = rawkey,
         .req.use_elite = elite,
@@ -1882,13 +1882,13 @@ static int CmdHFiClass_WriteBlock(const char *Cmd) {
                 rawkey = true;
                 cmdp++;
                 break;
-/*
-            case 'n':
-                PrintAndLogEx(SUCCESS, "Using " _YELLOW_("replay NR/MAC mode"));
-                use_replay = true;
-                cmdp++;
-                break;  
-*/                
+            /*
+                        case 'n':
+                            PrintAndLogEx(SUCCESS, "Using " _YELLOW_("replay NR/MAC mode"));
+                            use_replay = true;
+                            cmdp++;
+                            break;
+            */
             case 'v':
                 verbose = true;
                 cmdp++;
@@ -1910,7 +1910,7 @@ static int CmdHFiClass_WriteBlock(const char *Cmd) {
     if (errors || cmdp < 6) return usage_hf_iclass_writeblock();
 
     int isok = iclass_write_block(blockno, bldata, KEY, use_credit_key, elite, rawkey, use_replay, verbose);
-    switch(isok) {
+    switch (isok) {
         case PM3_SUCCESS:
             PrintAndLogEx(SUCCESS, "Wrote block %02X successful", blockno);
             break;
@@ -2043,24 +2043,24 @@ static int CmdHFiClassRestore(const char *Cmd) {
         return PM3_EFILE;
     }
 
-    if (bytes_read < ((endblock - startblock + 1) * 8 )) {
+    if (bytes_read < ((endblock - startblock + 1) * 8)) {
         PrintAndLogEx(ERR, "file is smaller than your suggested block range ( " _RED_("0x%02x..0x%02x")" )",
-                startblock, endblock
-                );
+                      startblock, endblock
+                     );
         free(dump);
         return PM3_EFILE;
     }
 
     iclass_restore_req_t *payload = calloc(1, payload_size);
     payload->req.use_raw = rawkey,
-    payload->req.use_elite = elite,
-    payload->req.use_credit_key = use_credit_key,
-    payload->req.use_replay = false,
-    payload->req.blockno = startblock,
-    payload->req.send_reply = true,
-    payload->req.do_auth = true,
-    memcpy(payload->req.key, KEY, 8);
-    
+             payload->req.use_elite = elite,
+                      payload->req.use_credit_key = use_credit_key,
+                               payload->req.use_replay = false,
+                                        payload->req.blockno = startblock,
+                                                 payload->req.send_reply = true,
+                                                          payload->req.do_auth = true,
+                                                                   memcpy(payload->req.key, KEY, 8);
+
     payload->item_cnt = (endblock - startblock + 1);
 
     // read data from file from block 6 --- 19
@@ -2068,21 +2068,21 @@ static int CmdHFiClassRestore(const char *Cmd) {
     // then copy to usbcommand->asbytes;
     // max is 32 - 6 = 28 block.  28 x 12 bytes gives 336 bytes
 
-    for (uint8_t i = 0; i < payload->item_cnt; i++) {        
+    for (uint8_t i = 0; i < payload->item_cnt; i++) {
         payload->blocks[i].blockno = startblock + i;
-        memcpy(payload->blocks[i].data, dump + (startblock * 8) + (i * 8) , sizeof(payload->blocks[i].data));
+        memcpy(payload->blocks[i].data, dump + (startblock * 8) + (i * 8), sizeof(payload->blocks[i].data));
     }
 
     free(dump);
 
     if (verbose) {
         PrintAndLogEx(INFO, "Preparing to restore block range 0x%02x..0x%02x", startblock, endblock);
-        
+
         PrintAndLogEx(INFO, "------+----------------------");
         PrintAndLogEx(INFO, "block | data");
         PrintAndLogEx(INFO, "------+----------------------");
 
-        for (uint8_t i = 0; i < payload->item_cnt; i++) {           
+        for (uint8_t i = 0; i < payload->item_cnt; i++) {
             iclass_restore_item_t item = payload->blocks[i];
             PrintAndLogEx(INFO, "  %02X  | %s", item.blockno, sprint_hex_inrow(item.data, sizeof(item.data)));
         }
@@ -2233,7 +2233,7 @@ static int CmdHFiClass_ReadBlock(const char *Cmd) {
     }
     if (got_blockno == false)
         errors = true;
-    
+
     if ((use_replay + rawkey + elite) > 1) {
         PrintAndLogEx(FAILED, "Can not use a combo of 'e', 'r', 'n'");
         errors = true;
@@ -2405,7 +2405,7 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
     PrintAndLogEx(INFO, " blk| data                    | ascii    |lck| info");
     PrintAndLogEx(INFO, "----+-------------------------+----------+---+--------------");
     PrintAndLogEx(INFO, "0x00| " _GREEN_("%s") " |   | CSN ", sprint_hex_ascii(iclass_dump, 8));
-    
+
     if (i != 1)
         PrintAndLogEx(INFO, "....");
 
@@ -2455,8 +2455,8 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
             const char *s = info_nonks[3];
             if (i < 3) {
                 s = info_nonks[i];
-            }            
-           
+            }
+
             PrintAndLogEx(INFO, "0x%02X| %s | %s | %s ", i, sprint_hex_ascii(blk, 8), lockstr, s);
         } else {
             const char *info_ks[] = {"CSN", "Config", "E-purse", "Debit", "Credit", "AIA", "User"};
@@ -2978,8 +2978,8 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
         free(keyBlock);
         return res;
     }
-    
-        // Get CSN / UID and CCNR
+
+    // Get CSN / UID and CCNR
     PrintAndLogEx(SUCCESS, "Reading tag CSN / CCNR...");
     for (uint8_t i = 0; i < ICLASS_AUTH_RETRY && !got_csn; i++) {
         got_csn = select_only(CSN, CCNR, false);
@@ -2993,7 +2993,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
         DropField();
         return PM3_ESOFT;
     }
-    
+
     iclass_premac_t *pre = calloc(keycount, sizeof(iclass_premac_t));
     if (pre == NULL) {
         return PM3_EMALLOC;
@@ -3449,7 +3449,7 @@ static int CmdHFiClassAutopwn(const char *Cmd) {
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);
     CLIParserFree(ctx);
-    
+
     // Check keys.
 
     // dump
diff --git a/client/src/cmdhfmfp.c b/client/src/cmdhfmfp.c
index 7d9c077fb..fd0f6c93a 100644
--- a/client/src/cmdhfmfp.c
+++ b/client/src/cmdhfmfp.c
@@ -294,9 +294,9 @@ static int CmdHFMFPInfo(const char *Cmd) {
     } else {
         // info about 14a part
         infoHF14A(false, false, false);
-        
+
         // Historical bytes.
-        
+
     }
 
 
diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c
index c472b8d59..55e03a848 100644
--- a/client/src/cmdhfmfu.c
+++ b/client/src/cmdhfmfu.c
@@ -242,7 +242,7 @@ static int usage_hf_mfu_otp_tearoff(void) {
     PrintAndLogEx(NORMAL, "  s <time>  : (optional) start time to run the test - default 0 us");
     PrintAndLogEx(NORMAL, "  d <data>  : (optional) data to full-write before trying the OTP test - default 0x00");
     PrintAndLogEx(NORMAL, "  t <data>  : (optional) data to write while running the OTP test - default 0x00");
-    PrintAndLogEx(NORMAL, "  m <data>  : (optional) exit criteria, if block matches this value");    
+    PrintAndLogEx(NORMAL, "  m <data>  : (optional) exit criteria, if block matches this value");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "        hf mfu otptear b 3");
@@ -362,7 +362,7 @@ static bool ul_select(iso14a_card_select_t *card) {
             return false;
         }
 
-        if (card) 
+        if (card)
             memcpy(card, resp.data.asBytes, sizeof(iso14a_card_select_t));
     }
     return true;
@@ -2897,7 +2897,7 @@ static int CmdHF14AMfuOtpTearoff(const char *Cmd) {
                 }
                 use_match = true;
                 cmdp += 2;
-                break;            
+                break;
             default:
                 PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                 errors = true;
@@ -2947,9 +2947,9 @@ static int CmdHF14AMfuOtpTearoff(const char *Cmd) {
 
         clearCommandBuffer();
         SendCommandMIX(CMD_HF_MFU_OTP_TEAROFF, blockNoUint, actualTime, 0, teardata, 8);
-        
+
         // we be getting ACK that we are silently ignoring here..
-        
+
         if (!WaitForResponseTimeout(CMD_HF_MFU_OTP_TEAROFF, &resp, 2000)) {
             PrintAndLogEx(WARNING, "Failed");
             return PM3_ESOFT;
@@ -3061,7 +3061,7 @@ static int CmdHF14AMfuOtpTearoff(const char *Cmd) {
 
 /*
 static int counter_reset_tear(iso14a_card_select_t *card, uint8_t cnt_no) {
-                    
+
     PrintAndLogEx(INFO, "Reset tear check");
 
     uint8_t cw[6] = { MIFARE_ULEV1_INCR_CNT, cnt_no, 0x00, 0x00, 0x00, 0x00};
@@ -3081,7 +3081,7 @@ static int counter_reset_tear(iso14a_card_select_t *card, uint8_t cnt_no) {
         return PM3_ESOFT;
     }
     DropField();
-    
+
     if (ct[0] != 0xBD) {
         PrintAndLogEx(INFO, "Resetting seem to have failed, WHY!?");
         return PM3_ESOFT;
@@ -3106,13 +3106,13 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
         arg_int0("c", "cnt", "<0,1,2>", "Target this EV1 counter (0,1,2)"),
         arg_int0("i", "inc", "<dec>", "time interval to increase in each iteration - default 10 us"),
         arg_int0("l", "limit", "<dec>", "test upper limit time - default 3000 us"),
-        arg_int0("s", "start", "<dec>", "test start time - default 0 us"), 
-        arg_int0(NULL, "fix", "<dec>", "test fixed loop delay"),         
+        arg_int0("s", "start", "<dec>", "test start time - default 0 us"),
+        arg_int0(NULL, "fix", "<dec>", "test fixed loop delay"),
         arg_str0("x", "hex",  NULL, "3 byte hex to increase counter with"),
         arg_param_end
     };
     CLIExecWithReturn(ctx, Cmd, argtable, false);
-    
+
     int interval = 0;
     int time_limit, start_time = 0;
     int counter = arg_get_int_def(ctx, 1, 0);
@@ -3124,15 +3124,15 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
         start_time = arg_get_int_def(ctx, 4, 0);
     } else {
         start_time = fixed;
-        interval = 0;        
+        interval = 0;
         time_limit = fixed;
     }
-    
+
     uint8_t newvalue[5] = {0};
     int newvaluelen = 0;
     CLIGetHexWithReturn(ctx, 6, newvalue, &newvaluelen);
     CLIParserFree(ctx);
-    
+
     // Validations
     if (start_time > (time_limit - interval)) {
         PrintAndLogEx(WARNING, "Wrong start time number");
@@ -3163,14 +3163,14 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
         PrintAndLogEx(INFO, "failed to select card,  exiting...");
         return PM3_ESOFT;
     }
-   
+
     uint8_t inital_cnt[3] = {0, 0, 0};
     int len = ulev1_readCounter(cnt_no, inital_cnt, sizeof(inital_cnt));
     if ( len != sizeof(inital_cnt) ) {
         PrintAndLogEx(WARNING, "failed to read counter");
         return PM3_ESOFT;
     }
-            
+
     uint8_t inital_tear[1] = {0};
     len = ulev1_readTearing(cnt_no, inital_tear, sizeof(inital_tear));
     DropField();
@@ -3184,7 +3184,7 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
 
     PrintAndLogEx(INFO, "----------------- " _CYAN_("MFU Ev1 Counter Tear off") " ---------------------");
     PrintAndLogEx(INFO, "Target counter no     [ " _GREEN_("%u") " ]", counter);
-    PrintAndLogEx(INFO, "       counter value  [ " _GREEN_("%s") " ]", sprint_hex_inrow(inital_cnt, sizeof(inital_cnt)));    
+    PrintAndLogEx(INFO, "       counter value  [ " _GREEN_("%s") " ]", sprint_hex_inrow(inital_cnt, sizeof(inital_cnt)));
     PrintAndLogEx(INFO, "     anti-tear value  [ " _GREEN_("%02X") " ]", inital_tear[0]);
     PrintAndLogEx(INFO, "       increase value [ " _GREEN_("%s") " ]", sprint_hex_inrow(newvalue, newvaluelen));
     PrintAndLogEx(INFO, "----------------------------------------------------");
@@ -3197,7 +3197,7 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
     uint32_t loop = 0;
 
     uint16_t late = 0;
-    
+
     while (actual_time <= (time_limit - interval)) {
 
 
@@ -3217,7 +3217,7 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
             continue;
         }
 
-        uint8_t cntresp[3] = {0, 0, 0};    
+        uint8_t cntresp[3] = {0, 0, 0};
         int rlen = ulev1_readCounter(cnt_no, cntresp, sizeof(cntresp));
         if ( rlen == sizeof(cntresp) ) {
             memcpy(pre, cntresp, sizeof(pre));
@@ -3226,19 +3226,19 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
             PrintAndLogEx(FAILED, "BEFORE, failed to read COUNTER,  exiting...");
             break;
         }
-        
+
         uint8_t tear[1] = {0};
         int tlen = ulev1_readTearing(cnt_no, tear, sizeof(tear));
         if ( tlen == sizeof(tear) ) {
             pre_tear = tear[0];
         } else {
-            PrintAndLogEx(NORMAL, "");            
+            PrintAndLogEx(NORMAL, "");
             PrintAndLogEx(FAILED, "BEFORE, failed to read ANTITEAR,  exiting...  %d", tlen);
             break;
         }
 
         DropField();
-        
+
         struct p {
             uint8_t counter;
             uint32_t tearoff_time;
@@ -3269,7 +3269,7 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
             PrintAndLogEx(FAILED, "AFTER, failed to read COUNTER,  exiting...");
             break;
         }
-        
+
         tear[0] = 0;
         tlen = ulev1_readTearing(cnt_no, tear, sizeof(tear));
         if ( tlen == sizeof(tear) ) {
@@ -3279,7 +3279,7 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
             PrintAndLogEx(FAILED, "AFTER, failed to read ANTITEAR,  exiting...");
             break;
         }
-        
+
         DropField();
 
         char prestr[20] = {0};
@@ -3290,15 +3290,15 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
         bool post_tear_check = (post_tear == 0xBD);
         a = (pre[0] | pre[1] << 8 | pre[2]  << 16);
         b = (post[0] | post[1] << 8 | post[2]  << 16);
-        
+
         // A != B
         if (memcmp(pre, post, sizeof(pre)) != 0) {
 
 
             PrintAndLogEx(NORMAL, "");
-            
+
             if (inital_value != a ) {
-                
+
                 if ( inital_value != b )
                     PrintAndLogEx(INFO, "pre %08x, post %08x != inital %08x  |  tear:  0x%02X  == 0x%02X", a, b, inital_value, pre_tear, post_tear);
                 else
@@ -3319,7 +3319,7 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
                 );
                 break;
             }
-                
+
             if ( a > b ) {
                 PrintAndLogEx(INFO, _CYAN_("Tear off occured  " _RED_("( LESS )") " ->  ") "%s vs " _GREEN_("%s") "  Tear status:  0x%02X == 0x%02X   ( %s )"
                     , prestr
@@ -3347,14 +3347,14 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
                 newvalue[2] = 0;
 
                 PrintAndLogEx(INFO, "     0x1000000 - 0x%x == 0x%x", b, bar);
-                PrintAndLogEx(INFO, "      new increase value 0x%x" , wr_value);    
+                PrintAndLogEx(INFO, "      new increase value 0x%x" , wr_value);
                 PrintAndLogEx(INFO, "    because BAR + post == 0x%x" , bar + b);
 
                 PrintAndLogEx(INFO, "New increase value " _YELLOW_("%s"), sprint_hex_inrow(newvalue, newvaluelen));
                 continue;
             } else  {
 
-                PrintAndLogEx(NORMAL, "");                
+                PrintAndLogEx(NORMAL, "");
                 PrintAndLogEx(INFO, _CYAN_("Tear off occured  (+1)  (too late) ->  ") "%s vs %s   Tear:  0x%02X == 0x%02X   ( %s )"
                     , prestr
                     , poststr
@@ -3368,23 +3368,23 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
                     break;
                 }
                 if ( wr_value != 0 ) {
-                    
+
                     //uint32_t bar =  (0x1000000 - b) + 2;
                     wr_value = 0;
                     newvalue[0] = 0;
                     newvalue[1] = 0;
                     newvalue[2] = 0;
-                        
+
                     if ( b >= (inital_value + (2 * wr_value))) {
                         PrintAndLogEx(INFO, "Large " _YELLOW_("( JUMP )") " detected");
-                        
-                        
+
+
                         // wr_value = bar;
                         // newvalue[0] = (bar) & 0xFF;
                         // newvalue[1] = ((bar >> 8) & 0xFF);
                         // newvalue[2] = ((bar >> 16) & 0xFF);
                     } else {
-                        
+
                         // wr_value = bar;
                         // newvalue[0] = (bar) & 0xFF;
                         // newvalue[1] = ((bar >> 8) & 0xFF);
@@ -3397,7 +3397,7 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
 
                 }
                 PrintAndLogEx(INFO, "New increase value " _YELLOW_("%s"), sprint_hex_inrow(newvalue, newvaluelen));
-                
+
                 //actual_time--;
                 late++;
             }
@@ -3410,19 +3410,19 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
                 , post_tear
                 , post_tear_check ? _GREEN_("OK") : _RED_("DETECTED")
             );
-            
+
             if ( post_tear_check ) {
                 if ( a == b ) {
                     //actual_time--;
                     continue;
                 }
-            
+
                 if ( b == inital_value ) {
                     PrintAndLogEx(INFO, "Reverted to previous value");
                     break;
                 }
             } else {
-                
+
                 if (counter_reset_tear(&card, cnt_no) != PM3_SUCCESS){
                     PrintAndLogEx(FAILED, "failed to reset tear,  exiting...");
                     break;
@@ -3436,7 +3436,7 @@ static int CmdHF14AMfuEv1CounterTearoff(const char *Cmd) {
 
     DropField();
 
-    PrintAndLogEx(INFO, " Sent %u tear offs ", loop);    
+    PrintAndLogEx(INFO, " Sent %u tear offs ", loop);
 
     counter_reset_tear(&card, cnt_no);
 
@@ -3584,7 +3584,7 @@ static command_t CommandTable[] = {
     {"gen",     CmdHF14AMfUGenDiverseKeys, AlwaysAvailable, "Generate 3des mifare diversified keys"},
     {"pwdgen",  CmdHF14AMfUPwdGen,         AlwaysAvailable, "Generate pwd from known algos"},
     {"otptear", CmdHF14AMfuOtpTearoff,     IfPm3Iso14443a,  "Tear-off test on OTP bits"},
-//    {"countertear", CmdHF14AMfuEv1CounterTearoff,     IfPm3Iso14443a,  "Tear-off test on Ev1 Counter bits"},        
+//    {"countertear", CmdHF14AMfuEv1CounterTearoff,     IfPm3Iso14443a,  "Tear-off test on Ev1 Counter bits"},
     {"ndef",    CmdHF14MfuNDEF,            IfPm3Iso14443a,  "Prints NDEF records from card"},
     {NULL, NULL, NULL, NULL}
 };
diff --git a/client/src/cmdhfst.c b/client/src/cmdhfst.c
index f48db7e73..89633de8a 100644
--- a/client/src/cmdhfst.c
+++ b/client/src/cmdhfst.c
@@ -523,14 +523,14 @@ static int cmd_hf_st_protect(const char *Cmd) {
     if (enable_protection && disable_protection) {
         PrintAndLogEx(ERR, "Must specify either enable or disable protection, not both");
         return PM3_EINVARG;
-    } 
+    }
     if (enable_protection) {
         state[0] = 0x28;
     }
     if (disable_protection) {
         state[0] = 0x26;
     }
-    
+
     if (read_protection && write_protection) {
         PrintAndLogEx(ERR, "Must specify either read or write protection, not both");
         return PM3_EINVARG;
@@ -681,7 +681,7 @@ static int cmd_hf_st_pwd(const char *Cmd) {
     if (change_write_password) {
         changePwd[2] = 0x02;
     }
-    
+
     if (pwdlen != 16) {
         PrintAndLogEx(ERR, "Original write password must be 16 hex bytes");
         return PM3_EINVARG;
diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c
index f5effbd17..95e38b6c0 100644
--- a/client/src/cmdlf.c
+++ b/client/src/cmdlf.c
@@ -31,7 +31,7 @@
 #include "cmdlfawid.h"      // for awid menu
 #include "cmdlfem4x.h"      // for em4x menu
 #include "cmdlfem4x05.h"    // for em4x05 / 4x69
-#include "cmdlfem4x50.h"    // for em4x50 
+#include "cmdlfem4x50.h"    // for em4x50
 #include "cmdlfhid.h"       // for hid menu
 #include "cmdlfhitag.h"     // for hitag menu
 #include "cmdlfidteck.h"    // for idteck menu
diff --git a/client/src/cmdlfdestron.c b/client/src/cmdlfdestron.c
index 52ae5fc6d..59d0c3813 100644
--- a/client/src/cmdlfdestron.c
+++ b/client/src/cmdlfdestron.c
@@ -66,7 +66,7 @@ int demodDestron(bool verbose) {
 
     uint8_t data[5] = {0};
     uint8_t parity_err = 0;
-    for (int i=0; i < sizeof(data); i++) {
+    for (int i = 0; i < sizeof(data); i++) {
         data[i] = bytebits_to_byte(bits + i * 8, 8);
         parity_err += oddparity8(data[i]);
         data[i] &= 0x7F;
@@ -113,11 +113,11 @@ static int CmdDestronClone(const char *Cmd) {
     CLIParserFree(ctx);
 
     uint8_t data_ex[12 + 24] = {0}; // ManchesterEncode need extra room
-    for (int i=0; i < datalen; i++) {
+    for (int i = 0; i < datalen; i++) {
         data_ex[i + 1] = ~data [i] | (evenparity8(data[i]) << 7);
     }
-    for (int i=0; i < 3; i++) {
-        blocks[i+1] = manchesterEncode2Bytes((data_ex[i*2]<<8)+data_ex[i*2+1]);
+    for (int i = 0; i < 3; i++) {
+        blocks[i + 1] = manchesterEncode2Bytes((data_ex[i * 2] << 8) + data_ex[i * 2 + 1]);
     }
     // inject preamble
     blocks[1] = (blocks[1] & 0xFFFF) | 0xAAE20000;
diff --git a/client/src/cmdlfem4x05.c b/client/src/cmdlfem4x05.c
index 4992ab1c8..cf27030a4 100644
--- a/client/src/cmdlfem4x05.c
+++ b/client/src/cmdlfem4x05.c
@@ -107,7 +107,7 @@ typedef enum {
 // 2 = EM4x05
 static em_tech_type_t em_get_card_type(uint32_t config) {
     uint8_t t = (config >> 1) & 0xF;
-    switch(t) {
+    switch (t) {
         case 4:
             return EM_4X69;
         case 8:
@@ -118,7 +118,7 @@ static em_tech_type_t em_get_card_type(uint32_t config) {
     return EM_UNKNOWN;
 }
 
-static const char* em_get_card_str(uint32_t config) {    
+static const char *em_get_card_str(uint32_t config) {
     switch (em_get_card_type(config)) {
         case EM_4305:
             return "EM4305";
@@ -429,9 +429,9 @@ int CmdEM4x05Dump(const char *Cmd) {
 
     void *argtable[] = {
         arg_param_begin,
-        arg_u64_0("p", "pwd", "<hex>", "password (0x00000000)"),        
+        arg_u64_0("p", "pwd", "<hex>", "password (0x00000000)"),
         arg_str0("f", "file", "<filename>", "overide filename prefix (optional).  Default is based on UID"),
-        arg_param_end        
+        arg_param_end
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);
 
@@ -440,17 +440,17 @@ int CmdEM4x05Dump(const char *Cmd) {
     char filename[FILE_PATH_SIZE] = {0};
     CLIParamStrToBuf(arg_get_str(ctx, 2), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen);
     CLIParserFree(ctx);
-    
+
     uint8_t addr = 0;
     uint32_t pwd = 0;
-    bool usePwd = false;    
+    bool usePwd = false;
     if (inputpwd != 0xFFFFFFFFFFFFFFFF) {
-        
+
         if (inputpwd & 0xFFFFFFFF00000000) {
             PrintAndLogEx(FAILED, "Pwd too large");
             return PM3_EINVARG;
         }
-        
+
         usePwd = true;
         pwd = (inputpwd & 0xFFFFFFFF);
     }
@@ -470,13 +470,13 @@ int CmdEM4x05Dump(const char *Cmd) {
     bool gotLockBits = false;
     bool lockInPW2 = false;
     uint32_t word = 0;
-    
+
     const char *info[] = {"Info/User", "UID", "Password", "User", "Config", "User", "User", "User", "User", "User", "User", "User", "User", "User", "Lock", "Lock"};
     const char *info4x69 [] = {"Info", "UID", "Password", "Config", "User", "User", "User", "User", "User", "User", "User", "User", "User", "User", "User", "User"};
 
-    // EM4305 vs EM4469 
+    // EM4305 vs EM4469
     em_tech_type_t card_type = em_get_card_type(block0);
-    
+
     PrintAndLogEx(INFO, "Found a " _GREEN_("%s") " tag", em_get_card_str(block0));
 
     if (usePwd) {
@@ -497,7 +497,7 @@ int CmdEM4x05Dump(const char *Cmd) {
     PrintAndLogEx(INFO, "Addr | data     | ascii |lck| info");
     PrintAndLogEx(INFO, "-----+----------+-------+---+-----");
 
-    if ( card_type == EM_4205 || card_type == EM_4305 || card_type == EM_UNKNOWN) {
+    if (card_type == EM_4205 || card_type == EM_4305 || card_type == EM_UNKNOWN) {
 
 
         // To flag any blocks locked we need to read blocks 14 and 15 first
@@ -570,7 +570,7 @@ int CmdEM4x05Dump(const char *Cmd) {
         data[15] = BSWAP_32(data[15]);
 
     } else if (card_type == EM_4X69) {
-        
+
         // To flag any blocks locked we need to read blocks 14 and 15 first
         // dont swap endin until we get block lock flags.
         status14 = EM4x05ReadWord_ext(EM4469_PROT_BLOCK, pwd, usePwd, &word);
@@ -583,7 +583,7 @@ int CmdEM4x05Dump(const char *Cmd) {
         } else {
             success = PM3_ESOFT; // If any error ensure fail is set so not to save invalid data
         }
-        
+
         uint32_t lockbit;
 
         for (; addr < 15; addr++) {
@@ -613,7 +613,7 @@ int CmdEM4x05Dump(const char *Cmd) {
                 }
             }
         }
-        
+
     } else {
     }
 
@@ -621,8 +621,8 @@ int CmdEM4x05Dump(const char *Cmd) {
         // saveFileEML will add .eml extension to filename
         // saveFile (binary) passes in the .bin extension.
         if (strcmp(filename, "") == 0) {
-            
-            if ( card_type == EM_4X69) {
+
+            if (card_type == EM_4X69) {
                 sprintf(filename, "lf-4x69-%08X-dump", BSWAP_32(data[1]));
             } else {
                 sprintf(filename, "lf-4x05-%08X-dump", BSWAP_32(data[1]));
@@ -631,7 +631,7 @@ int CmdEM4x05Dump(const char *Cmd) {
         }
         PrintAndLogEx(NORMAL, "");
         saveFileJSON(filename, (card_type == EM_4X69) ? jsfEM4x69 : jsfEM4x05, (uint8_t *)data, 16 * sizeof(uint32_t), NULL);
-        
+
         saveFileEML(filename, (uint8_t *)data, 16 * sizeof(uint32_t), sizeof(uint32_t));
         saveFile(filename, ".bin", data, sizeof(data));
     }
@@ -941,7 +941,7 @@ static void printEM4x05info(uint32_t block0, uint32_t serial) {
 
     uint8_t chipType = (block0 >> 1) & 0xF;
     uint8_t cap = (block0 >> 5) & 3;
-    uint16_t custCode = (block0 >> 9) & 0x2FF;    
+    uint16_t custCode = (block0 >> 9) & 0x2FF;
 
     /* bits
     //  0,   rfu
@@ -950,7 +950,7 @@ static void printEM4x05info(uint32_t block0, uint32_t serial) {
     //  7,8, rfu
     //  9 - 18 customer code
     //  19,  rfu
-              
+
        98765432109876543210
        001000000000
     // 00100000000001111000
@@ -959,7 +959,7 @@ static void printEM4x05info(uint32_t block0, uint32_t serial) {
     //             011
     // 00100000000
     */
-    
+
     PrintAndLogEx(INFO, "--- " _CYAN_("Tag Information") " ---------------------------");
 
     PrintAndLogEx(SUCCESS, "    Block0: " _GREEN_("%08x") " (Word 0)", block0);
@@ -1037,7 +1037,7 @@ int CmdEM4x05Info(const char *Cmd) {
         return PM3_ESOFT;
 
     printEM4x05config(word);
-    
+
     // if 4469 read EM4469_PROT_BLOCK
     // if 4305 read 14,15
     if (card_type == EM_4205 || card_type == EM_4305) {
@@ -1059,7 +1059,7 @@ int CmdEM4x05Info(const char *Cmd) {
             }
         }
     } else if (card_type == EM_4X69) {
-          // read word 3 to see which is being used for the protection bits
+        // read word 3 to see which is being used for the protection bits
         if (EM4x05ReadWord_ext(EM4469_PROT_BLOCK, pwd, usePwd, &word) != PM3_SUCCESS) {
             return PM3_ESOFT;
         }
@@ -1104,12 +1104,12 @@ int CmdEM4x05Chk(const char *Cmd) {
         snprintf(filename, sizeof(filename), "t55xx_default_pwds");
     }
     PrintAndLogEx(NORMAL, "");
-    
+
     bool found = false;
     uint64_t t1 = msclock();
-    
+
     // White cloner password based on EM4100 ID
-    if ( card_id > 0 ) {
+    if (card_id > 0) {
 
         uint32_t pwd = lf_t55xx_white_pwdgen(card_id & 0xFFFFFFFF);
         PrintAndLogEx(INFO, "testing %08"PRIX32" generated ", pwd);
@@ -1180,7 +1180,7 @@ int CmdEM4x05Chk(const char *Cmd) {
 
 typedef struct {
     uint16_t cnt;
-    uint32_t value;    
+    uint32_t value;
 } em4x05_unlock_item_t;
 
 static int unlock_write_protect(bool use_pwd, uint32_t pwd, uint32_t data, bool verbose) {
@@ -1214,7 +1214,7 @@ static int unlock_write_protect(bool use_pwd, uint32_t pwd, uint32_t data, bool
         PrintAndLogEx(ERR, "Tag denied PROTECT operation");
     else
         PrintAndLogEx(DEBUG, "No answer from tag");
-    
+
     return status;
 }
 static int unlock_reset(bool use_pwd, uint32_t pwd, uint32_t data, bool verbose) {
@@ -1224,14 +1224,14 @@ static int unlock_reset(bool use_pwd, uint32_t pwd, uint32_t data, bool verbose)
     return unlock_write_protect(use_pwd, pwd, data, false);
 }
 static void unlock_add_item(em4x05_unlock_item_t *array, uint8_t len, uint32_t value) {
-    
+
     uint8_t i = 0;
     for (; i < len; i++) {
-        if ( array[i].value == value ) {
+        if (array[i].value == value) {
             array[i].cnt++;
             break;
         }
-        if ( array[i].cnt == 0 ) {
+        if (array[i].cnt == 0) {
             array[i].cnt++;
             array[i].value = value;
             break;
@@ -1254,9 +1254,9 @@ int CmdEM4x05Unlock(const char *Cmd) {
         arg_int0("n", NULL, NULL, "steps to skip"),
         arg_int0("s", "start", "<us>", "start scan from delay (us)"),
         arg_int0("e", "end", "<us>", "end scan at delay (us)"),
-        arg_u64_0("p", "pwd", "", "password (0x00000000)"),        
+        arg_u64_0("p", "pwd", "", "password (0x00000000)"),
         arg_lit0("v", "verbose", "verbose output"),
-        arg_param_end        
+        arg_param_end
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);
     double n = (double)arg_get_int_def(ctx, 1, 0);
@@ -1266,7 +1266,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
     bool verbose = arg_get_lit(ctx, 5);
     CLIParserFree(ctx);
 
-    if ( start > end ) {
+    if (start > end) {
         PrintAndLogEx(FAILED, "start delay can\'t be larger than end delay %.0lf vs %.0lf", start, end);
         return PM3_EINVARG;
     }
@@ -1285,24 +1285,24 @@ int CmdEM4x05Unlock(const char *Cmd) {
 
     uint32_t search_value = 0;
     uint32_t write_value = 0;
-    //    
-    // inital phase 
+    //
+    // inital phase
     //
     // read word 14
     uint32_t init_14 = 0;
     int res = EM4x05ReadWord_ext(14, pwd, use_pwd, &init_14);
     if (res != PM3_SUCCESS) {
         PrintAndLogEx(FAILED, "failed to read word 14\n");
-        return PM3_ENODATA;        
+        return PM3_ENODATA;
     }
 
-        
-    // read 15 
+
+    // read 15
     uint32_t init_15 = 0;
     res = EM4x05ReadWord_ext(15, pwd, use_pwd, &init_15);
     if (res != PM3_SUCCESS) {
         PrintAndLogEx(FAILED, "failed to read word 15\n");
-        return PM3_ENODATA;        
+        return PM3_ENODATA;
     }
 
 #define ACTIVE_MASK 0x00008000
@@ -1322,13 +1322,13 @@ int CmdEM4x05Unlock(const char *Cmd) {
         my_auto = true;
         n = (end - start) / 2;
     }
-    
+
     // fix at one specific delay
     if (start == end) {
         n = 0;
     }
-    
-    PrintAndLogEx(INFO, "--------------- " _CYAN_("EM4x05 tear-off : target PROTECT") " -----------------------\n");    
+
+    PrintAndLogEx(INFO, "--------------- " _CYAN_("EM4x05 tear-off : target PROTECT") " -----------------------\n");
 
     PrintAndLogEx(INFO, "initial prot 14&15 [ " _GREEN_("%08X") ", " _GREEN_("%08X")  " ]", init_14, init_15);
 
@@ -1341,15 +1341,15 @@ int CmdEM4x05Unlock(const char *Cmd) {
 
     PrintAndLogEx(INFO, "   target stepping [ " _GREEN_("%.0lf") " ]", n);
     PrintAndLogEx(INFO, "target delay range [ " _GREEN_("%.0lf") " ... " _GREEN_("%.0lf") " ]", start, end);
-    PrintAndLogEx(INFO, "      search value [ " _GREEN_("%08X") " ]", search_value);        
-    PrintAndLogEx(INFO, "       write value [ " _GREEN_("%08X") " ]", write_value);        
+    PrintAndLogEx(INFO, "      search value [ " _GREEN_("%08X") " ]", search_value);
+    PrintAndLogEx(INFO, "       write value [ " _GREEN_("%08X") " ]", write_value);
 
     PrintAndLogEx(INFO, "----------------------------------------------------------------------------\n");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(INFO, "press " _YELLOW_("'enter'") " to cancel the command");
-    PrintAndLogEx(NORMAL, "");    
+    PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(INFO, "--------------- " _CYAN_("start") " -----------------------\n");
-    
+
     int exit_code = PM3_SUCCESS;
     uint32_t word14 = 0, word15 = 0;
     uint32_t word14b = 0, word15b = 0;
@@ -1357,7 +1357,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
     uint32_t soon = 0;
     uint32_t late = 0;
 
-    em4x05_unlock_item_t flipped[64] ={{0,0}};
+    em4x05_unlock_item_t flipped[64] = {{0, 0}};
 
     //
     // main loop
@@ -1378,7 +1378,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
         }
 
         if (tries >= 5 && n == 0 && soon != late) {
-            
+
             if (soon > late) {
                 PrintAndLogEx(INFO, "Tried %d times, soon:%i late:%i        => " _CYAN_("adjust +1 us >> %.0lf us"), tries, soon, late, start);
                 start++;
@@ -1397,23 +1397,23 @@ int CmdEM4x05Unlock(const char *Cmd) {
             exit_code = PM3_EOPABORTED;
             break;
         }
-           
+
         // set tear off trigger
-        clearCommandBuffer();    
+        clearCommandBuffer();
         tearoff_params_t params = {
             .delay_us = start,
             .on = true,
             .off = false
         };
-        res = handle_tearoff(&params, verbose); 
-        if ( res != PM3_SUCCESS ) {
+        res = handle_tearoff(&params, verbose);
+        if (res != PM3_SUCCESS) {
             PrintAndLogEx(WARNING, "failed to configure tear off");
             return PM3_ESOFT;
         }
 
         // write
         res = unlock_write_protect(use_pwd, pwd, write_value, verbose);
-        
+
         // read after trigger
         res = EM4x05ReadWord_ext(14, pwd, use_pwd, &word14);
         if (res != PM3_SUCCESS) {
@@ -1430,10 +1430,10 @@ int CmdEM4x05Unlock(const char *Cmd) {
 
         if (verbose)
             PrintAndLogEx(INFO, "ref:%08X   14:%08X   15:%08X ", search_value, word14, word15);
-        
-        if ( word14 == search_value && word15 == 0) {
+
+        if (word14 == search_value && word15 == 0) {
             PrintAndLogEx(INFO, "Status: Nothing happened            => " _GREEN_("tearing too soon"));
-            
+
             if (my_auto) {
                 start += n;
                 PrintAndLogEx(INFO, "                                    => " _CYAN_("adjust +%.0lf us >> %.0lf us"), n, start);
@@ -1442,17 +1442,17 @@ int CmdEM4x05Unlock(const char *Cmd) {
                 soon++;
             }
         } else {
-            
+
             if (word15 == search_value) {
-                
+
                 if (word14 == 0) {
                     PrintAndLogEx(INFO, "Status: Protect succeeded           => " _GREEN_("tearing too late"));
                 } else {
-                    if ( word14 == search_value) {
+                    if (word14 == search_value) {
                         PrintAndLogEx(INFO, "Status: 15 ok, 14 not yet erased    => " _GREEN_("tearing too late"));
                     } else {
                         PrintAndLogEx(INFO, "Status: 15 ok, 14 partially erased  => " _GREEN_("tearing too late"));
-                    }                    
+                    }
                 }
 
                 unlock_reset(use_pwd, pwd, write_value, verbose);
@@ -1466,7 +1466,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
 
                 if (word14b == 0) {
 
-                    unlock_reset(use_pwd, pwd, write_value, verbose);                    
+                    unlock_reset(use_pwd, pwd, write_value, verbose);
 
                     res = EM4x05ReadWord_ext(14, pwd, use_pwd, &word14b);
                     if (res != PM3_SUCCESS) {
@@ -1474,7 +1474,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
                         return PM3_ESOFT;
                     }
                 }
-                
+
                 if (word14b != search_value) {
 
                     res = EM4x05ReadWord_ext(15, pwd, use_pwd, &word15b);
@@ -1484,7 +1484,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
                         break;
                     } else {
                         PrintAndLogEx(WARNING, "failed to read 15");
-                        return PM3_ESOFT;                        
+                        return PM3_ESOFT;
                     }
                 }
                 if (my_auto) {
@@ -1497,32 +1497,32 @@ int CmdEM4x05Unlock(const char *Cmd) {
                 }
 
             } else {
-                
-                if (( word15 & ACTIVE_MASK) == ACTIVE_MASK) {
-                    
+
+                if ((word15 & ACTIVE_MASK) == ACTIVE_MASK) {
+
                     PrintAndLogEx(INFO, "Status: 15 bitflipped and active    => " _RED_("SUCCESS?:  ") "14: %08X  15: " _CYAN_("%08X"), word14, word15);
                     PrintAndLogEx(INFO, "Committing results...");
 
-                    unlock_reset(use_pwd, pwd, write_value, verbose);    
-                    
+                    unlock_reset(use_pwd, pwd, write_value, verbose);
+
                     // read after reset
                     res = EM4x05ReadWord_ext(14, pwd, use_pwd, &word14b);
-                    if ( res != PM3_SUCCESS ) {
+                    if (res != PM3_SUCCESS) {
                         PrintAndLogEx(WARNING, "failed to read 14");
                         return PM3_ESOFT;
                     }
 
                     res = EM4x05ReadWord_ext(15, pwd, use_pwd, &word15b);
-                    if ( res != PM3_SUCCESS ) {
+                    if (res != PM3_SUCCESS) {
                         PrintAndLogEx(WARNING, "failed to read 15");
                         return PM3_ESOFT;
                     }
-                    
+
                     if (verbose)
                         PrintAndLogEx(INFO, "ref:%08x   14:%08X   15:%08X", search_value, word14b, word15b);
-                    
+
                     if ((word14b & ACTIVE_MASK) == ACTIVE_MASK) {
-                        
+
                         if (word14b == word15) {
                             PrintAndLogEx(INFO, "Status: confirmed                   => " _RED_("SUCCESS:   ") "14: " _CYAN_("%08X") "  15: %08X", word14b, word15b);
 
@@ -1530,15 +1530,15 @@ int CmdEM4x05Unlock(const char *Cmd) {
                             success = true;
                             break;
                         }
-                        
+
                         if (word14b != search_value) {
                             PrintAndLogEx(INFO, "Status: new definitive value!       => " _RED_("SUCCESS:   ") "14: " _CYAN_("%08X") "  15: %08X", word14b, word15b);
-                            
+
                             unlock_add_item(flipped, 64, word14b);
                             success = true;
                             break;
                         }
-                        
+
                         PrintAndLogEx(INFO, "Status: failed to commit bitflip        => " _RED_("FAIL:      ") "14: %08X  15: %08X", word14b, word15b);
                     }
                     if (my_auto) {
@@ -1551,14 +1551,14 @@ int CmdEM4x05Unlock(const char *Cmd) {
                     }
                 } else {
                     PrintAndLogEx(INFO, "Status: 15 bitflipped but inactive      => " _YELLOW_("PROMISING: ") "14: %08X  15: " _CYAN_("%08X"), word14, word15);
-                    
+
                     unlock_add_item(flipped, 64, word15);
-                    
+
                     soon ++;
                 }
             }
         }
-        
+
         if (my_auto == false) {
             tries++;
         }
@@ -1571,15 +1571,15 @@ int CmdEM4x05Unlock(const char *Cmd) {
         uint32_t bitflips = search_value ^ word14b;
         PrintAndLogEx(INFO, "Old protection word => " _YELLOW_("%08X"), search_value);
         char bitstring[9] = {0};
-        for (int i=0; i < 8; i++) {
-            bitstring[i] = bitflips & (0xF << ((7-i) * 4)) ? 'x' : '.';
+        for (int i = 0; i < 8; i++) {
+            bitstring[i] = bitflips & (0xF << ((7 - i) * 4)) ? 'x' : '.';
         }
         // compute number of bits flipped
 
         PrintAndLogEx(INFO, "Bitflips: %2u events => %s", bitcount32(bitflips), bitstring);
         PrintAndLogEx(INFO, "New protection word => " _CYAN_("%08X") "\n", word14b);
 
-   
+
         PrintAndLogEx(INFO, "Try " _YELLOW_("`lf em 4x05_dump`"));
     }
 
@@ -1590,7 +1590,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
         for (uint8_t i = 0; i < 64; i++) {
             if (flipped[i].cnt == 0)
                 break;
-            
+
             PrintAndLogEx(INFO, " %3u | %08X | %3u | %u", i, flipped[i].value, flipped[i].cnt, bitcount32(search_value ^ flipped[i].value));
         }
     }
diff --git a/client/src/cmdlfem4x50.c b/client/src/cmdlfem4x50.c
index 7296ccbb1..89da1efc1 100644
--- a/client/src/cmdlfem4x50.c
+++ b/client/src/cmdlfem4x50.c
@@ -493,7 +493,7 @@ int CmdEM4x50WritePassword(const char *Cmd) {
 
     if (resp.status == PM3_ETEAROFF)
         return PM3_SUCCESS;
-    
+
     success = (bool)resp.status;
 
     // get, prepare and print response
diff --git a/client/src/cmdlffdxb.c b/client/src/cmdlffdxb.c
index 1547c743b..efd567128 100644
--- a/client/src/cmdlffdxb.c
+++ b/client/src/cmdlffdxb.c
@@ -470,7 +470,7 @@ const fdxbCountryMapping_t fdxbCountryMapping[] = {
     { 0,   "N/A" } // must be the last entry
 };
 
-static const char* mapFDBX(uint16_t countryCode) {
+static const char *mapFDBX(uint16_t countryCode) {
     uint16_t i = 0;
     while (fdxbCountryMapping[i].code > 0) {
         if (countryCode == fdxbCountryMapping[i].code) {
@@ -572,8 +572,8 @@ int demodFDXB(bool verbose) {
     PrintAndLogEx(SUCCESS, "  Animal bit set?  %s", animalBit ? _YELLOW_("True") : "False");
     PrintAndLogEx(SUCCESS, "      Data block?  %s  [value 0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
     PrintAndLogEx(SUCCESS, "        RUDI bit?  %s", rudiBit ? _YELLOW_("True") " (advanced transponder)" : "False");
-    PrintAndLogEx(SUCCESS, "       User Info?  %u %s", userInfo, userInfo == 0 ? "(RFU)":"");
-    PrintAndLogEx(SUCCESS, "  Replacement No?  %u %s", replacementNr, replacementNr == 0 ? "(RFU)":"");
+    PrintAndLogEx(SUCCESS, "       User Info?  %u %s", userInfo, userInfo == 0 ? "(RFU)" : "");
+    PrintAndLogEx(SUCCESS, "  Replacement No?  %u %s", replacementNr, replacementNr == 0 ? "(RFU)" : "");
 
     uint8_t c[] = {0, 0};
     compute_crc(CRC_11784, raw, sizeof(raw), &c[0], &c[1]);
diff --git a/client/src/cmdlfindala.c b/client/src/cmdlfindala.c
index 9ed08d557..a5c81114a 100644
--- a/client/src/cmdlfindala.c
+++ b/client/src/cmdlfindala.c
@@ -601,7 +601,7 @@ static int CmdIndalaClone(const char *Cmd) {
     CLIGetHexWithReturn(ctx, 3, data, &datalen);
 
     bool is_t5555 = arg_get_lit(ctx, 4);
-    
+
     bool got_cn = false, got_26 = false;
     if (is_long_uid == false) {
 
@@ -616,7 +616,7 @@ static int CmdIndalaClone(const char *Cmd) {
     }
 
     CLIParserFree(ctx);
-    
+
     PrintAndLogEx(INFO, "Target chip " _YELLOW_("%s"), (is_t5555) ? "Q5/T5555" : "T55x7");
 
     if (is_long_uid) {
diff --git a/client/src/cmdlfmotorola.c b/client/src/cmdlfmotorola.c
index c7cd16021..28b6bd39b 100644
--- a/client/src/cmdlfmotorola.c
+++ b/client/src/cmdlfmotorola.c
@@ -173,18 +173,18 @@ static int CmdMotorolaClone(const char *Cmd) {
     CLIParserFree(ctx);
 
     //TODO add selection of chip for Q5 or T55x7
-    
+
     PrintAndLogEx(INFO, "Target chip " _YELLOW_("%s"), (is_t5555) ? "Q5/T5555" : "T55x7");
 
     // config for Motorola 64 format (RF/32;PSK1 with RF/2; Maxblock=2)
     PrintAndLogEx(INFO, "Preparing to clone Motorola 64bit tag");
     PrintAndLogEx(INFO, "Using raw " _GREEN_("%s"), sprint_hex_inrow(data, datalen));
 
-    if (is_t5555) 
+    if (is_t5555)
         blocks[0] = T5555_FIXED | T5555_SET_BITRATE(32) | T5555_MODULATION_PSK1 | 2 << T5555_MAXBLOCK_SHIFT;
-    else 
+    else
         blocks[0] =  T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK1 | (2 << T55x7_MAXBLOCK_SHIFT);
-    
+
 
     blocks[1] = bytes_to_num(data, 4);
     blocks[2] = bytes_to_num(data + 4, 4);
diff --git a/client/src/scripting.c b/client/src/scripting.c
index 8d990fe1b..4c9e3686f 100644
--- a/client/src/scripting.c
+++ b/client/src/scripting.c
@@ -1106,7 +1106,7 @@ static int l_em4x05_read(lua_State *L) {
 
     // get password
     const char *p_pwd = luaL_checkstring(L, 2);
-    if (p_pwd == NULL || strlen(p_pwd) == 0 ) {
+    if (p_pwd == NULL || strlen(p_pwd) == 0) {
         use_pwd = false;
     } else {
         if (strlen(p_pwd) != 8)
@@ -1138,7 +1138,7 @@ static int l_em4x50_read(lua_State *L) {
     const char *p_addr = luaL_checklstring(L, 1, &size);
     uint32_t addr = 0;
     sscanf(p_addr, "%u", &addr);
-    
+
     if (addr > 31)
         return returnToLuaWithError(L, "Address out-of-range (0..31) got %u", addr);
 
@@ -1159,9 +1159,9 @@ static int l_em4x50_read(lua_State *L) {
 
         uint32_t pwd = 0;
         sscanf(p_pwd, "%08x", &pwd);
-        
+
         PrintAndLogEx(DEBUG, " Pwd %08X", pwd);
-        
+
         etd.password[0] = pwd & 0xFF;
         etd.password[1] = (pwd >> 8) & 0xFF;
         etd.password[2] = (pwd >> 16) & 0xFF;
@@ -1181,11 +1181,11 @@ static int l_em4x50_read(lua_State *L) {
     }
 
     uint32_t word = (
-            words[etd.address].byte[0] << 24 |
-            words[etd.address].byte[1] << 16 |
-            words[etd.address].byte[2] << 8 |
-            words[etd.address].byte[3] 
-        );
+                        words[etd.address].byte[0] << 24 |
+                        words[etd.address].byte[1] << 16 |
+                        words[etd.address].byte[2] << 8 |
+                        words[etd.address].byte[3]
+                    );
     lua_pushinteger(L, word);
     return 1;
 }
diff --git a/doc/commands.md b/doc/commands.md
index 333c332ec..e2ca72107 100644
--- a/doc/commands.md
+++ b/doc/commands.md
@@ -177,13 +177,13 @@ Check column "offline" for their availability.
 |`hf 15 info             `|N       |`Tag information`
 |`hf 15 sniff            `|N       |`Sniff ISO15693 traffic`
 |`hf 15 raw              `|N       |`Send raw hex data to tag`
-|`hf 15 read             `|N       |`Read a block`
+|`hf 15 rdbl             `|N       |`Read a block`
 |`hf 15 reader           `|N       |`Act like an ISO15693 reader`
 |`hf 15 readmulti        `|N       |`Reads multiple Blocks`
 |`hf 15 restore          `|N       |`Restore from file to all memory pages of an ISO15693 tag`
 |`hf 15 samples          `|N       |`Acquire Samples as Reader (enables carrier, sends inquiry)`
 |`hf 15 sim              `|N       |`Fake an ISO15693 tag`
-|`hf 15 write            `|N       |`Write a block`
+|`hf 15 wrbl             `|N       |`Write a block`
 |`hf 15 findafi          `|N       |`Brute force AFI of an ISO15693 tag`
 |`hf 15 writeafi         `|N       |`Writes the AFI on an ISO15693 tag`
 |`hf 15 writedsfid       `|N       |`Writes the DSFID on an ISO15693 tag`
@@ -233,7 +233,7 @@ Check column "offline" for their availability.
 |command                  |offline |description
 |-------                  |------- |-----------
 |`hf fido help           `|Y       |`This help.`
-|`hf fido info           `|N       |`List ISO 14443A history`
+|`hf fido list           `|N       |`List ISO 14443A history`
 |`hf fido info           `|N       |`Info about FIDO tag.`
 |`hf fido reg            `|N       |`FIDO U2F Registration Message.`
 |`hf fido auth           `|N       |`FIDO U2F Authentication Message.`
@@ -256,10 +256,10 @@ Check column "offline" for their availability.
 |`hf iclass restore      `|N       |`[options..] Restore a dump file onto a Picopass / iCLASS tag`
 |`hf iclass sniff        `|N       |`            Eavesdrop Picopass / iCLASS communication`
 |`hf iclass wrbl         `|N       |`[options..] Write Picopass / iCLASS block`
-|`hf iclass chk          `|Y       |`[options..] Check keys`
+|`hf iclass autopwn      `|N       |`[options..] Automatic key recovery tool for iCLASS`
+|`hf iclass chk          `|N       |`[options..] Check keys`
 |`hf iclass loclass      `|Y       |`[options..] Use loclass to perform bruteforce reader attack`
 |`hf iclass lookup       `|Y       |`[options..] Uses authentication trace to check for key in dictionary file`
-|`hf iclass replay       `|N       |`<mac>       Read Picopass / iCLASS tag via replay attack`
 |`hf iclass sim          `|N       |`[options..] Simulate iCLASS tag`
 |`hf iclass eload        `|N       |`[f <fn>   ] Load Picopass / iCLASS dump file into emulator memory`
 |`hf iclass esave        `|N       |`[f <fn>   ] Save emulator memory to file`
@@ -556,6 +556,19 @@ Check column "offline" for their availability.
 |`lf cotag read          `|N       |`Attempt to read and extract tag data`
 
 
+### lf destron
+
+ { FDX-A Destron RFIDs...     }
+
+|command                  |offline |description
+|-------                  |------- |-----------
+|`lf destron help        `|Y       |`This help`
+|`lf destron demod       `|Y       |`Demodulate an Destron tag from the GraphBuffer`
+|`lf destron read        `|N       |`Attempt to read and extract tag data from the antenna`
+|`lf destron clone       `|N       |`Clone Destron tag to T55x7`
+|`lf destron sim         `|N       |`Simulate Destron tag`
+
+
 ### lf em
 
  { EM4X CHIPs & RFIDs...      }
@@ -570,12 +583,14 @@ Check column "offline" for their availability.
 |`lf em 410x_watch       `|N       |`watches for EM410x 125/134 kHz tags (option 'h' for 134)`
 |`lf em 410x_spoof       `|N       |`watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)`
 |`lf em 410x_clone       `|N       |`write EM410x UID to T55x7 or Q5/T5555 tag`
+|`lf em 4x05_chk         `|N       |`Check passwords from dictionary`
 |`lf em 4x05_demod       `|Y       |`demodulate a EM4x05/EM4x69 tag from the GraphBuffer`
 |`lf em 4x05_dump        `|N       |`dump EM4x05/EM4x69 tag`
 |`lf em 4x05_wipe        `|N       |`wipe EM4x05/EM4x69 tag`
 |`lf em 4x05_info        `|N       |`tag information EM4x05/EM4x69`
 |`lf em 4x05_read        `|N       |`read word data from EM4x05/EM4x69`
 |`lf em 4x05_write       `|N       |`write word data to EM4x05/EM4x69`
+|`lf em 4x05_unlock      `|N       |`execute tear off against EM4x05/EM4x69`
 |`lf em 4x50_dump        `|N       |`dump EM4x50 tag`
 |`lf em 4x50_info        `|N       |`tag information EM4x50`
 |`lf em 4x50_write       `|N       |`write word data to EM4x50`
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 7fb978d75..be2227b7c 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -342,7 +342,7 @@ typedef struct {
 typedef struct {
     iclass_auth_req_t req;
     uint8_t item_cnt;
-    iclass_restore_item_t blocks[];    
+    iclass_restore_item_t blocks[];
 } PACKED iclass_restore_req_t;